[Feature][Add] Added imagePullsecrets support

.azure-pipelines/pipeline.yaml

@@ -24,4 +24,4 @@ extends:
     QuayImageName: opstree/mongodb-operator
     GithubImageName: ot-container-kit/mongodb-operator/mongodb-operator
     BuildDocs: false
-    AppVersion: "0.1.0"
+    AppVersion: "0.2.0"

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.16 as builder
+FROM golang:1.17 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

api/v1alpha1/common_types.go

@@ -6,10 +6,10 @@ import (
 
 // KubernetesConfig will be the JSON struct for Basic MongoDB Config
 type KubernetesConfig struct {
-	Image            string                         `json:"image"`
-	ImagePullPolicy  corev1.PullPolicy              `json:"imagePullPolicy,omitempty"`
-	Resources        *corev1.ResourceRequirements   `json:"resources,omitempty"`
-	ImagePullSecrets *[]corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
+	Image           string                       `json:"image"`
+	ImagePullPolicy corev1.PullPolicy            `json:"imagePullPolicy,omitempty"`
+	Resources       *corev1.ResourceRequirements `json:"resources,omitempty"`
+	ImagePullSecret *string                      `json:"imagePullSecret,omitempty"`
 }
 
 // MongoDBSecurity is the JSON struct for MongoDB security configuration

config/crd/bases/opstreelabs.in_mongodbclusters.yaml

@@ -51,17 +51,8 @@ spec:
                     description: PullPolicy describes a policy for if/when to pull
                       a container image
                     type: string
-                  imagePullSecrets:
-                    items:
-                      description: LocalObjectReference contains enough information
-                        to let you locate the referenced object inside the same namespace.
-                      properties:
-                        name:
-                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Add other useful fields. apiVersion, kind, uid?'
-                          type: string
-                      type: object
-                    type: array
+                  imagePullSecret:
+                    type: string
                   resources:
                     description: ResourceRequirements describes the compute resource
                       requirements.
@@ -191,18 +182,8 @@ spec:
                         description: PullPolicy describes a policy for if/when to
                           pull a container image
                         type: string
-                      imagePullSecrets:
-                        items:
-                          description: LocalObjectReference contains enough information
-                            to let you locate the referenced object inside the same
-                            namespace.
-                          properties:
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                          type: object
-                        type: array
+                      imagePullSecret:
+                        type: string
                       resources:
                         description: ResourceRequirements describes the compute resource
                           requirements.

config/crd/bases/opstreelabs.in_mongodbs.yaml

@@ -46,17 +46,8 @@ spec:
                     description: PullPolicy describes a policy for if/when to pull
                       a container image
                     type: string
-                  imagePullSecrets:
-                    items:
-                      description: LocalObjectReference contains enough information
-                        to let you locate the referenced object inside the same namespace.
-                      properties:
-                        name:
-                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                            TODO: Add other useful fields. apiVersion, kind, uid?'
-                          type: string
-                      type: object
-                    type: array
+                  imagePullSecret:
+                    type: string
                   resources:
                     description: ResourceRequirements describes the compute resource
                       requirements.
@@ -180,18 +171,8 @@ spec:
                         description: PullPolicy describes a policy for if/when to
                           pull a container image
                         type: string
-                      imagePullSecrets:
-                        items:
-                          description: LocalObjectReference contains enough information
-                            to let you locate the referenced object inside the same
-                            namespace.
-                          properties:
-                            name:
-                              description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
-                                TODO: Add other useful fields. apiVersion, kind, uid?'
-                              type: string
-                          type: object
-                        type: array
+                      imagePullSecret:
+                        type: string
                       resources:
                         description: ResourceRequirements describes the compute resource
                           requirements.

examples/private_registry/clusterd.yaml

@@ -0,0 +1,20 @@
+---
+apiVersion: opstreelabs.in/v1alpha1
+kind: MongoDBCluster
+metadata:
+  name: mongodb
+spec:
+  clusterSize: 3
+  kubernetesConfig:
+    image: quay.io/opstree/mongo:v5.0
+    imagePullPolicy: IfNotPresent
+    imagePullSecret: regcred
+  storage:
+    accessModes: ["ReadWriteOnce"]
+    storageSize: 1Gi
+    storageClass: csi-cephfs-sc
+  mongoDBSecurity:
+    mongoDBAdminUser: admin
+    secretRef:
+      name: mongodb-secret
+      key: password

examples/private_registry/standalone.yaml

@@ -0,0 +1,19 @@
+---
+apiVersion: opstreelabs.in/v1alpha1
+kind: MongoDB
+metadata:
+  name: mongodb
+spec:
+  kubernetesConfig:
+    image: quay.io/opstree/mongo:v5.0
+    imagePullPolicy: IfNotPresent
+    imagePullSecret: regcred
+  storage:
+    accessModes: ["ReadWriteOnce"]
+    storageSize: 1Gi
+    storageClass: csi-cephfs-sc 
+  mongoDBSecurity:
+    mongoDBAdminUser: admin
+    secretRef:
+      name: mongodb-secret
+      key: password

k8sgo/cluster.go

@@ -130,6 +130,10 @@ func getMongoDBClusterParams(cr *opstreelabsinv1alpha1.MongoDBCluster) statefulS
 		Annotations: generateAnnotations(),
 	}
 
