Remove plaintext secret option (#73)

* changes from upstream * admin user pass will be random string * code-dev * update CRD and CSV * remove from MongoDBSPec
IBM · Mar 26, 2020 · b5c7deb · b5c7deb
1 parent ec4df92
commit b5c7deb
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 32 deletions.
diff --git a/deploy/crds/operator.ibm.com_mongodbs_crd.yaml b/deploy/crds/operator.ibm.com_mongodbs_crd.yaml
@@ -48,17 +48,10 @@ spec:
                 tag:
                   type: string
               type: object
-            mongoDBPass:
-              type: string
-            mongoDBUser:
-              type: string
             replicas:
               type: integer
             storageClass:
               type: string
-          required:
-          - mongoDBPass
-          - mongoDBUser
           type: object
         status:
           description: MongoDBStatus defines the observed state of MongoDB

diff --git a/deploy/crds/operator.ibm.com_v1alpha1_mongodb_cr.yaml b/deploy/crds/operator.ibm.com_v1alpha1_mongodb_cr.yaml
@@ -11,5 +11,3 @@ spec:
     tag: 4.0.12-build.3
   metricsImage:
     tag: 3.4.0
-  mongoDBUser: ChangeMeAdmin
-  mongoDBPass: ChangeMePass
diff --git a/...catalog/ibm-mongodb-operator/1.0.0/ibm-mongodb-operator.v1.0.0.clusterserviceversion.yaml b/...catalog/ibm-mongodb-operator/1.0.0/ibm-mongodb-operator.v1.0.0.clusterserviceversion.yaml
@@ -21,8 +21,6 @@ metadata:
             "metricsImage": {
               "tag": "3.4.0"
             },
-            "mongoDBPass": "ChangeMePass",
-            "mongoDBUser": "ChangeMeAdmin",
             "replicas": 3
           }
         }

diff --git a/deploy/olm-catalog/ibm-mongodb-operator/1.0.0/operator.ibm.com_mongodbs_crd.yaml b/deploy/olm-catalog/ibm-mongodb-operator/1.0.0/operator.ibm.com_mongodbs_crd.yaml
@@ -48,17 +48,10 @@ spec:
                 tag:
                   type: string
               type: object
-            mongoDBPass:
-              type: string
-            mongoDBUser:
-              type: string
             replicas:
               type: integer
             storageClass:
               type: string
-          required:
-          - mongoDBPass
-          - mongoDBUser
           type: object
         status:
           description: MongoDBStatus defines the observed state of MongoDB

diff --git a/pkg/apis/operator/v1alpha1/mongodb_types.go b/pkg/apis/operator/v1alpha1/mongodb_types.go
@@ -31,8 +31,6 @@ type MongoDBSpec struct {
 	ImageRegistry  string `json:"imageRegistry,omitempty"`
 	Replicas       int    `json:"replicas,omitempty"`
 	StorageClass   string `json:"storageClass,omitempty"`
-	MongoDBUser    string `json:"mongoDBUser"`
-	MongoDBPass    string `json:"mongoDBPass"`
 	InitImage      Image  `json:"initImage,omitempty"`
 	BootstrapImage Image  `json:"bootstrapImage,omitempty"`
 	MetricsImage   Image  `json:"metricsImage,omitempty"`

diff --git a/pkg/controller/mongodb/mongodb_controller.go b/pkg/controller/mongodb/mongodb_controller.go
@@ -160,19 +160,11 @@ func (r *ReconcileMongoDB) Reconcile(request reconcile.Request) (reconcile.Resul
 		return reconcile.Result{}, err
 	}
 
+	// Create admin user and password as random string
+	// TODO: allow user to give a Secret
 	var pass, user string
-	if instance.Spec.MongoDBPass == "" {
-		pass = createRandomAlphaNumeric(13)
-	} else {
-		pass = instance.Spec.MongoDBPass
-	}
-
-	if instance.Spec.MongoDBUser == "" {
-		user = createRandomAlphaNumeric(8)
-	} else {
-		user = instance.Spec.MongoDBUser
-	}
-
+	user = createRandomAlphaNumeric(8)
+	pass = createRandomAlphaNumeric(13)
 	mongodbAdmin := &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: map[string]string{