Merge pull request #7152 from walidghallab/sanitize

Sanitize ENV from podSpec to improve scheduling simulation performance.

Author: k8s-ci-robot

cluster-autoscaler/utils/utils.go

@@ -70,9 +70,19 @@ func PodSpecSemanticallyEqual(p1 apiv1.PodSpec, p2 apiv1.PodSpec) bool {
 func sanitizePodSpec(podSpec apiv1.PodSpec) apiv1.PodSpec {
 	dropProjectedVolumesAndMounts(&podSpec)
 	dropHostname(&podSpec)
+	dropEnv(&podSpec)
 	return podSpec
 }
 
+func dropEnv(podSpec *apiv1.PodSpec) {
+	for i := range podSpec.Containers {
+		podSpec.Containers[i].Env = nil
+	}
+	for i := range podSpec.InitContainers {
+		podSpec.InitContainers[i].Env = nil
+	}
+}
+
 func dropProjectedVolumesAndMounts(podSpec *apiv1.PodSpec) {
 	projectedVolumeNames := map[string]bool{}
 	var volumes []apiv1.Volume

cluster-autoscaler/utils/utils_test.go

@@ -17,10 +17,11 @@ limitations under the License.
 package utils
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/autoscaler/cluster-autoscaler/utils/test"
-	"testing"
 )
 
 func TestPodSpecSemanticallyEqual(t *testing.T) {
@@ -46,6 +47,26 @@ func TestPodSpecSemanticallyEqual(t *testing.T) {
 			},
 			result: true,
 		},
+		{
+			name: "two pods with different ENV",
+			p1Spec: apiv1.PodSpec{
+				Containers: []apiv1.Container{
+					{Env: []apiv1.EnvVar{{Name: "foo", Value: "bar"}}},
+				},
+				InitContainers: []apiv1.Container{
+					{Env: []apiv1.EnvVar{{Name: "foo", Value: "bar"}}},
+				},
+			},
+			p2Spec: apiv1.PodSpec{
+				Containers: []apiv1.Container{
+					{Env: []apiv1.EnvVar{{Name: "baz", Value: "foo"}}},
+				},
+				InitContainers: []apiv1.Container{
+					{Env: []apiv1.EnvVar{{Name: "baz", Value: "bar"}}},
+				},
+			},
+			result: true,
+		},
 		{
 			name: "two pods with different volumes",
 			p1Spec: apiv1.PodSpec{
@@ -72,6 +93,7 @@ func TestPodSpecSemanticallyEqual(t *testing.T) {
 					{Image: "foo/baz", Name: "foobaz"},
 				},
 			},
+			result: false,
 		},
 		{
 			name: "two pods with different hostnames",
@@ -180,6 +202,27 @@ func TestSanitizePodSpec(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "pod spec with env",
+			inputPodSpec: apiv1.PodSpec{
+				NodeSelector: map[string]string{"foo": "bar"},
+				Containers: []apiv1.Container{
+					{Image: "foo/bar", Name: "foobar", Env: []apiv1.EnvVar{{Name: "foo", Value: "bar"}}},
+				},
+				InitContainers: []apiv1.Container{
+					{Image: "foo/baz", Name: "foobaz", Env: []apiv1.EnvVar{{Name: "foo2", Value: "bar2"}}},
+				},
+			},
+			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"},
+				},
+			},
+		},
 	}
 
 	for _, tt := range tests {