Fix service-mirror template when running in HA mode (#11609)

Two clusters can be linked in HA mode. When HA values are used, the
service-mirror deployment receives some pod affinity rules to ensure
fair scheduling of pods across a cluster's nodes.

The service-mirror Deployment's template seems to be broken at the
moment when using HA values. Affinity rules are incorrectly grouped
under a top-level `podAntiAffinity` field. The Kubernetes API requires
the rules to be grouped under a top-level `affinity` field. This change
rectifies that by introducing the missing parent.

Fixes #11603

Signed-off-by: Matei David <[email protected]>

multicluster/charts/linkerd-multicluster-link/templates/service-mirror.yaml

@@ -120,9 +120,12 @@ spec:
         mirror.linkerd.io/cluster-name: {{.Values.targetClusterName}}
         {{- with .Values.podLabels }}{{ toYaml . | trim | nindent 8 }}{{- end }}
     spec:
-    {{- if .Values.enablePodAntiAffinity -}}
-    {{- $local := dict "label" "mirror.linkerd.io/cluster-name" "component" .Values.targetClusterName -}}
-    {{- include "linkerd.pod-affinity" $local | nindent 6 -}}
+    {{- if .Values.enablePodAntiAffinity}}
+    {{- with $tree := deepCopy . }}
+    {{- $_ := set $tree "component" .Values.targetClusterName -}}
+    {{- $_ := set $tree "label" "mirror.linkerd.io/cluster-name" -}}
+    {{- include "linkerd.affinity" $tree | nindent 6 }}
+    {{- end }}
     {{- end }}
       containers:
       - args:

multicluster/cmd/link_test.go

@@ -20,7 +20,15 @@ func TestServiceMirrorRender(t *testing.T) {
 		{
 			linkValues,
 			nil,
-			"serivce_mirror_default.golden",
+			"service_mirror_default.golden",
+		},
+
+		{
+			linkValues,
+			map[string]interface{}{
+				"enablePodAntiAffinity": true,
+			},
+			"service_mirror_ha.golden",
 		},
 	}
 	for i, tc := range testCases {