Merge branch 'master' into release-0.2.0

Author: yunus-qureshi

.gitignore

@@ -0,0 +1,8 @@
+operator.tgz
+cover.out
+bin
+testbin/*
+onpremtest/*
+ords/*zip
+.gitattributes
+.vscode

.gitlab-ci.yml

@@ -0,0 +1,28 @@
+build-operator:
+  stage: build
+  variables:
+    IMAGE: "$DOCKER_REPO:$CI_COMMIT_BRANCH"
+    OP_YAML: oracle-database-operator.yaml
+  script:
+    - make docker-build IMG="$IMAGE"
+    - docker push "$IMAGE"
+    - newimage=$(docker inspect $IMAGE | python -c 'import json,sys; print json.load(sys.stdin)[0]["RepoDigests"][0]')
+    - echo $newimage
+    - docker rmi "$IMAGE" && docker system prune -f
+    - make operator-yaml IMG=$newimage
+    - if [ "$CI_COMMIT_BRANCH" != "master" ]; then sed -i "s/\(replicas.\) 3/\1 1/g" ./$OP_YAML; fi
+    - curl -s -n $ARTIFACTORY_REPO/$CI_COMMIT_BRANCH/$OP_YAML -T ./$OP_YAML
+  only:
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /\#run-pipeline/
+      - $CI_COMMIT_BRANCH =~ /master/
+      - $CI_MERGE_REQUEST_ID != ""
+  except:
+    variables:
+      - $CI_COMMIT_MESSAGE =~ /\#skip-pipeline/
+
+cleanup:
+  stage: .post
+  script:
+    - echo "Clean up downloaded binaries"
+    - rm -rf bin/

CONTRIBUTING.md

@@ -1,16 +1,16 @@
 # Contributing to This Repository
 
-We welcome your contributions! There are multiple ways to contribute.
+Oracle welcomes your contributions! There are multiple ways that you can contribute.
 
 ## Opening issues
 
-For bugs or enhancement requests, please file a GitHub issue unless the problem is security-related. When filing a bug, remember that the more specific the bug is, the more likely it is to be fixed. If you think you've found a security
-vulnerability, then do not raise a GitHub issue. Instead, follow the instructions in our
-[security policy](./SECURITY.md).
+For bugs or enhancement requests, please file a GitHub issue, unless the problem is security-related.
+
+When filing a bug, remember that the more specific the bug is, the more likely it is to be fixed. If you think you've found a security vulnerability, then do not raise a GitHub issue. Instead, follow the instructions in our [security policy](./SECURITY.md).
 
 ## Contributing code
 
-We welcome your code contributions. Before submitting code by using a pull request,
+Oracle welcomes your code contributions. Before submitting code by using a pull request,
 you must sign the [Oracle Contributor Agreement][OCA] (OCA), and your commits must include the following line, using the name and e-mail address you used to sign the OCA:
 
 ```text
@@ -29,22 +29,22 @@ can be accepted.
 
 ## Pull request process
 
-1. Ensure there is an issue created to track and discuss the fix or enhancement that you intend to submit.
+1. Ensure that there is an issue created to track and discuss the fix or enhancement that you intend to submit.
 1. Fork this repository.
 1. Create a branch in your fork to implement the changes. Oracle recommends using
    the issue number as part of your branch name. For example: `1234-fixes`
 1. Ensure that any documentation is updated with the changes that are required
    by your change.
-1. Ensure that any samples are updated, if the base image has been changed.
+1. If the base image has been changed, then ensure that any examples are updated. 
 1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
    what your changes are meant to do, and provide simple steps to indicate how to validate
    your changes. Ensure that you reference the issue that you created as well.
-1. Before the changes are merged, Oracle will assign the pull request to 2 or 3 people for review. 
+1. Before the changes are merged, Oracle will assign the pull request to two or three people for review. 
 
 ## Code of conduct
 
 Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
-like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].
+like more specific guidelines, then see the [Contributor Covenant Code of Conduct][COC].
 
 [OCA]: https://oca.opensource.oracle.com
 [COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

Dockerfile

@@ -1,9 +1,9 @@
-# Copyright (c) 2021, Oracle and/or its affiliates.
+# Copyright (c) 2022, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 
 # Build the manager binary
-FROM golang:1.16 as builder
+FROM golang:1.17 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Oracle and/or its affiliates.
+Copyright (c) 2022 Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 

Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021, Oracle and/or its affiliates. 
+# Copyright (c) 2022, Oracle and/or its affiliates. 
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
 
@@ -23,6 +23,8 @@ IMG ?= controller:latest
 CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.21
+# Operator YAML file
+OPERATOR_YAML=$$(basename $$(pwd)).yaml
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -53,13 +55,13 @@ fmt: ## Run go fmt against code.
 vet: ## Run go vet against code.
 	go vet ./...
 
-TEST ?= ./apis/... ./commons/... ./controllers/...
+TEST ?= ./apis/database/v1alpha1 ./commons/... ./controllers/...
 test: manifests generate fmt vet envtest ## Run unit tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $(TEST) -coverprofile cover.out
 
 E2ETEST ?= ./test/e2e/
 e2e: manifests generate fmt vet envtest ## Run e2e tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test $(E2ETEST) -v -timeout 40m -ginkgo.v -ginkgo.failFast
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" ginkgo -v --timeout=2h30m --fail-fast $(E2ETEST)
 
 ##@ Build
 
@@ -69,7 +71,7 @@ build: generate fmt vet ## Build manager binary.
 run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./main.go
 
-docker-build: test ## Build docker image with the manager.
+docker-build: manifests generate fmt vet #test ## Build docker image with the manager. Disable the test but keep the validations to fail fast
 	docker build --no-cache=true --build-arg http_proxy=${HTTP_PROXY} --build-arg https_proxy=${HTTPS_PROXY} . -t ${IMG}
 
 #docker-build-proxy: test
@@ -90,9 +92,14 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
+# Bug:34265574
+# Used sed to reposition the controller-manager Deployment after the certificate creation in the OPERATOR_YAML  
 operator-yaml: manifests kustomize
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default > $$(basename $$(pwd)).yaml
+	$(KUSTOMIZE) build config/default > "${OPERATOR_YAML}"
+	sed -i.bak -e '/^apiVersion: apps\/v1/,/---/d' "${OPERATOR_YAML}"
+	(echo --- && sed '/^apiVersion: apps\/v1/,/---/!d' "${OPERATOR_YAML}.bak")  >>  "${OPERATOR_YAML}"
+	rm "${OPERATOR_YAML}.bak"
 
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
 	$(KUSTOMIZE) build config/default | kubectl delete -f -

PREREQUISITES.md

@@ -2,13 +2,14 @@
 
 ## Prerequisites for Using Oracle Database Operator for Kubernetes
 
-Oracle Database operator for Kubernetes (OraOperator) manages all Cloud deployments of Oracle Database, including:
+Oracle Database Operator for Kubernetes (OraOperator) manages all Cloud deployments of Oracle Database, including:
 
 * Oracle Autonomous Database (ADB)
 * Containerized Oracle Database Single Instance (SIDB)
 * Containerized Sharded Oracle Database (SHARDING)
 
 ### Setting Up a Kubernetes Cluster and Volumes
+Review and complete each step as needed.
 
 #### Setting Up an OKE Cluster on Oracle Cloud Infrastructure (OCI)
 
@@ -26,7 +27,7 @@ If you intent to use `OraOperator` to handle Oracle Autonomous Database lifecycl
 
 ### Prerequites for Single Instance Databases (SIDB)
 
-If you intent to use `OraOperator` to handle Oracle Database Single Instance lifecycles, then read [Single Instance Database Prerequisites](./docs/sidb/SIDB_PREREQUISITES.md)
+If you intent to use `OraOperator` to handle Oracle Database Single Instance lifecycles, then read [Single Instance Database Prerequisites](./docs/sidb/PREREQUISITES.md)
 
 ### Prerequites for Sharded Databases (SHARDING)  
 

PROJECT

@@ -3,7 +3,8 @@ layout:
 - go.kubebuilder.io/v2
 multigroup: true
 plugins:
-  go.sdk.operatorframework.io/v2-alpha: {}
+  manifests.sdk.operatorframework.io/v2: {}
+  scorecard.sdk.operatorframework.io/v2: {}
 projectName: oracle-database-operator
 repo: github.com/oracle/oracle-database-operator
 resources:
@@ -16,6 +17,34 @@ resources:
   kind: AutonomousDatabase
   path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
   version: v1alpha1
+  webhooks:
+    validation: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: oracle.com
+  group: database
+  kind: AutonomousDatabaseBackup
+  path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
+  version: v1alpha1
+  webhooks:
+    defaulting: true
+    validation: true
+    webhookVersion: v1beta1
+- api:
+    crdVersion: v1beta1
+    namespaced: true
+  controller: true
+  domain: oracle.com
+  group: database
+  kind: AutonomousDatabaseRestore
+  path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
+  version: v1alpha1
+  webhooks:
+    validation: true
+    webhookVersion: v1beta1
 - api:
     crdVersion: v1
     namespaced: true
@@ -38,4 +67,60 @@ resources:
   kind: ShardingDatabase
   path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: oracle.com
+  group: database
+  kind: PDB
+  path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
+  version: v1alpha1
+  webhooks:
+    defaulting: true
+    validation: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: oracle.com
+  group: database
+  kind: CDB
+  path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
+  version: v1alpha1
+  webhooks:
+    defaulting: true
+    validation: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1beta1
+    namespaced: true
+  controller: true
+  domain: oracle.com
+  group: database
+  kind: OracleRestDataService
+  path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
+  version: v1alpha1
+- api:
+    crdVersion: v1beta1
+    namespaced: true
+  controller: true
+  domain: oracle.com
+  group: database
+  kind: AutonomousContainerDatabase
+  path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
+  version: v1alpha1
+  webhooks:
+    validation: true
+    webhookVersion: v1
+- api:
+    crdVersion: v1beta1
+    namespaced: true
+  controller: true
+  domain: oracle.com
+  group: database
+  kind: DbcsSystem
+  path: github.com/oracle/oracle-database-operator/apis/database/v1alpha1
+  version: v1alpha1
 version: "3"