New stuff

Dockerfile

@@ -7,8 +7,9 @@ ARG BUILDER_IMG
 FROM ${BUILDER_IMG} as builder
 
 # Download golang if BUILD_INTERNAL is set to true
+ARG INSTALL_GO
 ARG GOLANG_VERSION
-RUN if [ -n "$GOLANG_VERSION" ]; then \
+RUN if [ "$INSTALL_GO" = "true" ]; then \
         curl -LJO https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz &&\
         rm -rf /usr/local/go && tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-amd64.tar.gz &&\
         rm go${GOLANG_VERSION}.linux-amd64.tar.gz; \

Makefile

@@ -76,10 +76,10 @@ GOLANG_VERSION ?= 1.21.7
 ## Otherwise, use golang image from docker hub as the builder.
 ifeq ($(BUILD_INTERNAL), true)
 BUILDER_IMG = oraclelinux:8
-BUILD_ARGS = --build-arg BUILDER_IMG=$(BUILDER_IMG) --build-arg GOLANG_VERSION=$(GOLANG_VERSION)
+BUILD_ARGS = --build-arg BUILDER_IMG=$(BUILDER_IMG) --build-arg GOLANG_VERSION=$(GOLANG_VERSION) --build-arg INSTALL_GO=true
 else
 BUILDER_IMG = golang:$(GOLANG_VERSION)
-BUILD_ARGS = --build-arg BUILDER_IMG=$(BUILDER_IMG)
+BUILD_ARGS = --build-arg BUILDER_IMG=$(BUILDER_IMG) --build-arg INSTALL_GO=false
 endif
 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) \

apis/database/v1alpha1/autonomousdatabase_webhook.go

