github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98320 from chewong/use-promoted-images

Browse Source 
test images: use recently promoted images
This commit is contained in:
Kubernetes Prow Robot 2021-01-28 17:00:41 -08:00 committed by GitHub
commit eb2b71c727
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/testing-manifests/sample-device-plugin.yaml
View File

@ -27,18 +27,18 @@ spec:
path: /var/lib/kubelet/device-plugins path: /var/lib/kubelet/device-plugins
- name: plugins-registry-probe-mode - name: plugins-registry-probe-mode
hostPath: hostPath:
path: /var/lib/kubelet/plugins_registry path: /var/lib/kubelet/plugins_registry
- name: dev - name: dev
hostPath: hostPath:
path: /dev path: /dev
containers: 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 name: sample-device-plugin
env: env:
- name: PLUGIN_SOCK_DIR - name: PLUGIN_SOCK_DIR
value: "/var/lib/kubelet/device-plugins" value: "/var/lib/kubelet/device-plugins"
securityContext: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts:
- name: device-plugin - name: device-plugin
mountPath: /var/lib/kubelet/device-plugins mountPath: /var/lib/kubelet/device-plugins

2
test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
View File

@ -15,7 +15,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: install - 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 imagePullPolicy: Always
args: args:
- "--install-into=/opt" - "--install-into=/opt"

2
test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
View File

@ -15,7 +15,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: install - 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 imagePullPolicy: Always
args: args:
- "--install-into=/opt" - "--install-into=/opt"

6
test/e2e_node/image_list.go
View File

@ -61,9 +61,9 @@ var NodePrePullImageList = sets.NewString(
imageutils.GetE2EImage(imageutils.Nonewprivs), imageutils.GetE2EImage(imageutils.Nonewprivs),
imageutils.GetPauseImageName(), imageutils.GetPauseImageName(),
getGPUDevicePluginImage(), getGPUDevicePluginImage(),
"gcr.io/kubernetes-e2e-test-images/node-perf/npb-is:1.0", imageutils.GetE2EImage(imageutils.NodePerfNpbEp),
"gcr.io/kubernetes-e2e-test-images/node-perf/npb-ep:1.0", imageutils.GetE2EImage(imageutils.NodePerfNpbIs),
"gcr.io/kubernetes-e2e-test-images/node-perf/tf-wide-deep-amd64:1.0", imageutils.GetE2EImage(imageutils.NodePerfTfWideDeep),
) )
// updateImageAllowList updates the framework.ImagePrePullList with // updateImageAllowList updates the framework.ImagePrePullList with

1
test/e2e_node/perf/workloads/BUILD
View File

@ -17,6 +17,7 @@ go_library(
"//staging/src/k8s.io/api/core/v1:go_default_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/api/resource:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//test/utils/image:go_default_library",
], ],
) )

3
test/e2e_node/perf/workloads/npb_ep.go
View File

