console: fix godoc, move extra env to end of genEnvVars()

redpanda-data · Jan 16, 2025 · 4911bfb · 4911bfb
1 parent dd19253
commit 4911bfb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/operator/api/vectorized/v1alpha1/console_types.go b/operator/api/vectorized/v1alpha1/console_types.go
@@ -178,8 +178,7 @@ type Deployment struct {
 	// See: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
 	Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
 
-	// +kubebuilder:pruning:PreserveUnknownFields
-	// Adds extra environment variables to the Pods that run Redpanda Console.
+	// ExtraEnv adds extra environment variables to the Pods that run Redpanda Console.
 	ExtraEnv []corev1.EnvVar `json:"extraEnv,omitempty"`
 }
 

diff --git a/operator/config/crd/bases/redpanda.vectorized.io_consoles.yaml b/operator/config/crd/bases/redpanda.vectorized.io_consoles.yaml
@@ -385,8 +385,8 @@ spec:
                   Deployment resource
                 properties:
                   extraEnv:
-                    description: Adds extra environment variables to the Pods that
-                      run Redpanda Console.
+                    description: ExtraEnv adds extra environment variables to the
+                      Pods that run Redpanda Console.
                     items:
                       description: EnvVar represents an environment variable present
                         in a Container.
@@ -505,7 +505,6 @@ spec:
                       - name
                       type: object
                     type: array
-                    x-kubernetes-preserve-unknown-fields: true
                   image:
                     type: string
                   imagePullPolicy:

diff --git a/operator/pkg/console/deployment.go b/operator/pkg/console/deployment.go
@@ -585,12 +585,6 @@ func (d *Deployment) getContainers(ctx context.Context, ss map[string]string) ([
 
 //nolint:funlen // the function could be refactored later
 func (d *Deployment) genEnvVars(ctx context.Context) (envars []corev1.EnvVar, err error) {
-	// first initialize to any custom provided env vars
-	// but we we override any of the ones we need to generate from other configs
-	if len(d.consoleobj.Spec.Deployment.ExtraEnv) > 0 {
-		envars = append(envars, d.consoleobj.Spec.Deployment.ExtraEnv...)
-	}
-
 	if d.clusterobj.IsSASLOnInternalEnabled() {
 		envars = append(envars, corev1.EnvVar{
 			Name: kafkaSASLBasicAuthPasswordEnvVar,
@@ -692,5 +686,8 @@ func (d *Deployment) genEnvVars(ctx context.Context) (envars []corev1.EnvVar, er
 		}
 	}
 
+	// add any custom provided env vars
+	envars = append(envars, d.consoleobj.Spec.Deployment.ExtraEnv...)
+
 	return envars, nil
 }