pkg/system/phase2_creating.go (1)

441-454: Fix typo and consider extracting duplicate filtering logic.

Minor issues:

1. Typo in comment: "older then 4.21" should be "older than 4.21"
2. This exact filtering pattern is duplicated in pkg/system/phase4_configuring.go (lines 372-380). Consider extracting it to a helper function like filterEnvVar(envVars []corev1.EnvVar, nameToFilter string) []corev1.EnvVar to follow the DRY principle.

The filtering logic itself is correct and uses the idiomatic in-place filtering pattern.

🔎 Proposed refactor to eliminate duplication

Add a helper function at the package level:

// filterEnvVar removes environment variables with the specified name from the slice
func filterEnvVar(envVars []corev1.EnvVar, nameToFilter string) []corev1.EnvVar {
	if len(envVars) == 0 {
		return envVars
	}
	filtered := envVars[:0]
	for _, env := range envVars {
		if env.Name != nameToFilter {
			filtered = append(filtered, env)
		}
	}
	return filtered
}

Then replace the filtering blocks with:

-	if len(c.Env) > 0 {
-		filtered := c.Env[:0]
-		for _, env := range c.Env {
-			if env.Name != "NOOBAA_ROOT_SECRET" {
-				filtered = append(filtered, env)
-			}
-		}
-		c.Env = filtered
-	}
+	c.Env = filterEnvVar(c.Env, "NOOBAA_ROOT_SECRET")

Apply the same change in both files.

pkg/system/phase4_configuring.go (1)

367-381: Fix typo and consider extracting duplicate filtering logic.

Minor issues:

1. Typo in comment: "older then 4.21" should be "older than 4.21"
2. This filtering logic is duplicated from pkg/system/phase2_creating.go (lines 446-454). Extract to a shared helper function to avoid code duplication.

The filtering logic itself is correct. The placement here (after util.MergeEnvArrays but before the env var processing loop) ensures the filter applies to the endpoint container's environment regardless of whether JoinSecret is set.

🔎 Proposed refactor

See the refactoring suggestion in the review comment for pkg/system/phase2_creating.go:441-454 to extract a shared filterEnvVar helper function.

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro