fix: remove duplicates from imagePullSecrets (#3923)

Signed-off-by: Julien Mancuso <jmancuso@nvidia.com>

deploy/cloud/helm/platform/components/operator/templates/deployment.yaml

@@ -87,12 +87,12 @@ spec:
         {{- if .Values.natsAddr }}
           - --natsAddr={{ .Values.natsAddr }}
         {{- else }}
-          - --natsAddr=nats://{{ .Release.Name }}-nats.{{ .Release.Namespace }}:4222
+          - --natsAddr=nats://{{ .Release.Name }}-nats.{{ .Release.Namespace }}.svc.cluster.local:4222
         {{- end }}
         {{- if .Values.etcdAddr }}
           - --etcdAddr={{ .Values.etcdAddr }}
         {{- else }}
-          - --etcdAddr={{ .Release.Name }}-etcd.{{ .Release.Namespace }}:2379
+          - --etcdAddr={{ .Release.Name }}-etcd.{{ .Release.Namespace }}.svc.cluster.local:2379
         {{- end }}
         {{- if and .Values.dynamo.istio.enabled .Values.dynamo.istio.gateway }}
           - --istio-virtual-service-gateway={{ .Values.dynamo.istio.gateway }}

deploy/cloud/operator/internal/controller_common/pod.go

@@ -101,9 +101,11 @@ func CanonicalizePodSpec(podSpec *corev1.PodSpec) *corev1.PodSpec {
 
 	// Sort image pull secrets
 	if len(podSpec.ImagePullSecrets) > 1 {
-		sort.Slice(podSpec.ImagePullSecrets, func(i, j int) bool {
-			return podSpec.ImagePullSecrets[i].Name < podSpec.ImagePullSecrets[j].Name
+		uniqueSecrets := ensureUniqueImagePullSecrets(podSpec.ImagePullSecrets)
+		sort.Slice(uniqueSecrets, func(i, j int) bool {
+			return uniqueSecrets[i].Name < uniqueSecrets[j].Name
 		})
+		podSpec.ImagePullSecrets = uniqueSecrets
 	}
 
 	// Sort volumes and their nested items
@@ -275,3 +277,18 @@ func CanonicalizePodSpec(podSpec *corev1.PodSpec) *corev1.PodSpec {
 
 	return podSpec
 }
+
+func ensureUniqueImagePullSecrets(secrets []corev1.LocalObjectReference) []corev1.LocalObjectReference {
+	if len(secrets) == 0 {
+		return nil
+	}
+	uniqueSecrets := make(map[string]corev1.LocalObjectReference)
+	for _, secret := range secrets {
+		uniqueSecrets[secret.Name] = secret
+	}
+	uniqueSecretsList := make([]corev1.LocalObjectReference, 0, len(uniqueSecrets))
+	for secretName := range uniqueSecrets {
+		uniqueSecretsList = append(uniqueSecretsList, corev1.LocalObjectReference{Name: secretName})
+	}
+	return uniqueSecretsList
+}

deploy/cloud/operator/internal/controller_common/pod_test.go

@@ -208,6 +208,7 @@ func TestCanonicalizePodSpec(t *testing.T) {
 					{Name: "registry-z"},
 					{Name: "registry-a"},
 					{Name: "registry-b"},
+					{Name: "registry-a"},
 				},
 			},
 			expected: &corev1.PodSpec{
@@ -218,6 +219,15 @@ func TestCanonicalizePodSpec(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "sorts nil image pull secrets",
+			input: &corev1.PodSpec{
+				ImagePullSecrets: nil,
+			},
+			expected: &corev1.PodSpec{
+				ImagePullSecrets: nil,
+			},
+		},
 		{
 			name: "sorts volumes by name",
 			input: &corev1.PodSpec{