Only overwrite certain fields of the PodSpec

grafana · Jul 12, 2023 · 0150a95 · 0150a95
1 parent eb9dac8
commit 0150a95
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 2 deletions.
diff --git a/operator/internal/manifests/mutate.go b/operator/internal/manifests/mutate.go
@@ -231,8 +231,8 @@ func mutateDeployment(existing, desired *appsv1.Deployment) {
 		existing.Spec.Selector = desired.Spec.Selector
 	}
 	existing.Spec.Replicas = desired.Spec.Replicas
-	existing.Spec.Template = desired.Spec.Template
 	existing.Spec.Strategy = desired.Spec.Strategy
+	mutatePodTemplate(&existing.Spec.Template, &desired.Spec.Template)
 }
 
 func mutateStatefulSet(existing, desired *appsv1.StatefulSet) {
@@ -242,11 +242,27 @@ func mutateStatefulSet(existing, desired *appsv1.StatefulSet) {
 		existing.Spec.Selector = desired.Spec.Selector
 	}
 	existing.Spec.Replicas = desired.Spec.Replicas
-	existing.Spec.Template = desired.Spec.Template
+	mutatePodTemplate(&existing.Spec.Template, &desired.Spec.Template)
 }
 
 func mutatePodDisruptionBudget(existing, desired *policyv1.PodDisruptionBudget) {
 	existing.Annotations = desired.Annotations
 	existing.Labels = desired.Labels
 	existing.Spec = desired.Spec
 }
+
+func mutatePodTemplate(existing, desired *corev1.PodTemplateSpec) {
+	existing.Annotations = desired.Annotations
+	existing.Labels = desired.Labels
+	mutatePodSpec(&existing.Spec, &desired.Spec)
+}
+
+func mutatePodSpec(existing *corev1.PodSpec, desired *corev1.PodSpec) {
+	existing.Affinity = desired.Affinity
+	existing.Containers = desired.Containers
+	existing.InitContainers = desired.InitContainers
+	existing.NodeSelector = desired.NodeSelector
+	existing.Tolerations = desired.Tolerations
+	existing.TopologySpreadConstraints = desired.TopologySpreadConstraints
+	existing.Volumes = desired.Volumes
+}
diff --git a/operator/internal/manifests/mutate_test.go b/operator/internal/manifests/mutate_test.go
@@ -591,6 +591,39 @@ func TestMutateFuncFor_MutateDeploymentSpec(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "remove extra annotations and labels on pod",
+			got: &appsv1.Deployment{
+				Spec: appsv1.DeploymentSpec{
+					Template: corev1.PodTemplateSpec{
+						ObjectMeta: metav1.ObjectMeta{
+							Annotations: map[string]string{
+								"first-key":  "first-value",
+								"second-key": "second-value",
+							},
+							Labels: map[string]string{
+								"first-key":  "first-value",
+								"second-key": "second-value",
+							},
+						},
+					},
+				},
+			},
+			want: &appsv1.Deployment{
+				Spec: appsv1.DeploymentSpec{
+					Template: corev1.PodTemplateSpec{
+						ObjectMeta: metav1.ObjectMeta{
+							Annotations: map[string]string{
+								"first-key": "first-value",
+							},
+							Labels: map[string]string{
+								"first-key": "first-value",
+							},
+						},
+					},
+				},
+			},
+		},
 	}
 	for _, tst := range table {
 		tst := tst
@@ -748,6 +781,39 @@ func TestMutateFuncFor_MutateStatefulSetSpec(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "remove extra annotations and labels on pod",
+			got: &appsv1.StatefulSet{
+				Spec: appsv1.StatefulSetSpec{
+					Template: corev1.PodTemplateSpec{
+						ObjectMeta: metav1.ObjectMeta{
+							Annotations: map[string]string{
+								"first-key":  "first-value",
+								"second-key": "second-value",
+							},
+							Labels: map[string]string{
+								"first-key":  "first-value",
+								"second-key": "second-value",
+							},
+						},
+					},
+				},
+			},
+			want: &appsv1.StatefulSet{
+				Spec: appsv1.StatefulSetSpec{
+					Template: corev1.PodTemplateSpec{
+						ObjectMeta: metav1.ObjectMeta{
+							Annotations: map[string]string{
+								"first-key": "first-value",
+							},
+							Labels: map[string]string{
+								"first-key": "first-value",
+							},
+						},
+					},
+				},
+			},
+		},
 	}
 	for _, tst := range table {
 		tst := tst