Added some DG changes

Author: Abhishek Kumar

apis/database/v1alpha1/dataguardbroker_types.go

@@ -59,15 +59,6 @@ type DataguardBrokerSpec struct {
 	ProtectionMode    string                           `json:"protectionMode"`
 	NodeSelector      map[string]string                `json:"nodeSelector,omitempty"`
 	FastStartFailOver DataguardBrokerFastStartFailOver `json:"fastStartFailOver,omitempty"`
-	AdminPassword     DataguardBrokerPassword          `json:"adminPassword"`
-}
-
-// DataguardBrokerPassword defines the secret containing Password mapped to secretKey
-type DataguardBrokerPassword struct {
-	SecretName string `json:"secretName,omitempty"`
-	// +kubebuilder:default:="oracle_pwd"
-	SecretKey  string `json:"secretKey,omitempty"`
-	KeepSecret *bool  `json:"keepSecret,omitempty"`
 }
 
 type DataguardBrokerFastStartFailOver struct {
@@ -102,7 +93,7 @@ type DataguardBrokerStatus struct {
 // +kubebuilder:printcolumn:JSONPath=".spec.protectionMode",name="Protection Mode",type="string"
 // +kubebuilder:printcolumn:JSONPath=".status.clusterConnectString",name="Cluster Connect Str",type="string",priority=1
 // +kubebuilder:printcolumn:JSONPath=".status.externalConnectString",name="Connect Str",type="string"
-// +kubebuilder:printcolumn:JSONPath=".spec.primaryDatabaseRef",name="Primary Database",type="string"
+// +kubebuilder:printcolumn:JSONPath=".spec.primaryDatabaseRef",name="Primary Database",type="string", priority=1
 // +kubebuilder:printcolumn:JSONPath=".status.status",name="Status",type="string"
 
 // DataguardBroker is the Schema for the dataguardbrokers API

apis/database/v1alpha1/dataguardbroker_webhook.go

@@ -69,10 +69,6 @@ var _ webhook.Defaulter = &DataguardBroker{}
 func (r *DataguardBroker) Default() {
 	dataguardbrokerlog.Info("default", "name", r.Name)
 
-	if r.Spec.AdminPassword.KeepSecret == nil {
-		keepSecret := true
-		r.Spec.AdminPassword.KeepSecret = &keepSecret
-	}
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.

apis/database/v1alpha1/zz_generated.deepcopy.go

@@ -954,26 +954,6 @@ func (in *DataguardBrokerList) DeepCopyObject() runtime.Object {
 	return nil
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DataguardBrokerPassword) DeepCopyInto(out *DataguardBrokerPassword) {
-	*out = *in
-	if in.KeepSecret != nil {
-		in, out := &in.KeepSecret, &out.KeepSecret
-		*out = new(bool)
-		**out = **in
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataguardBrokerPassword.
-func (in *DataguardBrokerPassword) DeepCopy() *DataguardBrokerPassword {
-	if in == nil {
-		return nil
-	}
-	out := new(DataguardBrokerPassword)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *DataguardBrokerSpec) DeepCopyInto(out *DataguardBrokerSpec) {
 	*out = *in
@@ -990,7 +970,6 @@ func (in *DataguardBrokerSpec) DeepCopyInto(out *DataguardBrokerSpec) {
 		}
 	}
 	in.FastStartFailOver.DeepCopyInto(&out.FastStartFailOver)
-	in.AdminPassword.DeepCopyInto(&out.AdminPassword)
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DataguardBrokerSpec.

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

@@ -35,6 +35,7 @@ spec:
       type: string
     - jsonPath: .spec.primaryDatabaseRef
       name: Primary Database
+      priority: 1
       type: string
     - jsonPath: .status.status
       name: Status
@@ -59,18 +60,6 @@ spec:
           spec:
             description: DataguardBrokerSpec defines the desired state of DataguardBroker
             properties:
-              adminPassword:
-                description: DataguardBrokerPassword defines the secret containing
-                  Password mapped to secretKey
-                properties:
-                  keepSecret:
-                    type: boolean
-                  secretKey:
-                    default: oracle_pwd
-                    type: string
-                  secretName:
-                    type: string
-                type: object
               fastStartFailOver:
                 properties:
                   enable:
@@ -106,7 +95,6 @@ spec:
                   type: string
                 type: array
             required:
-            - adminPassword
             - primaryDatabaseRef
             - protectionMode
             - standbyDatabaseRefs

config/samples/database_v1alpha1_dataguardbroker.yaml

@@ -18,20 +18,6 @@ spec:
   #  - standbyDatabase-sample1
   #  - standbyDatabase-sample2
 
-  ## Secret containing databaseRef password mapped to secretKey. 
-  ## This secret will be deleted after Dataguard setup unless keepSecret set to true.
-  adminPassword:
-    secretName: 
-    secretKey:
-    keepSecret: false
-
-  ## Deploy only on nodes having required labels . Format label_name : label_value .
-  ## Leave empty if there is no such requirement .
-  ## Uncomment to use
-  # nodeSelector: 
-  #   failure-domain.beta.kubernetes.io/zone: bVCG:PHX-AD-1
-  #   pool: sidb
-
   ## Type of service . Applicable on cloud enviroments only
   ## if loadBalService : false , service type = "NodePort" . else "LoadBalancer"
   loadBalancer: false

config/samples/sidb/dataguardbroker.yaml

@@ -199,20 +199,20 @@ func (r *DataguardBrokerReconciler) validateSidbReadiness(m *dbapi.DataguardBrok
 
 	// Validate databaseRef Admin Password
 	adminPasswordSecret := &corev1.Secret{}
-	err = r.Get(ctx, types.NamespacedName{Name: m.Spec.AdminPassword.SecretName, Namespace: m.Namespace}, adminPasswordSecret)
+	err = r.Get(ctx, types.NamespacedName{Name: n.Spec.AdminPassword.SecretName, Namespace: n.Namespace}, adminPasswordSecret)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			//m.Status.Status = dbcommons.StatusError
 			eventReason := "Waiting"
-			eventMsg := "waiting for secret : " + m.Spec.AdminPassword.SecretName + " to get created"
+			eventMsg := "waiting for secret : " + n.Spec.AdminPassword.SecretName + " to get created"
 			r.Recorder.Eventf(m, corev1.EventTypeNormal, eventReason, eventMsg)
-			r.Log.Info("Secret " + m.Spec.AdminPassword.SecretName + " Not Found")
+			r.Log.Info("Secret " + n.Spec.AdminPassword.SecretName + " Not Found")
 			return requeueY, sidbReadyPod, adminPassword
 		}
 		log.Error(err, err.Error())
 		return requeueY, sidbReadyPod, adminPassword
 	}
-	adminPassword = string(adminPasswordSecret.Data[m.Spec.AdminPassword.SecretKey])
+	adminPassword = string(adminPasswordSecret.Data[n.Spec.AdminPassword.SecretKey])
 
 	out, err := dbcommons.ExecCommand(r, r.Config, sidbReadyPod.Name, sidbReadyPod.Namespace, "", ctx, req, true, "bash", "-c",
 		fmt.Sprintf("echo -e  \"%s\"  | %s", fmt.Sprintf(dbcommons.ValidateAdminPassword, adminPassword), dbcommons.GetSqlClient(n.Spec.Edition)))
@@ -225,7 +225,7 @@ func (r *DataguardBrokerReconciler) validateSidbReadiness(m *dbapi.DataguardBrok
 	} else if strings.Contains(out, "ORA-01017") {
 		//m.Status.Status = dbcommons.StatusError
 		eventReason := "Logon denied"
-		eventMsg := "invalid databaseRef admin password. secret: " + m.Spec.AdminPassword.SecretName
+		eventMsg := "invalid databaseRef admin password. secret: " + n.Spec.AdminPassword.SecretName
 		r.Recorder.Eventf(m, corev1.EventTypeWarning, eventReason, eventMsg)
 		return requeueY, sidbReadyPod, adminPassword
 	} else {

controllers/database/dataguardbroker_controller.go

@@ -994,6 +994,34 @@ func (r *SingleInstanceDatabaseReconciler) instantiatePodSpec(m *dbapi.SingleIns
 		},
 	}
 
+	// Adding pod anti-affinity for standby cases
+	if m.Spec.PrimaryDatabaseRef != "" && m.Spec.CreateAsStandby {
+		weightedPodAffinityTerm := corev1.WeightedPodAffinityTerm{
+			Weight: 100,
+			PodAffinityTerm: corev1.PodAffinityTerm{
+				LabelSelector: &metav1.LabelSelector{
+					MatchExpressions: []metav1.LabelSelectorRequirement{{
+						Key:      "app",
+						Operator: metav1.LabelSelectorOpIn,
+						Values:   []string{rp.Name},
+					}},
+				},
+				TopologyKey: "kubernetes.io/hostname",
+			},
+		}
+		if m.Spec.Persistence.AccessMode == "ReadWriteOnce" {
+			pod.Spec.Affinity.PodAntiAffinity = &corev1.PodAntiAffinity{
+				PreferredDuringSchedulingIgnoredDuringExecution: []corev1.WeightedPodAffinityTerm{
+					weightedPodAffinityTerm,
+				},
+			}
+		} else {
+			pod.Spec.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution =
+				append(pod.Spec.Affinity.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution, weightedPodAffinityTerm)
+		}
+
+	}
+
 	// Set SingleInstanceDatabase instance as the owner and controller
 	ctrl.SetControllerReference(m, pod, r.Scheme)
 	return pod