From 40713f7666730d09fc50e3ce66d5528d741acc5c Mon Sep 17 00:00:00 2001 From: Ernest Wong Date: Tue, 26 Jan 2021 11:16:16 -0800 Subject: [PATCH] test images: use recently promoted images Signed-off-by: Ernest Wong --- .../sample-device-plugin.yaml | 6 ++-- .../statefulset/redis/statefulset.yaml | 2 +- .../statefulset/zookeeper/statefulset.yaml | 2 +- test/e2e_node/image_list.go | 6 ++-- test/e2e_node/perf/workloads/BUILD | 1 + test/e2e_node/perf/workloads/npb_ep.go | 3 +- test/e2e_node/perf/workloads/npb_is.go | 3 +- test/e2e_node/perf/workloads/tf_wide_deep.go | 3 +- test/utils/image/manifest.go | 35 ++++++++++++------- 9 files changed, 37 insertions(+), 24 deletions(-) diff --git a/test/e2e/testing-manifests/sample-device-plugin.yaml b/test/e2e/testing-manifests/sample-device-plugin.yaml index c2512737881..e27b91153c8 100644 --- a/test/e2e/testing-manifests/sample-device-plugin.yaml +++ b/test/e2e/testing-manifests/sample-device-plugin.yaml @@ -27,18 +27,18 @@ spec: path: /var/lib/kubelet/device-plugins - name: plugins-registry-probe-mode hostPath: - path: /var/lib/kubelet/plugins_registry + path: /var/lib/kubelet/plugins_registry - name: dev hostPath: path: /dev containers: - - image: gcr.io/kubernetes-e2e-test-images/sample-device-plugin:1.0 + - image: k8s.gcr.io/e2e-test-images/sample-device-plugin:1.3 name: sample-device-plugin env: - name: PLUGIN_SOCK_DIR value: "/var/lib/kubelet/device-plugins" securityContext: - privileged: true + privileged: true volumeMounts: - name: device-plugin mountPath: /var/lib/kubelet/device-plugins diff --git a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml index b099b9c0878..70dce20a9da 100644 --- a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml @@ -15,7 +15,7 @@ spec: spec: initContainers: - name: install - image: gcr.io/kubernetes-e2e-test-images/pets/redis-installer:1.2 + image: k8s.gcr.io/e2e-test-images/pets/redis-installer:1.5 imagePullPolicy: Always args: - "--install-into=/opt" diff --git a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml index 865f9366d91..bb11dbce4b9 100644 --- a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml @@ -15,7 +15,7 @@ spec: spec: initContainers: - name: install - image: gcr.io/kubernetes-e2e-test-images/pets/zookeeper-installer:1.3 + image: k8s.gcr.io/e2e-test-images/pets/zookeeper-installer:1.5 imagePullPolicy: Always args: - "--install-into=/opt" diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index 6c7a25c590e..16c6240362a 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -61,9 +61,9 @@ var NodePrePullImageList = sets.NewString( imageutils.GetE2EImage(imageutils.Nonewprivs), imageutils.GetPauseImageName(), getGPUDevicePluginImage(), - "gcr.io/kubernetes-e2e-test-images/node-perf/npb-is:1.0", - "gcr.io/kubernetes-e2e-test-images/node-perf/npb-ep:1.0", - "gcr.io/kubernetes-e2e-test-images/node-perf/tf-wide-deep-amd64:1.0", + imageutils.GetE2EImage(imageutils.NodePerfNpbEp), + imageutils.GetE2EImage(imageutils.NodePerfNpbIs), + imageutils.GetE2EImage(imageutils.NodePerfTfWideDeep), ) // updateImageAllowList updates the framework.ImagePrePullList with diff --git a/test/e2e_node/perf/workloads/BUILD b/test/e2e_node/perf/workloads/BUILD index 7eff2d4299c..9a83f73893c 100644 --- a/test/e2e_node/perf/workloads/BUILD +++ b/test/e2e_node/perf/workloads/BUILD @@ -17,6 +17,7 @@ go_library( "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//test/utils/image:go_default_library", ], ) diff --git a/test/e2e_node/perf/workloads/npb_ep.go b/test/e2e_node/perf/workloads/npb_ep.go index 3336c469ff6..9bc10247c68 100644 --- a/test/e2e_node/perf/workloads/npb_ep.go +++ b/test/e2e_node/perf/workloads/npb_ep.go @@ -26,6 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" + imageutils "k8s.io/kubernetes/test/utils/image" ) // npbEPWorkload defines a workload to run the Embarrassingly Parallel (EP) workload @@ -43,7 +44,7 @@ func (w npbEPWorkload) PodSpec() v1.PodSpec { var containers []v1.Container ctn := v1.Container{ Name: fmt.Sprintf("%s-ctn", w.Name()), - Image: "gcr.io/kubernetes-e2e-test-images/node-perf/npb-ep:1.0", + Image: imageutils.GetE2EImage(imageutils.NodePerfNpbEp), Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"), diff --git a/test/e2e_node/perf/workloads/npb_is.go b/test/e2e_node/perf/workloads/npb_is.go index f58b4e6488a..d3215d5ed89 100644 --- a/test/e2e_node/perf/workloads/npb_is.go +++ b/test/e2e_node/perf/workloads/npb_is.go @@ -24,6 +24,7 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" + imageutils "k8s.io/kubernetes/test/utils/image" ) // npbISWorkload defines a workload to run the integer sort (IS) workload @@ -41,7 +42,7 @@ func (w npbISWorkload) PodSpec() v1.PodSpec { var containers []v1.Container ctn := v1.Container{ Name: fmt.Sprintf("%s-ctn", w.Name()), - Image: "gcr.io/kubernetes-e2e-test-images/node-perf/npb-is:1.0", + Image: imageutils.GetE2EImage(imageutils.NodePerfNpbIs), Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"), diff --git a/test/e2e_node/perf/workloads/tf_wide_deep.go b/test/e2e_node/perf/workloads/tf_wide_deep.go index 3a43ea0aa25..a225052970b 100644 --- a/test/e2e_node/perf/workloads/tf_wide_deep.go +++ b/test/e2e_node/perf/workloads/tf_wide_deep.go @@ -26,6 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" + imageutils "k8s.io/kubernetes/test/utils/image" ) // tfWideDeepWorkload defines a workload to run @@ -43,7 +44,7 @@ func (w tfWideDeepWorkload) PodSpec() v1.PodSpec { var containers []v1.Container ctn := v1.Container{ Name: fmt.Sprintf("%s-ctn", w.Name()), - Image: "gcr.io/kubernetes-e2e-test-images/node-perf/tf-wide-deep-amd64:1.0", + Image: imageutils.GetE2EImage(imageutils.NodePerfTfWideDeep), Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"), diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 7c65c4f621c..50dd7a23b61 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -177,6 +177,12 @@ const ( Nginx // NginxNew image NginxNew + // NodePerfNpbEp image + NodePerfNpbEp + // NodePerfNpbIs image + NodePerfNpbIs + // NodePerfTfWideDeep image + NodePerfTfWideDeep // Nonewprivs image Nonewprivs // NonRoot runs with a default user of 1234 @@ -216,41 +222,44 @@ func initImageConfigs() (map[int]Config, map[int]Config) { configs[AgnhostPrivate] = Config{PrivateRegistry, "agnhost", "2.6"} configs[AuthenticatedAlpine] = Config{gcAuthenticatedRegistry, "alpine", "3.7"} configs[AuthenticatedWindowsNanoServer] = Config{gcAuthenticatedRegistry, "windows-nanoserver", "v1"} - configs[APIServer] = Config{e2eRegistry, "sample-apiserver", "1.17"} - configs[AppArmorLoader] = Config{e2eRegistry, "apparmor-loader", "1.0"} + configs[APIServer] = Config{promoterE2eRegistry, "sample-apiserver", "1.17.4"} + configs[AppArmorLoader] = Config{promoterE2eRegistry, "apparmor-loader", "1.3"} configs[BusyBox] = Config{dockerLibraryRegistry, "busybox", "1.29"} configs[CheckMetadataConcealment] = Config{e2eRegistry, "metadata-concealment", "1.2"} configs[CudaVectorAdd] = Config{e2eRegistry, "cuda-vector-add", "1.0"} - configs[CudaVectorAdd2] = Config{e2eRegistry, "cuda-vector-add", "2.0"} + configs[CudaVectorAdd2] = Config{promoterE2eRegistry, "cuda-vector-add", "2.2"} configs[DebianIptables] = Config{buildImageRegistry, "debian-iptables", "buster-v1.5.0"} - configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} + configs[EchoServer] = Config{promoterE2eRegistry, "echoserver", "2.3"} configs[Etcd] = Config{gcRegistry, "etcd", "3.4.13-0"} configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"} configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"} configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"} configs[InvalidRegistryImage] = Config{invalidRegistry, "alpine", "3.1"} - configs[IpcUtils] = Config{e2eRegistry, "ipc-utils", "1.0"} - configs[JessieDnsutils] = Config{e2eRegistry, "jessie-dnsutils", "1.0"} + configs[IpcUtils] = Config{promoterE2eRegistry, "ipc-utils", "1.2"} + configs[JessieDnsutils] = Config{promoterE2eRegistry, "jessie-dnsutils", "1.4"} configs[Kitten] = Config{promoterE2eRegistry, "kitten", "1.4"} configs[Nautilus] = Config{promoterE2eRegistry, "nautilus", "1.4"} configs[NFSProvisioner] = Config{sigStorageRegistry, "nfs-provisioner", "v2.2.2"} configs[Nginx] = Config{dockerLibraryRegistry, "nginx", "1.14-alpine"} configs[NginxNew] = Config{dockerLibraryRegistry, "nginx", "1.15-alpine"} - configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"} - configs[NonRoot] = Config{e2eRegistry, "nonroot", "1.0"} + configs[NodePerfNpbEp] = Config{promoterE2eRegistry, "node-perf/npb-ep", "1.1"} + configs[NodePerfNpbIs] = Config{promoterE2eRegistry, "node-perf/npb-is", "1.1"} + configs[NodePerfTfWideDeep] = Config{promoterE2eRegistry, "node-perf/tf-wide-deep", "1.1"} + configs[Nonewprivs] = Config{promoterE2eRegistry, "nonewprivs", "1.3"} + configs[NonRoot] = Config{promoterE2eRegistry, "nonroot", "1.1"} // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go configs[Pause] = Config{gcRegistry, "pause", "3.2"} configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"} configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"} configs[PrometheusToSd] = Config{gcRegistry, "prometheus-to-sd", "v0.5.0"} - configs[Redis] = Config{dockerLibraryRegistry, "redis", "5.0.5-alpine"} + configs[Redis] = Config{promoterE2eRegistry, "redis", "5.0.5-alpine"} configs[RegressionIssue74839] = Config{promoterE2eRegistry, "regression-issue-74839", "1.2"} configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"} configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"} - configs[VolumeNFSServer] = Config{e2eVolumeRegistry, "nfs", "1.0"} - configs[VolumeISCSIServer] = Config{e2eVolumeRegistry, "iscsi", "2.0"} - configs[VolumeGlusterServer] = Config{e2eVolumeRegistry, "gluster", "1.0"} - configs[VolumeRBDServer] = Config{e2eVolumeRegistry, "rbd", "1.0.1"} + configs[VolumeNFSServer] = Config{promoterE2eRegistry, "volume/nfs", "1.2"} + configs[VolumeISCSIServer] = Config{promoterE2eRegistry, "volume/iscsi", "2.2"} + configs[VolumeGlusterServer] = Config{promoterE2eRegistry, "volume/gluster", "1.2"} + configs[VolumeRBDServer] = Config{promoterE2eRegistry, "volume/rbd", "1.0.3"} configs[WindowsServer] = Config{microsoftRegistry, "windows", "1809"} // if requested, map all the SHAs into a known format based on the input