+	if cr.Spec.KubernetesConfig.ImagePullSecret != nil {
+		params.ImagePullSecret = cr.Spec.KubernetesConfig.ImagePullSecret
+	}
+
 	if cr.Spec.MongoDBSecurity != nil {
 		params.ContainerParams.MongoDBUser = &cr.Spec.MongoDBSecurity.MongoDBAdminUser
 		params.ContainerParams.SecretName = cr.Spec.MongoDBSecurity.SecretRef.Name

k8sgo/standalone.go

@@ -118,6 +118,9 @@ func getMongoDBStandaloneParams(cr *opstreelabsinv1alpha1.MongoDB) statefulSetPa
 		Annotations: generateAnnotations(),
 	}
 
+	if cr.Spec.KubernetesConfig.ImagePullSecret != nil {
+		params.ImagePullSecret = cr.Spec.KubernetesConfig.ImagePullSecret
+	}
 	if cr.Spec.MongoDBSecurity != nil {
 		params.ContainerParams.MongoDBUser = &cr.Spec.MongoDBSecurity.MongoDBAdminUser
 		params.ContainerParams.SecretName = cr.Spec.MongoDBSecurity.SecretRef.Name

k8sgo/statefulset.go

@@ -23,6 +23,7 @@ type statefulSetParameters struct {
 	Replicas        *int32
 	PVCParameters   pvcParameters
 	ExtraVolumes    *[]corev1.Volume
+	ImagePullSecret *string
 }
 
 // pvcParameters is the structure for MongoDB PVC
@@ -149,6 +150,9 @@ func generateStatefulSetDef(params statefulSetParameters) *appsv1.StatefulSet {
 	if params.ExtraVolumes != nil {
 		statefulset.Spec.Template.Spec.Volumes = *params.ExtraVolumes
 	}
+	if params.ImagePullSecret != nil {
+		statefulset.Spec.Template.Spec.ImagePullSecrets = []corev1.LocalObjectReference{{Name: *params.ImagePullSecret}}
+	}
 	AddOwnerRefToObject(statefulset, params.OwnerDef)
 	return statefulset
 }
@@ -165,6 +169,7 @@ func generatePersistentVolumeTemplate(params pvcParameters) corev1.PersistentVol
 					corev1.ResourceName(corev1.ResourceStorage): resource.MustParse(params.StorageSize),
 				},
 			},
+			StorageClassName: params.StorageClassName,
 		},
 	}
 }