Minor cert handling modifications

Signed-off-by: Ben <[email protected]>

Author: Neon-White

pkg/system/phase2_creating.go

@@ -473,7 +473,7 @@ func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) {
 				c.Env[j].Value = "true"
 			}
 		case "NODE_EXTRA_CA_CERTS":
-			c.Env[j].Value = r.ApplyCAsToPods
+			c.Env[j].Value = util.CombinedCaBundlePath
 		case "GUARANTEED_LOGS_PATH":
 			if r.NooBaa.Spec.BucketLogging.LoggingType == nbv1.BucketLoggingTypeGuaranteed {
 				c.Env[j].Value = r.BucketLoggingVolumeMount

pkg/system/phase4_configuring.go

@@ -414,7 +414,7 @@ func (r *Reconciler) SetDesiredDeploymentEndpoint() error {
 						c.Env[j].Value = ""
 					}
 				case "NODE_EXTRA_CA_CERTS":
-					c.Env[j].Value = r.ApplyCAsToPods
+					c.Env[j].Value = util.CombinedCaBundlePath
 				case "GUARANTEED_LOGS_PATH":
 					if r.NooBaa.Spec.BucketLogging.LoggingType == nbv1.BucketLoggingTypeGuaranteed {
 						c.Env[j].Value = r.BucketLoggingVolumeMount
@@ -1371,7 +1371,7 @@ func (r *Reconciler) prepareCephBackingStore() error {
 		Transport: util.InsecureHTTPTransport,
 		Timeout:   10 * time.Second,
 	}
-	if r.ApplyCAsToPods != "" {
+	if r.UseRefreshingTransport {
 		client.Transport = util.GlobalCARefreshingTransport
 	}
 

pkg/system/reconciler.go

@@ -68,7 +68,7 @@ type Reconciler struct {
 	OperatorVersion          string
 	OAuthEndpoints           *util.OAuth2Endpoints
 	PostgresConnectionString string
-	ApplyCAsToPods           string // the CA will be applied to the core and endpoint pods
+	UseRefreshingTransport   bool
 
 	NooBaa                    *nbv1.NooBaa
 	ServiceAccount            *corev1.ServiceAccount
@@ -406,8 +406,7 @@ func (r *Reconciler) Reconcile() (reconcile.Result, error) {
 
 	err = util.CombineCaBundle(util.ServiceServingCertCAFile)
 	if err == nil {
-		// r.ApplyCAsToPods = util.InjectedBundleCertCAFile
-		r.ApplyCAsToPods = util.ServiceServingCertCAFile // back as it was
+		r.UseRefreshingTransport = true
 	} else if !os.IsNotExist(err) {
 		log.Errorf("❌ NooBaa %q failed to add root CAs to system default", r.NooBaa.Name)
 		res.RequeueAfter = 3 * time.Second

pkg/util/util.go

@@ -90,6 +90,9 @@ const (
 
 	// InjectedBundleCertCAFile points to OCP root CA to be added to the default root CA list
 	InjectedBundleCertCAFile = "/etc/ocp-injected-ca-bundle/ca-bundle.crt"
+
+	// CombinedCaBundlePath points to the combined CA bundle file
+	CombinedCaBundlePath = "/tmp/ca-bundle.crt"
 )
 
 // OAuth2Endpoints holds OAuth2 endpoints information.