@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" "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 // 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 var containers []v1.Container
ctn := v1.Container{ ctn := v1.Container{
Name: fmt.Sprintf("%s-ctn", w.Name()), 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{ Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{ Requests: v1.ResourceList{
v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"), v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"),

3
test/e2e_node/perf/workloads/npb_is.go
View File

@ -24,6 +24,7 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" 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 // 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 var containers []v1.Container
ctn := v1.Container{ ctn := v1.Container{
Name: fmt.Sprintf("%s-ctn", w.Name()), 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{ Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{ Requests: v1.ResourceList{
v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"), v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"),

3
test/e2e_node/perf/workloads/tf_wide_deep.go
View File

@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager" "k8s.io/kubernetes/pkg/kubelet/cm/cpumanager"
imageutils "k8s.io/kubernetes/test/utils/image"
) )
// tfWideDeepWorkload defines a workload to run // tfWideDeepWorkload defines a workload to run
@ -43,7 +44,7 @@ func (w tfWideDeepWorkload) PodSpec() v1.PodSpec {
var containers []v1.Container var containers []v1.Container
ctn := v1.Container{ ctn := v1.Container{
Name: fmt.Sprintf("%s-ctn", w.Name()), 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{ Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{ Requests: v1.ResourceList{
v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"), v1.ResourceName(v1.ResourceCPU): resource.MustParse("15000m"),

35
test/utils/image/manifest.go
View File

@ -177,6 +177,12 @@ const (
Nginx Nginx
// NginxNew image // NginxNew image
NginxNew NginxNew
// NodePerfNpbEp image
NodePerfNpbEp
// NodePerfNpbIs image
NodePerfNpbIs
// NodePerfTfWideDeep image
NodePerfTfWideDeep
// Nonewprivs image // Nonewprivs image
Nonewprivs Nonewprivs
// NonRoot runs with a default user of 1234 // 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[AgnhostPrivate] = Config{PrivateRegistry, "agnhost", "2.6"}
configs[AuthenticatedAlpine] = Config{gcAuthenticatedRegistry, "alpine", "3.7"} configs[AuthenticatedAlpine] = Config{gcAuthenticatedRegistry, "alpine", "3.7"}
configs[AuthenticatedWindowsNanoServer] = Config{gcAuthenticatedRegistry, "windows-nanoserver", "v1"} configs[AuthenticatedWindowsNanoServer] = Config{gcAuthenticatedRegistry, "windows-nanoserver", "v1"}
configs[APIServer] = Config{e2eRegistry, "sample-apiserver", "1.17"} configs[APIServer] = Config{promoterE2eRegistry, "sample-apiserver", "1.17.4"}
configs[AppArmorLoader] = Config{e2eRegistry, "apparmor-loader", "1.0"} configs[AppArmorLoader] = Config{promoterE2eRegistry, "apparmor-loader", "1.3"}
configs[BusyBox] = Config{dockerLibraryRegistry, "busybox", "1.29"} configs[BusyBox] = Config{dockerLibraryRegistry, "busybox", "1.29"}
configs[CheckMetadataConcealment] = Config{promoterE2eRegistry, "metadata-concealment", "1.6"} configs[CheckMetadataConcealment] = Config{promoterE2eRegistry, "metadata-concealment", "1.6"}
configs[CudaVectorAdd] = Config{e2eRegistry, "cuda-vector-add", "1.0"} 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[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[Etcd] = Config{gcRegistry, "etcd", "3.4.13-0"}
configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"} configs[GlusterDynamicProvisioner] = Config{dockerGluster, "glusterdynamic-provisioner", "v1.0"}
configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"} configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"}
configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"} configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"}
configs[InvalidRegistryImage] = Config{invalidRegistry, "alpine", "3.1"} configs[InvalidRegistryImage] = Config{invalidRegistry, "alpine", "3.1"}
configs[IpcUtils] = Config{e2eRegistry, "ipc-utils", "1.0"} configs[IpcUtils] = Config{promoterE2eRegistry, "ipc-utils", "1.2"}
configs[JessieDnsutils] = Config{e2eRegistry, "jessie-dnsutils", "1.0"} configs[JessieDnsutils] = Config{promoterE2eRegistry, "jessie-dnsutils", "1.4"}
configs[Kitten] = Config{promoterE2eRegistry, "kitten", "1.4"} configs[Kitten] = Config{promoterE2eRegistry, "kitten", "1.4"}
configs[Nautilus] = Config{promoterE2eRegistry, "nautilus", "1.4"} configs[Nautilus] = Config{promoterE2eRegistry, "nautilus", "1.4"}
configs[NFSProvisioner] = Config{sigStorageRegistry, "nfs-provisioner", "v2.2.2"} configs[NFSProvisioner] = Config{sigStorageRegistry, "nfs-provisioner", "v2.2.2"}
configs[Nginx] = Config{dockerLibraryRegistry, "nginx", "1.14-alpine"} configs[Nginx] = Config{dockerLibraryRegistry, "nginx", "1.14-alpine"}
configs[NginxNew] = Config{dockerLibraryRegistry, "nginx", "1.15-alpine"} configs[NginxNew] = Config{dockerLibraryRegistry, "nginx", "1.15-alpine"}
configs[Nonewprivs] = Config{e2eRegistry, "nonewprivs", "1.0"} configs[NodePerfNpbEp] = Config{promoterE2eRegistry, "node-perf/npb-ep", "1.1"}
configs[NonRoot] = Config{e2eRegistry, "nonroot", "1.0"} 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 // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
configs[Pause] = Config{gcRegistry, "pause", "3.2"} configs[Pause] = Config{gcRegistry, "pause", "3.2"}
configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"} configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"}
configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"} configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"}
configs[PrometheusToSd] = Config{gcRegistry, "prometheus-to-sd", "v0.5.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[RegressionIssue74839] = Config{promoterE2eRegistry, "regression-issue-74839", "1.2"}
configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"} configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"}
configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"} configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"}
configs[VolumeNFSServer] = Config{e2eVolumeRegistry, "nfs", "1.0"} configs[VolumeNFSServer] = Config{promoterE2eRegistry, "volume/nfs", "1.2"}
configs[VolumeISCSIServer] = Config{e2eVolumeRegistry, "iscsi", "2.0"} configs[VolumeISCSIServer] = Config{promoterE2eRegistry, "volume/iscsi", "2.2"}
configs[VolumeGlusterServer] = Config{e2eVolumeRegistry, "gluster", "1.0"} configs[VolumeGlusterServer] = Config{promoterE2eRegistry, "volume/gluster", "1.2"}
configs[VolumeRBDServer] = Config{e2eVolumeRegistry, "rbd", "1.0.1"} configs[VolumeRBDServer] = Config{promoterE2eRegistry, "volume/rbd", "1.0.3"}
configs[WindowsServer] = Config{microsoftRegistry, "windows", "1809"} configs[WindowsServer] = Config{microsoftRegistry, "windows", "1809"}
// if requested, map all the SHAs into a known format based on the input // if requested, map all the SHAs into a known format based on the input