fix: generate config with only globalImageRegistryMirror set"

nutanix-cloud-native · Feb 14, 2024 · 3e43d0d · 3e43d0d
1 parent 17fa13f
commit 3e43d0d
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/pkg/handlers/generic/mutation/imageregistries/credentials/inject.go b/pkg/handlers/generic/mutation/imageregistries/credentials/inject.go
@@ -70,15 +70,26 @@ func (h *imageRegistriesPatchHandler) Mutate(
 		"holderRef", holderRef,
 	)
 
-	imageRegistries, found, err := variables.Get[v1alpha1.ImageRegistries](
+	imageRegistries, imageRegistriesFound, err := variables.Get[v1alpha1.ImageRegistries](
 		vars,
 		h.variableName,
 		h.variableFieldPath...,
 	)
 	if err != nil {
 		return err
 	}
-	if !found {
+
+	// add credentials for global image registry mirror
+	globalMirror, globalMirrorFound, err := variables.Get[v1alpha1.GlobalImageRegistryMirror](
+		vars,
+		h.variableName,
+		mirrors.GlobalMirrorVariableName,
+	)
+	if err != nil {
+		return err
+	}
+
+	if !imageRegistriesFound && !globalMirrorFound {
 		log.V(5).Info("Image Registry Credentials variable not defined")
 		return nil
 	}
@@ -100,16 +111,8 @@ func (h *imageRegistriesPatchHandler) Mutate(
 			registryWithOptionalCredentials,
 		)
 	}
-	// add credentials for global image registry mirror
-	globalMirror, found, err := variables.Get[v1alpha1.GlobalImageRegistryMirror](
-		vars,
-		h.variableName,
-		mirrors.GlobalMirrorVariableName,
-	)
-	if err != nil {
-		return err
-	}
-	if found {
+
+	if globalMirrorFound {
 		mirrorCredentials, generateErr := mirrorConfigFromGlobalImageRegistryMirror(
 			ctx,
 			h.client,