Make the akamai secret configurable

Author: adamrdrew

api/v1alpha1/frontendenvironment_types.go

@@ -60,6 +60,8 @@ type FrontendEnvironmentSpec struct {
 	AkamaiCacheBustImage string `json:"akamaiCacheBustImage,omitempty"`
 	// Set Akamai Cache Bust URL that the files will hang off of
 	AkamaiCacheBustURL string `json:"akamaiCacheBustURL,omitempty"`
+	// The name of the secret we will use to get the akamai credentials
+	AkamaiSecretName string `json:"akamaiSecretName,omitempty"`
 }
 
 type MonitoringConfig struct {

config/crd/bases/cloud.redhat.com_frontendenvironments.yaml

@@ -52,6 +52,10 @@ spec:
                 description: Set Akamai Cache Bust URL that the files will hang off
                   of
                 type: string
+              akamaiSecretName:
+                description: The name of the secret we will use to get the akamai
+                  credentials
+                type: string
               enableAkamaiCacheBust:
                 description: Enable Akamai Cache Bust
                 type: boolean

controllers/reconcile.go

@@ -27,7 +27,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-const RoutePrefixDefault = "apps"
+const (
+	RoutePrefixDefault      = "apps"
+	AkamaiSecretNameDefault = "akamai"
+)
 
 type FrontendReconciliation struct {
 	Log                 logr.Logger
@@ -132,10 +135,17 @@ func populateContainer(d *apps.Deployment, frontend *crd.Frontend, frontendEnvir
 	}
 }
 
+func getAkamaiSecretName(frontendEnvironment *crd.FrontendEnvironment) string {
+	if frontendEnvironment.Spec.AkamaiSecretName == "" {
+		return AkamaiSecretNameDefault
+	}
+	return frontendEnvironment.Spec.AkamaiSecretName
+}
+
 // getAkamaiSecret gets the akamai secret from the cluster
-func getAkamaiSecret(ctx context.Context, client client.Client, frontend *crd.Frontend) (*v1.Secret, error) {
+func getAkamaiSecret(ctx context.Context, client client.Client, frontend *crd.Frontend, secretName string) (*v1.Secret, error) {
 	secret := &v1.Secret{}
-	err := client.Get(ctx, types.NamespacedName{Name: "akamai", Namespace: frontend.Namespace}, secret)
+	err := client.Get(ctx, types.NamespacedName{Name: secretName, Namespace: frontend.Namespace}, secret)
 	if err != nil {
 		return nil, err
 	}
@@ -201,7 +211,8 @@ func (r *FrontendReconciliation) populateInitContainer(d *apps.Deployment, front
 	}
 
 	// Get the akamai secret
-	secret, err := getAkamaiSecret(r.Ctx, r.Client, frontend)
+	akamaiSecretName := getAkamaiSecretName(frontendEnvironment)
+	secret, err := getAkamaiSecret(r.Ctx, r.Client, frontend, akamaiSecretName)
 	if err != nil {
 		return err
 	}

deploy.yml

@@ -353,6 +353,10 @@ objects:
                   description: Set Akamai Cache Bust URL that the files will hang
                     off of
                   type: string
+                akamaiSecretName:
+                  description: The name of the secret we will use to get the akamai
+                    credentials
+                  type: string
                 enableAkamaiCacheBust:
                   description: Enable Akamai Cache Bust
                   type: boolean

docs/antora/modules/ROOT/pages/api_reference.adoc

@@ -317,6 +317,7 @@ FrontendEnvironmentSpec defines the desired state of FrontendEnvironment
 | *`enableAkamaiCacheBust`* __boolean__ | Enable Akamai Cache Bust
 | *`akamaiCacheBustImage`* __string__ | Set Akamai Cache Bust Image
 | *`akamaiCacheBustURL`* __string__ | Set Akamai Cache Bust URL that the files will hang off of
+| *`akamaiSecretName`* __string__ | The name of the secret we will use to get the akamai credentials
 |===