@@ -43,6 +43,7 @@ import (
 
 	"github.com/oracle/oci-go-sdk/v65/common"
 	"github.com/oracle/oci-go-sdk/v65/database"
+	dbcommons "github.com/oracle/oracle-database-operator/commons/database"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -99,11 +100,23 @@ var _ webhook.Validator = &AutonomousDatabase{}
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 // ValidateCreate checks if the spec is valid for a provisioning or a binding operation
 func (r *AutonomousDatabase) ValidateCreate() (admission.Warnings, error) {
-
 	var allErrs field.ErrorList
 
 	autonomousdatabaselog.Info("validate create", "name", r.Name)
 
+	namespaces := dbcommons.GetWatchNamespaces()
+	_, hasEmptyString := namespaces[""]
+	isClusterScoped := len(namespaces) == 1 && hasEmptyString
+	if !isClusterScoped {
+		_, containsNamespace := namespaces[r.Namespace]
+		// Check if the allowed namespaces maps contains the required namespace
+		if len(namespaces) != 0 && !containsNamespace {
+			allErrs = append(allErrs,
+				field.Invalid(field.NewPath("metadata").Child("namespace"), r.Namespace,
+					"Oracle database operator doesn't watch over this namespace"))
+		}
+	}
+
 	if r.Spec.Details.AutonomousDatabaseOCID == nil { // provisioning operation
 		allErrs = validateCommon(r, allErrs)
 		allErrs = validateNetworkAccess(r, allErrs)

apis/database/v1alpha1/autonomousdatabasebackup_types.go

@@ -55,7 +55,8 @@ type AutonomousDatabaseBackupSpec struct {
 	Target                       TargetSpec `json:"target,omitempty"`
 	DisplayName                  *string    `json:"displayName,omitempty"`
 	AutonomousDatabaseBackupOCID *string    `json:"autonomousDatabaseBackupOCID,omitempty"`
-
+	IsLongTermBackup             *bool      `json:"isLongTermBackup,omitempty"`
+	RetentionPeriodInDays        *int       `json:"retentionPeriodInDays,omitempty"`
 	OCIConfig OCIConfigSpec `json:"ociConfig,omitempty"`
 }
 

apis/database/v1alpha1/autonomousdatabasebackup_webhook.go

@@ -39,6 +39,7 @@
 package v1alpha1
 
 import (
+	dbcommons "github.com/oracle/oracle-database-operator/commons/database"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -82,6 +83,19 @@ func (r *AutonomousDatabaseBackup) ValidateCreate() (admission.Warnings, error)
 
 	var allErrs field.ErrorList
 
+	namespaces := dbcommons.GetWatchNamespaces()
+	_, hasEmptyString := namespaces[""]
+	isClusterScoped := len(namespaces) == 1 && hasEmptyString
+	if !isClusterScoped {
+		_, containsNamespace := namespaces[r.Namespace]
+		// Check if the allowed namespaces maps contains the required namespace
+		if len(namespaces) != 0 && !containsNamespace {
+			allErrs = append(allErrs,
+				field.Invalid(field.NewPath("metadata").Child("namespace"), r.Namespace,
+					"Oracle database operator doesn't watch over this namespace"))
+		}
+	}
+
 	if r.Spec.Target.K8sADB.Name == nil && r.Spec.Target.OCIADB.OCID == nil {
 		allErrs = append(allErrs,
 			field.Forbidden(field.NewPath("spec").Child("target"), "target ADB is empty"))

apis/database/v1alpha1/cdb_types.go

@@ -154,7 +154,7 @@ type CDBStatus struct {
 // +kubebuilder:printcolumn:JSONPath=".spec.replicas",name="Replicas",type="integer",description="Replicas"
 // +kubebuilder:printcolumn:JSONPath=".status.phase",name="Status",type="string",description="Status of the CDB Resource"
 // +kubebuilder:printcolumn:JSONPath=".status.msg",name="Message",type="string",description="Error message, if any"
-// +kubebuilder:resource:path=CDBS,scope=Namespaced
+// +kubebuilder:resource:path=cdbs,scope=Namespaced
 
 // CDB is the Schema for the cdbs API
 type CDB struct {

apis/database/v1alpha1/pdb_types.go

@@ -197,7 +197,7 @@ type PDBStatus struct {
 // +kubebuilder:printcolumn:JSONPath=".status.totalSize",name="PDB Size",type="string",description="Total Size of the PDB"
 // +kubebuilder:printcolumn:JSONPath=".status.phase",name="Status",type="string",description="Status of the PDB Resource"
 // +kubebuilder:printcolumn:JSONPath=".status.msg",name="Message",type="string",description="Error message, if any"
-// +kubebuilder:resource:path=PDBS,scope=Namespaced
+// +kubebuilder:resource:path=pdbs,scope=Namespaced
 
 // PDB is the Schema for the pdbs API
 type PDB struct {

apis/database/v1alpha1/zz_generated.deepcopy.go

@@ -288,6 +288,16 @@ func (in *AutonomousDatabaseBackupSpec) DeepCopyInto(out *AutonomousDatabaseBack
 		*out = new(string)
 		**out = **in
 	}
+	if in.IsLongTermBackup != nil {
+		in, out := &in.IsLongTermBackup, &out.IsLongTermBackup
+		*out = new(bool)
+		**out = **in
+	}
+	if in.RetentionPeriodInDays != nil {
+		in, out := &in.RetentionPeriodInDays, &out.RetentionPeriodInDays
+		*out = new(int)
+		**out = **in
+	}
 	in.OCIConfig.DeepCopyInto(&out.OCIConfig)
 }
 

commons/oci/database.go

@@ -408,6 +408,8 @@ func (d *databaseService) CreateAutonomousDatabaseBackup(adbBackup *dbv1alpha1.A
 	createBackupRequest := database.CreateAutonomousDatabaseBackupRequest{
 		CreateAutonomousDatabaseBackupDetails: database.CreateAutonomousDatabaseBackupDetails{
 			AutonomousDatabaseId: common.String(adbOCID),
+			IsLongTermBackup: adbBackup.Spec.IsLongTermBackup,
+			RetentionPeriodInDays: adbBackup.Spec.RetentionPeriodInDays,
 		},
 	}
 

config/crd/bases/database.oracle.com_autonomousdatabasebackups.yaml

@@ -61,6 +61,8 @@ spec:
                 type: string
               displayName:
                 type: string
+              isLongTermBackup:
+                type: boolean
               ociConfig:
                 description: "*********************** *\tOCI config ***********************"
                 properties:
@@ -69,6 +71,8 @@ spec:
                   secretName:
                     type: string
                 type: object
+              retentionPeriodInDays:
+                type: integer
               target:
                 description: 'INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
                   Important: Run "make" to regenerate code after modifying this file'

config/rbac/role.yaml

@@ -75,6 +75,13 @@ rules:
   verbs:
   - create
   - patch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - list
+  - watch
 - apiGroups:
   - ""
   resources:
@@ -179,6 +186,26 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  - containers
+  - events
+  - namespaces
+  - pods
+  - pods/exec
+  - pods/log
+  - secrets
+  - services
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:

controllers/database/autonomousdatabase_controller.go

@@ -93,32 +93,29 @@ func (r *AutonomousDatabaseReconciler) SetupWithManager(mgr ctrl.Manager) error
 		For(&dbv1alpha1.AutonomousDatabase{}).
 		Watches(
 			&dbv1alpha1.AutonomousDatabaseBackup{},
-			handler.EnqueueRequestsFromMapFunc(r.enqueueMapFn()),
+			handler.EnqueueRequestsFromMapFunc(r.enqueueMapFn),
 		).
 		Watches(
 			&dbv1alpha1.AutonomousDatabaseRestore{},
-			handler.EnqueueRequestsFromMapFunc(r.enqueueMapFn()),
+			handler.EnqueueRequestsFromMapFunc(r.enqueueMapFn),
 		).
 		WithEventFilter(predicate.And(r.eventFilterPredicate(), r.watchPredicate())).
 		WithOptions(controller.Options{MaxConcurrentReconciles: 50}). // ReconcileHandler is never invoked concurrently with the same object.
 		Complete(r)
 }
+func (r *AutonomousDatabaseReconciler) enqueueMapFn(ctx context.Context, o client.Object) []reconcile.Request {
+	reqs := make([]reconcile.Request, len(o.GetOwnerReferences()))
 
-func (r *AutonomousDatabaseReconciler) enqueueMapFn() handler.MapFunc {
-	return func(ctx context.Context, o client.Object) []reconcile.Request {
-		reqs := make([]reconcile.Request, len(o.GetOwnerReferences()))
-
-		for _, owner := range o.GetOwnerReferences() {
-			reqs = append(reqs, reconcile.Request{
-				NamespacedName: types.NamespacedName{
-					Name:      owner.Name,
-					Namespace: o.GetNamespace(),
-				},
-			})
-		}
-
-		return reqs
+	for _, owner := range o.GetOwnerReferences() {
+		reqs = append(reqs, reconcile.Request{
+			NamespacedName: types.NamespacedName{
+				Name:      owner.Name,
+				Namespace: o.GetNamespace(),
+			},
+		})
 	}
+
+	return reqs
 }
 
 func (r *AutonomousDatabaseReconciler) watchPredicate() predicate.Predicate {