Eliminate init containers and their artifacts

Init containers are no longer required now that the controllers fully maintain the each service's config files.
openstack-k8s-operators · Jun 9, 2023 · d177df3 · d177df3
1 parent 4b5685e
commit d177df3
Show file tree

Hide file tree

Showing 26 changed files with 6 additions and 548 deletions.
diff --git a/api/bases/cinder.openstack.org_cinderapis.yaml b/api/bases/cinder.openstack.org_cinderapis.yaml
@@ -55,9 +55,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  initContainer:
-                    default: false
-                    type: boolean
                   service:
                     default: false
                     type: boolean

diff --git a/api/bases/cinder.openstack.org_cinderbackups.yaml b/api/bases/cinder.openstack.org_cinderbackups.yaml
@@ -55,9 +55,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  initContainer:
-                    default: false
-                    type: boolean
                   service:
                     default: false
                     type: boolean

diff --git a/api/bases/cinder.openstack.org_cinders.yaml b/api/bases/cinder.openstack.org_cinders.yaml
@@ -48,9 +48,6 @@ spec:
                     type: array
                   debug:
                     properties:
-                      initContainer:
-                        default: false
-                        type: boolean
                       service:
                         default: false
                         type: boolean
@@ -143,9 +140,6 @@ spec:
                     type: array
                   debug:
                     properties:
-                      initContainer:
-                        default: false
-                        type: boolean
                       service:
                         default: false
                         type: boolean
@@ -212,9 +206,6 @@ spec:
                     type: array
                   debug:
                     properties:
-                      initContainer:
-                        default: false
-                        type: boolean
                       service:
                         default: false
                         type: boolean
@@ -282,9 +273,6 @@ spec:
                       type: array
                     debug:
                       properties:
-                        initContainer:
-                          default: false
-                          type: boolean
                         service:
                           default: false
                           type: boolean
@@ -350,9 +338,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  dbInitContainer:
-                    default: false
-                    type: boolean
                   dbSync:
                     default: false
                     type: boolean

diff --git a/api/bases/cinder.openstack.org_cinderschedulers.yaml b/api/bases/cinder.openstack.org_cinderschedulers.yaml
@@ -55,9 +55,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  initContainer:
-                    default: false
-                    type: boolean
                   service:
                     default: false
                     type: boolean

diff --git a/api/bases/cinder.openstack.org_cindervolumes.yaml b/api/bases/cinder.openstack.org_cindervolumes.yaml
@@ -55,9 +55,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  initContainer:
-                    default: false
-                    type: boolean
                   service:
                     default: false
                     type: boolean

diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
@@ -105,10 +105,6 @@ type PasswordSelector struct {
 // CinderDebug indicates whether certain stages of Cinder deployment should
 // pause in debug mode
 type CinderDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// dbInitContainer enable debug (waits until /tmp/stop-init-container disappears)
-	DBInitContainer bool `json:"dbInitContainer"`
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=false
 	// dbSync enable debug
@@ -118,10 +114,6 @@ type CinderDebug struct {
 // CinderServiceDebug indicates whether certain stages of Cinder service
 // deployment should pause in debug mode
 type CinderServiceDebug struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=false
-	// initContainer enable debug (waits until /tmp/stop-init-container disappears)
-	InitContainer bool `json:"initContainer"`
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=false
 	// service enable debug

diff --git a/config/crd/bases/cinder.openstack.org_cinderapis.yaml b/config/crd/bases/cinder.openstack.org_cinderapis.yaml
@@ -55,9 +55,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  initContainer:
-                    default: false
-                    type: boolean
                   service:
                     default: false
                     type: boolean

diff --git a/config/crd/bases/cinder.openstack.org_cinderbackups.yaml b/config/crd/bases/cinder.openstack.org_cinderbackups.yaml
@@ -55,9 +55,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  initContainer:
-                    default: false
-                    type: boolean
                   service:
                     default: false
                     type: boolean

diff --git a/config/crd/bases/cinder.openstack.org_cinders.yaml b/config/crd/bases/cinder.openstack.org_cinders.yaml
@@ -48,9 +48,6 @@ spec:
                     type: array
                   debug:
                     properties:
-                      initContainer:
-                        default: false
-                        type: boolean
                       service:
                         default: false
                         type: boolean
@@ -143,9 +140,6 @@ spec:
                     type: array
                   debug:
                     properties:
-                      initContainer:
-                        default: false
-                        type: boolean
                       service:
                         default: false
                         type: boolean
@@ -212,9 +206,6 @@ spec:
                     type: array
                   debug:
                     properties:
-                      initContainer:
-                        default: false
-                        type: boolean
                       service:
                         default: false
                         type: boolean
@@ -282,9 +273,6 @@ spec:
                       type: array
                     debug:
                       properties:
-                        initContainer:
-                          default: false
-                          type: boolean
                         service:
                           default: false
                           type: boolean
@@ -350,9 +338,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  dbInitContainer:
-                    default: false
-                    type: boolean
                   dbSync:
                     default: false
                     type: boolean

diff --git a/config/crd/bases/cinder.openstack.org_cinderschedulers.yaml b/config/crd/bases/cinder.openstack.org_cinderschedulers.yaml
@@ -55,9 +55,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  initContainer:
-                    default: false
-                    type: boolean
                   service:
                     default: false
                     type: boolean

diff --git a/config/crd/bases/cinder.openstack.org_cindervolumes.yaml b/config/crd/bases/cinder.openstack.org_cindervolumes.yaml
@@ -55,9 +55,6 @@ spec:
                 type: string
               debug:
                 properties:
-                  initContainer:
-                    default: false
-                    type: boolean
                   service:
                     default: false
                     type: boolean

diff --git a/controllers/cinder_controller.go b/controllers/cinder_controller.go
@@ -825,12 +825,11 @@ func (r *CinderReconciler) generateServiceConfigMaps(
 	cms := []util.Template{
 		// ScriptsConfigMap
 		{
-			Name:               fmt.Sprintf("%s-scripts", instance.Name),
-			Namespace:          instance.Namespace,
-			Type:               util.TemplateTypeScripts,
-			InstanceType:       instance.Kind,
-			AdditionalTemplate: map[string]string{"common.sh": "/common/common.sh"},
-			Labels:             cmLabels,
+			Name:         fmt.Sprintf("%s-scripts", instance.Name),
+			Namespace:    instance.Namespace,
+			Type:         util.TemplateTypeScripts,
+			InstanceType: instance.Kind,
+			Labels:       cmLabels,
 		},
 		// ConfigMap
 		{

diff --git a/pkg/cinder/dbsync.go b/pkg/cinder/dbsync.go
@@ -99,18 +99,5 @@ func DbSyncJob(instance *cinderv1beta1.Cinder, labels map[string]string, annotat
 		},
 	}
 
-	initContainerDetails := APIDetails{
-		ContainerImage:       instance.Spec.CinderAPI.ContainerImage,
-		DatabaseHost:         instance.Status.DatabaseHostname,
-		DatabaseUser:         instance.Spec.DatabaseUser,
-		DatabaseName:         DatabaseName,
-		OSPSecret:            instance.Spec.Secret,
-		DBPasswordSelector:   instance.Spec.PasswordSelectors.Database,
-		UserPasswordSelector: instance.Spec.PasswordSelectors.Service,
-		VolumeMounts:         GetInitVolumeMounts(dbSyncExtraMounts, DbsyncPropagation),
-		Debug:                instance.Spec.Debug.DBInitContainer,
-	}
-	job.Spec.Template.Spec.InitContainers = InitContainer(initContainerDetails)
-
 	return job
 }
diff --git a/pkg/cinder/initcontainer.go b/pkg/cinder/initcontainer.go
diff --git a/pkg/cinder/volumes.go b/pkg/cinder/volumes.go
@@ -131,30 +131,7 @@ func GetVolumes(name string, storageSvc bool, extraVol []cinderv1beta1.CinderExt
 	return res
 }
 
-// GetInitVolumeMounts - Nova Control Plane init task VolumeMounts
-func GetInitVolumeMounts(extraVol []cinderv1beta1.CinderExtraVolMounts, svc []storage.PropagationType) []corev1.VolumeMount {
-	vm := []corev1.VolumeMount{
-		{
-			Name:      "scripts",
-			MountPath: "/usr/local/bin/container-scripts",
-			ReadOnly:  true,
-		},
-		{
-			Name:      "config-data",
-			MountPath: "/var/lib/config-data/default",
-			ReadOnly:  true,
-		},
-	}
-
-	for _, exv := range extraVol {
-		for _, vol := range exv.Propagate(svc) {
-			vm = append(vm, vol.Mounts...)
-		}
-	}
-	return vm
-}
-
-// GetVolumeMounts - Nova Control Plane VolumeMounts
+// GetVolumeMounts - Cinder Control Plane VolumeMounts
 func GetVolumeMounts(storageSvc bool, extraVol []cinderv1beta1.CinderExtraVolMounts, svc []storage.PropagationType) []corev1.VolumeMount {
 	res := []corev1.VolumeMount{
 		{