switch ordssrvs controller to encrypted secrets

apis/database/v1alpha1/dbcssystem_conversion.go

@@ -1,14 +1,14 @@
 package v1alpha1
 
 import (
-        "sigs.k8s.io/controller-runtime/pkg/conversion"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 func (src *DbcsSystem) ConvertTo(dst conversion.Hub) error {
-        return nil
+	return nil
 }
 
 // ConvertFrom converts v1 to v1alpha1
 func (dst *DbcsSystem) ConvertFrom(src conversion.Hub) error {
-        return nil
+	return nil
 }

apis/database/v1alpha1/oraclerestdataservice_types.go

@@ -76,9 +76,9 @@ type OracleRestDataServicePersistence struct {
 	StorageClass string `json:"storageClass,omitempty"`
 
 	// +kubebuilder:validation:Enum=ReadWriteOnce;ReadWriteMany
-	AccessMode            string `json:"accessMode,omitempty"`
-	VolumeName            string `json:"volumeName,omitempty"`
-	SetWritePermissions   *bool  `json:"setWritePermissions,omitempty"`
+	AccessMode          string `json:"accessMode,omitempty"`
+	VolumeName          string `json:"volumeName,omitempty"`
+	SetWritePermissions *bool  `json:"setWritePermissions,omitempty"`
 }
 
 // OracleRestDataServiceImage defines the Image source and pullSecrets for POD
@@ -108,19 +108,19 @@ type OracleRestDataServiceRestEnableSchemas struct {
 type OracleRestDataServiceStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
-	Status               string `json:"status,omitempty"`
-	DatabaseApiUrl       string `json:"databaseApiUrl,omitempty"`
-	LoadBalancer         string `json:"loadBalancer,omitempty"`
-	DatabaseRef          string `json:"databaseRef,omitempty"`
-	ServiceIP            string `json:"serviceIP,omitempty"`
-	DatabaseActionsUrl   string `json:"databaseActionsUrl,omitempty"`
-	MongoDbApiAccessUrl  string `json:"mongoDbApiAccessUrl,omitempty"`
-	OrdsInstalled        bool   `json:"ordsInstalled,omitempty"`
-	ApexConfigured       bool   `json:"apexConfigured,omitempty"`
-	ApxeUrl              string `json:"apexUrl,omitempty"`
-	MongoDbApi           bool   `json:"mongoDbApi,omitempty"`
-	CommonUsersCreated   bool   `json:"commonUsersCreated,omitempty"`
-	Replicas             int    `json:"replicas,omitempty"`
+	Status              string `json:"status,omitempty"`
+	DatabaseApiUrl      string `json:"databaseApiUrl,omitempty"`
+	LoadBalancer        string `json:"loadBalancer,omitempty"`
+	DatabaseRef         string `json:"databaseRef,omitempty"`
+	ServiceIP           string `json:"serviceIP,omitempty"`
+	DatabaseActionsUrl  string `json:"databaseActionsUrl,omitempty"`
+	MongoDbApiAccessUrl string `json:"mongoDbApiAccessUrl,omitempty"`
+	OrdsInstalled       bool   `json:"ordsInstalled,omitempty"`
+	ApexConfigured      bool   `json:"apexConfigured,omitempty"`
+	ApxeUrl             string `json:"apexUrl,omitempty"`
+	MongoDbApi          bool   `json:"mongoDbApi,omitempty"`
+	CommonUsersCreated  bool   `json:"commonUsersCreated,omitempty"`
+	Replicas            int    `json:"replicas,omitempty"`
 
 	Image OracleRestDataServiceImage `json:"image,omitempty"`
 }

apis/database/v1alpha1/shardingdatabase_conversion.go

@@ -1,14 +1,14 @@
 package v1alpha1
 
 import (
-        "sigs.k8s.io/controller-runtime/pkg/conversion"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 func (src *ShardingDatabase) ConvertTo(dst conversion.Hub) error {
-        return nil
+	return nil
 }
 
 // ConvertFrom converts v1 to v1alpha1
 func (dst *ShardingDatabase) ConvertFrom(src conversion.Hub) error {
-        return nil
+	return nil
 }

apis/database/v4/dataguardbroker_conversion.go

@@ -1,4 +1,4 @@
 package v4
 
 // Hub defines v1 as the hub version
-func (*DataguardBroker) Hub() {}
+func (*DataguardBroker) Hub() {}

apis/database/v4/dbcssystem_webhook.go

@@ -70,7 +70,7 @@ func (r *DbcsSystem) Default() {
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
 
-//+kubebuilder:webhook:verbs=create;update;delete,path=/validate-database-oracle-com-v4-dbcssystem,mutating=false,failurePolicy=fail,sideEffects=None,groups=database.oracle.com,resources=dbcssystems,versions=v4,name=vdbcssystemv4.kb.io,admissionReviewVersions=v1
+// +kubebuilder:webhook:verbs=create;update;delete,path=/validate-database-oracle-com-v4-dbcssystem,mutating=false,failurePolicy=fail,sideEffects=None,groups=database.oracle.com,resources=dbcssystems,versions=v4,name=vdbcssystemv4.kb.io,admissionReviewVersions=v1
 var _ webhook.Validator = &DbcsSystem{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type

apis/database/v4/ordssrvs_types.go

@@ -70,8 +70,11 @@ type OrdsSrvsSpec struct {
 	// Contains settings that are configured across the entire ORDS instance.
 	GlobalSettings GlobalSettings `json:"globalSettings"`
 	// Contains settings for individual pools/databases
+	// Private key
+	EncPrivKey   PasswordSecret  `json:"encPrivKey,omitempty"`
 	PoolSettings []*PoolSettings `json:"poolSettings,omitempty"`
 	// +k8s:openapi-gen=true
+
 }
 
 type GlobalSettings struct {
@@ -593,6 +596,10 @@ type PoolSettings struct {
 	*/
 }
 
+type PriVKey struct {
+	Secret PasswordSecret `json:"secret"`
+}
+
 // Defines the secret containing Password mapped to secretKey
 type PasswordSecret struct {
 	// Specifies the name of the password Secret

apis/database/v4/shardingdatabase_types.go

@@ -148,7 +148,7 @@ type GsmStatusDetails struct {
 
 // ShardingDatabase is the Schema for the shardingdatabases API
 // +kubebuilder:resource:path=shardingdatabases,scope=Namespaced
- // +kubebuilder:storageversion
+// +kubebuilder:storageversion
 type ShardingDatabase struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

apis/database/v4/zz_generated.deepcopy.go

@@ -2791,6 +2791,7 @@ func (in *OrdsSrvsList) DeepCopyObject() runtime.Object {
 func (in *OrdsSrvsSpec) DeepCopyInto(out *OrdsSrvsSpec) {
 	*out = *in
 	in.GlobalSettings.DeepCopyInto(&out.GlobalSettings)
+	out.EncPrivKey = in.EncPrivKey
 	if in.PoolSettings != nil {
 		in, out := &in.PoolSettings, &out.PoolSettings
 		*out = make([]*PoolSettings, len(*in))
@@ -3434,6 +3435,22 @@ func (in *PortMapping) DeepCopy() *PortMapping {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *PriVKey) DeepCopyInto(out *PriVKey) {
+	*out = *in
+	out.Secret = in.Secret
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PriVKey.
+func (in *PriVKey) DeepCopy() *PriVKey {
+	if in == nil {
+		return nil
+	}
+	out := new(PriVKey)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *SecretDetails) DeepCopyInto(out *SecretDetails) {
 	*out = *in

commons/sharding/catalog.go

@@ -376,15 +376,15 @@ func volumeClaimTemplatesForCatalog(instance *databasev4.ShardingDatabase, OraCa
 	}
 
 	if len(OraCatalogSpex.PvAnnotations) > 0 {
-    claims[0].ObjectMeta.Annotations = make(map[string]string)
-    for key, value := range OraCatalogSpex.PvAnnotations {
-      claims[0].ObjectMeta.Annotations[key] = value
-    }
-  }
+		claims[0].ObjectMeta.Annotations = make(map[string]string)
+		for key, value := range OraCatalogSpex.PvAnnotations {
+			claims[0].ObjectMeta.Annotations[key] = value
+		}
+	}
 
-  if len(OraCatalogSpex.PvMatchLabels) > 0 {
-    claims[0].Spec.Selector = &metav1.LabelSelector{MatchLabels: OraCatalogSpex.PvMatchLabels}
-  }
+	if len(OraCatalogSpex.PvMatchLabels) > 0 {
+		claims[0].Spec.Selector = &metav1.LabelSelector{MatchLabels: OraCatalogSpex.PvMatchLabels}
+	}
 
 	if checkTdeWalletFlag(instance) {
 		if len(instance.Spec.FssStorageClass) > 0 && len(instance.Spec.TdeWalletPvc) == 0 {
@@ -526,4 +526,3 @@ func UpdateProvForCatalog(instance *databasev4.ShardingDatabase,
 
 	return ctrl.Result{}, nil
 }
-

commons/sharding/scommon.go

@@ -411,8 +411,8 @@ func LogMessages(msgtype string, msg string, err error, instance *databasev4.Sha
 	} else if msgtype == "INFO" {
 		logger.Info(msg)
 	} else if msgtype == "Error" {
-			logger.Error(err, msg)
-  }
+		logger.Error(err, msg)
+	}
 }
 
 func GetGsmPodName(gsmName string) string {

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

@@ -54,6 +54,16 @@ spec:
             type: object
           spec:
             properties:
+              encPrivKey:
+                properties:
+                  passwordKey:
+                    default: password
+                    type: string
+                  secretName:
+                    type: string
+                required:
+                - secretName
+                type: object
               forceRestart:
                 type: boolean
               globalSettings: