- Remove injectable configmap creation

- Generate `deploy.go` - Fix old bundle path references Signed-off-by: Ben <[email protected]>
noobaa · Apr 2, 2024 · ef708c9 · ef708c9
1 parent 3277d01
commit ef708c9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 26 deletions.
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -45,7 +45,7 @@ spec:
             mountPath: /var/run/secrets/openshift/serviceaccount
             readOnly: true
           - name: ocp-injected-ca-bundle
-            mountPath: /etc/pki/ca-trust/extracted/pem
+            mountPath: /etc/ocp-injected-ca-bundle.crt
             subPath: ocp-injected-ca-bundle.crt
           # SHOULD BE RETURNED ONCE COSI IS BACK
           # - name: socket

diff --git a/pkg/bundle/deploy.go b/pkg/bundle/deploy.go
@@ -3740,7 +3740,7 @@ spec:
     skipServiceCheck: true
 `
 
-const Sha256_deploy_internal_configmap_ca_inject_yaml = "75f8ab503a683bcebd2ed6a2c9f8da0a4c174a62b4e6ca7e97ebc3da847ca866"
+const Sha256_deploy_internal_configmap_ca_inject_yaml = "fac2305a04146c6b553398b1cb69b3ee2f32c5735359f5102590d43d33ccecba"
 
 const File_deploy_internal_configmap_ca_inject_yaml = `apiVersion: v1
 kind: ConfigMap
@@ -6005,7 +6005,7 @@ spec:
   sourceNamespace: default
 `
 
-const Sha256_deploy_operator_yaml = "1a2c110adc6763047d158e9021ea716e8d16ce734c0302c569b02e114189dff8"
+const Sha256_deploy_operator_yaml = "a15f459bcb91b03052ebc5f4ed062619c27f6adc245038a4317b05a69b280516"
 
 const File_deploy_operator_yaml = `apiVersion: apps/v1
 kind: Deployment
@@ -6585,3 +6585,4 @@ metadata:
     app: prometheus-adapter
   name: custom-metrics-prometheus-adapter
 `
+
diff --git a/pkg/system/phase2_creating.go b/pkg/system/phase2_creating.go
@@ -49,9 +49,6 @@ func (r *Reconciler) ReconcilePhaseCreating() error {
 		"noobaa operator started phase 2/4 - \"Creating\"",
 	)
 
-	if err := r.ReconcileCAInject(); err != nil {
-		return err
-	}
 	if err := r.ReconcileObject(r.ServiceAccount, r.SetDesiredServiceAccount); err != nil {
 		return err
 	}
@@ -483,7 +480,7 @@ func (r *Reconciler) SetDesiredCoreApp() error {
 			if util.KubeCheckQuiet(r.CaBundleConf) {
 				configMapVolumeMounts := []corev1.VolumeMount{{
 					Name:      r.CaBundleConf.Name,
-					MountPath: "/etc/pki/ca-trust/extracted/pem",
+					MountPath: "/etc/ocp-injected-ca-bundle.crt",
 					ReadOnly:  true,
 				}}
 				util.MergeVolumeMountList(&c.VolumeMounts, &configMapVolumeMounts)
@@ -524,7 +521,7 @@ func (r *Reconciler) SetDesiredCoreApp() error {
 			if util.KubeCheckQuiet(r.CaBundleConf) {
 				configMapVolumeMounts := []corev1.VolumeMount{{
 					Name:      r.CaBundleConf.Name,
-					MountPath: "/etc/pki/ca-trust/extracted/pem",
+					MountPath: "/etc/ocp-injected-ca-bundle.crt",
 					ReadOnly:  true,
 				}}
 				util.MergeVolumeMountList(&c.VolumeMounts, &configMapVolumeMounts)
@@ -830,23 +827,6 @@ func (r *Reconciler) ReconcileIBMCredentials() error {
 	return nil
 }
 
-// ReconcileCAInject checks if a namespace called openshift-config exist (OCP)
-// if so creates a cofig map for OCP to inject supported CAs to
-func (r *Reconciler) ReconcileCAInject() error {
-	ocpConfigNamespace := &corev1.Namespace{
-		TypeMeta: metav1.TypeMeta{Kind: "Namespace"},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "openshift-config",
-		},
-	}
-	if util.KubeCheckQuiet(ocpConfigNamespace) {
-		r.Logger.Infof("Found openshift-config ns - will reconcile CA inject configmap: %q", r.CaBundleConf.Name)
-		if err := r.ReconcileObject(r.CaBundleConf, nil); err != nil {
-			return err
-		}
-	}
-	return nil
-}
 
 // SetDesiredAgentProfile updates the value of the AGENT_PROFILE env
 func (r *Reconciler) SetDesiredAgentProfile(profileString string) string {

diff --git a/pkg/system/phase4_configuring.go b/pkg/system/phase4_configuring.go
@@ -496,7 +496,7 @@ func (r *Reconciler) setDesiredEndpointMounts(podSpec *corev1.PodSpec, container
 		util.MergeVolumeList(&podSpec.Volumes, &configMapVolumes)
 		configMapVolumeMounts := []corev1.VolumeMount{{
 			Name:      r.CaBundleConf.Name,
-			MountPath: "/etc/pki/ca-trust/extracted/pem",
+			MountPath: "/etc/ocp-injected-ca-bundle.crt",
 			ReadOnly:  true,
 		}}
 		util.MergeVolumeMountList(&container.VolumeMounts, &configMapVolumeMounts)