Merge pull request #52697 from mkumatag/nonewprivs

Automatic merge from submit-queue (batch tested with PRs 51902, 52718, 52687, 52137, 52697). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Multi-arch allowPrivilegeEscalation tests **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #52698 **Special notes for your reviewer**: **Release note**: ```NONE ```

Merge pull request #52697 from mkumatag/nonewprivs
a85b94ec · Kubernetes Submit Queue · GitHub · 6e9012c9 · 945d8cd8 · a85b94ec
Commit a85b94ec authored Sep 23, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

image_list.go test/e2e_node/image_list.go +1 -1

security_context_test.go test/e2e_node/security_context_test.go +1 -1

manifest.go test/utils/image/manifest.go +1 -0

No files found.
--- a/test/e2e_node/image_list.go
+++ b/test/e2e_node/image_list.go
@@ -54,7 +54,7 @@ var NodeImageWhiteList = sets.NewString(
 	imageutils.GetE2EImage(imageutils.NginxSlim),
 	imageutils.GetE2EImage(imageutils.ServeHostname),
 	imageutils.GetE2EImage(imageutils.Netexec),
-	"gcr.io/google_containers/nonewprivs:1.2",
+	imageutils.GetE2EImage(imageutils.Nonewprivs),
 	framework.GetPauseImageNameForHostArch(),
 )


--- a/test/e2e_node/security_context_test.go
+++ b/test/e2e_node/security_context_test.go
@@ -384,7 +384,7 @@ var _ = framework.KubeDescribe("Security Context", func() {
 					RestartPolicy: v1.RestartPolicyNever,
 					Containers: []v1.Container{
 						{
-							Image: "gcr.io/google_containers/nonewprivs:1.2",
+							Image: imageutils.GetE2EImage(imageutils.Nonewprivs),
 							Name:  podName,
 							SecurityContext: &v1.SecurityContext{
 								AllowPrivilegeEscalation: allowPrivilegeEscalation,

--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -69,6 +69,7 @@ var (
 	Nettest            = ImageConfig{e2eRegistry, "nettest", "1.0"}
 	NginxSlim          = ImageConfig{gcRegistry, "nginx-slim", "0.20"}
 	NginxSlimNew       = ImageConfig{gcRegistry, "nginx-slim", "0.21"}
+	Nonewprivs         = ImageConfig{e2eRegistry, "nonewprivs", "1.0"}
 	NoSnatTest         = ImageConfig{e2eRegistry, "no-snat-test", "1.0"}
 	NoSnatTestProxy    = ImageConfig{e2eRegistry, "no-snat-test-proxy", "1.0"}
 	NWayHTTP           = ImageConfig{e2eRegistry, "n-way-http", "1.0"}