Merge pull request #5852 from azylinski/drop-projected-volumes-for-in…

…it-containers When comparing PodSpec semantically, drop projected volumes for init containers
kubernetes · Jun 15, 2023 · ec04940 · ec04940
2 parents 6fcc5fd + 296207c
commit ec04940
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/cluster-autoscaler/utils/utils.go b/cluster-autoscaler/utils/utils.go
@@ -94,6 +94,16 @@ func dropProjectedVolumesAndMounts(podSpec *apiv1.PodSpec) {
 		}
 		podSpec.Containers[i].VolumeMounts = volumeMounts
 	}
+
+	for i := range podSpec.InitContainers {
+		var volumeMounts []apiv1.VolumeMount
+		for _, mount := range podSpec.InitContainers[i].VolumeMounts {
+			if ok := projectedVolumeNames[mount.Name]; !ok {
+				volumeMounts = append(volumeMounts, mount)
+			}
+		}
+		podSpec.InitContainers[i].VolumeMounts = volumeMounts
+	}
 }
 
 func dropHostname(podSpec *apiv1.PodSpec) {

diff --git a/cluster-autoscaler/utils/utils_test.go b/cluster-autoscaler/utils/utils_test.go
@@ -111,13 +111,17 @@ func TestSanitizePodSpec(t *testing.T) {
 				},
 				Containers: []apiv1.Container{
 					{Image: "foo/bar", Name: "foobar", VolumeMounts: []apiv1.VolumeMount{{Name: "projected1"}}},
+				},
+				InitContainers: []apiv1.Container{
 					{Image: "foo/baz", Name: "foobaz", VolumeMounts: []apiv1.VolumeMount{{Name: "projected2"}}},
 				},
 			},
 			outputPodSpec: apiv1.PodSpec{
 				NodeSelector: map[string]string{"foo": "bar"},
 				Containers: []apiv1.Container{
 					{Image: "foo/bar", Name: "foobar"},
+				},
+				InitContainers: []apiv1.Container{
 					{Image: "foo/baz", Name: "foobaz"},
 				},
 			},