diff --git a/hack/testdata/pod-with-large-name.yaml b/hack/testdata/pod-with-large-name.yaml index 5d6276ba00f..afe73591816 100644 --- a/hack/testdata/pod-with-large-name.yaml +++ b/hack/testdata/pod-with-large-name.yaml @@ -8,4 +8,5 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1 + image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + command: ["/agnhost", "serve-hostname"] diff --git a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml index e8fa6307fbb..0c5709e8d89 100644 --- a/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml +++ b/staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml @@ -20,8 +20,8 @@ spec: - name: wardle-server # build from staging/src/k8s.io/sample-apiserver/artifacts/simple-image/Dockerfile # or - # docker pull gcr.io/kubernetes-e2e-test-images/sample-apiserver:1.17 - # docker tag gcr.io/kubernetes-e2e-test-images/sample-apiserver:1.17 kube-sample-apiserver:latest + # docker pull k8s.gcr.io/e2e-test-images/sample-apiserver:1.17.4 + # docker tag k8s.gcr.io/e2e-test-images/sample-apiserver:1.17.4 kube-sample-apiserver:latest image: kube-sample-apiserver:latest imagePullPolicy: Never args: [ "--etcd-servers=http://localhost:2379" ] diff --git a/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml b/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml index c20d8a8e931..3d23b8c7e02 100644 --- a/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml +++ b/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 + image: k8s.gcr.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/http/rc.yaml b/test/e2e/testing-manifests/ingress/http/rc.yaml index f066984340f..23f45425490 100644 --- a/test/e2e/testing-manifests/ingress/http/rc.yaml +++ b/test/e2e/testing-manifests/ingress/http/rc.yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 + image: k8s.gcr.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 readinessProbe: diff --git a/test/e2e/testing-manifests/ingress/http2/rc.yaml b/test/e2e/testing-manifests/ingress/http2/rc.yaml index c6d411ed32f..1ae32186ab7 100644 --- a/test/e2e/testing-manifests/ingress/http2/rc.yaml +++ b/test/e2e/testing-manifests/ingress/http2/rc.yaml @@ -14,6 +14,6 @@ spec: spec: containers: - name: echoheaders - image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 + image: k8s.gcr.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8443 diff --git a/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml b/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml index c20d8a8e931..3d23b8c7e02 100644 --- a/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml +++ b/test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 + image: k8s.gcr.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml b/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml index bd4d4ad9320..479c5aaf4ed 100644 --- a/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml @@ -15,7 +15,8 @@ spec: run: hostname spec: containers: - - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 + - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + command: ["/agnhost", "serve-hostname"] imagePullPolicy: IfNotPresent name: hostname terminationGracePeriodSeconds: 120 diff --git a/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml b/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml index 4f8ead16029..462abb98871 100644 --- a/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml @@ -14,21 +14,15 @@ spec: run: hostname spec: containers: - - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 + - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 name: host1 - command: - - /bin/sh - - -c - - /serve_hostname -http=true -udp=false -port=8000 + args: ["serve-hostname", "--http=true", "--udp=false", "--port=8000"] ports: - protocol: TCP containerPort: 8000 - - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 + - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 name: host2 - command: - - /bin/sh - - -c - - /serve_hostname -http=true -udp=false -port=8080 + args: ["serve-hostname", "--http=true", "--udp=false", "--port=8080"] ports: - protocol: TCP containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/neg/rc.yaml b/test/e2e/testing-manifests/ingress/neg/rc.yaml index bd4d4ad9320..479c5aaf4ed 100644 --- a/test/e2e/testing-manifests/ingress/neg/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg/rc.yaml @@ -15,7 +15,8 @@ spec: run: hostname spec: containers: - - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 + - image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + command: ["/agnhost", "serve-hostname"] imagePullPolicy: IfNotPresent name: hostname terminationGracePeriodSeconds: 120 diff --git a/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml b/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml index c20d8a8e931..3d23b8c7e02 100644 --- a/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml +++ b/test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 + image: k8s.gcr.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml index c20d8a8e931..3d23b8c7e02 100644 --- a/test/e2e/testing-manifests/ingress/static-ip/rc.yaml +++ b/test/e2e/testing-manifests/ingress/static-ip/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 + image: k8s.gcr.io/e2e-test-images/echoserver:2.3 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml b/test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml index e5d400a50b3..9194e944ba6 100644 --- a/test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml +++ b/test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml @@ -8,7 +8,7 @@ metadata: spec: containers: - name: primary - image: gcr.io/kubernetes-e2e-test-images/agnhost:1.0 + image: k8s.gcr.io/e2e-test-images/agnhost:2.32 env: - name: PRIMARY value: "true" @@ -21,7 +21,7 @@ spec: - mountPath: /agnhost-primary-data name: data - name: sentinel - image: gcr.io/kubernetes-e2e-test-images/agnhost:1.0 + image: k8s.gcr.io/e2e-test-images/agnhost:2.32 env: - name: SENTINEL value: "true" diff --git a/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml index 5864be7b032..4c1fd8fae96 100644 --- a/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml +++ b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml @@ -12,7 +12,8 @@ spec: spec: containers: - name: netexec - image: gcr.io/kubernetes-e2e-test-images/netexec:1.0 + image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + command: ["/agnhost", "netexec"] ports: - containerPort: 8080 # This is to force these pods to land on different hosts. diff --git a/test/fixtures/doc-yaml/user-guide/multi-pod.yaml b/test/fixtures/doc-yaml/user-guide/multi-pod.yaml index 0f6698ade66..d05f08949c8 100644 --- a/test/fixtures/doc-yaml/user-guide/multi-pod.yaml +++ b/test/fixtures/doc-yaml/user-guide/multi-pod.yaml @@ -10,7 +10,7 @@ metadata: spec: containers: - name: master - image: gcr.io/kubernetes-e2e-test-images/redis:1.0 + image: k8s.gcr.io/e2e-test-images/redis:5.0.5-alpine env: - name: MASTER value: "true" @@ -23,7 +23,7 @@ spec: - mountPath: /redis-master-data name: data - name: sentinel - image: gcr.io/kubernetes-e2e-test-images/redis:1.0 + image: k8s.gcr.io/e2e-test-images/redis:5.0.5-alpine env: - name: SENTINEL value: "true" @@ -42,7 +42,8 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.0 + image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + command: ["/agnhost", "serve-hostname"] resources: limits: cpu: "1" diff --git a/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml b/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml index e920baa7bd0..eae01d40857 100644 --- a/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml +++ b/test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml @@ -30,7 +30,8 @@ items: spec: containers: - name: kubernetes-serve-hostname - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 + image: k8s.gcr.io/e2e-test-images/agnhost:2.32 + command: ["/agnhost", "serve-hostname"] resources: limits: cpu: "1" diff --git a/test/images/Makefile b/test/images/Makefile index e35d76a1ce9..21714381f1d 100644 --- a/test/images/Makefile +++ b/test/images/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -REGISTRY ?= gcr.io/kubernetes-e2e-test-images +REGISTRY ?= k8s.gcr.io/e2e-test-images GOARM ?= 7 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 diff --git a/test/images/README.md b/test/images/README.md index 583f155c991..11ac19b67e6 100644 --- a/test/images/README.md +++ b/test/images/README.md @@ -131,7 +131,7 @@ To build AND push an image, the following command can be used: make all-push WHAT=agnhost ``` -By default, the images will be tagged and pushed under the `gcr.io/kubernetes-e2e-test-images` +By default, the images will be tagged and pushed under the `k8s.gcr.io/e2e-test-images` registry. That can changed by running this command instead: ```bash @@ -142,7 +142,7 @@ REGISTRY=foo_registry make all-push WHAT=agnhost require the `agnhost` image to be published in an authenticated repo as well: ```bash -REGISTRY=gcr.io/kubernetes-e2e-test-images make all-push WHAT=agnhost +REGISTRY=k8s.gcr.io/e2e-test-images make all-push WHAT=agnhost REGISTRY=gcr.io/k8s-authenticated-test make all-push WHAT=agnhost ``` @@ -164,7 +164,6 @@ export KUBE_TEST_REPO_LIST=/path/to/repo_list.yaml to pull the images from. Sample file: ```yaml -e2eRegistry: your-awesome-registry promoterE2eRegistry: your-awesome-registry gcRegistry: your-awesome-registry sampleRegistry: your-awesome-registry diff --git a/test/images/windows/Makefile b/test/images/windows/Makefile index a1e1b1dd3a7..514c32eb293 100644 --- a/test/images/windows/Makefile +++ b/test/images/windows/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -REGISTRY ?= gcr.io/kubernetes-e2e-test-images +REGISTRY ?= k8s.gcr.io/e2e-test-images REMOTE_DOCKER_URL ?= DOCKER_CERT_PATH ?= "$(HOME)/.docker" export diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 72db6da0c63..228c08ee171 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -31,7 +31,6 @@ import ( // RegistryList holds public and private image registries type RegistryList struct { GcAuthenticatedRegistry string `yaml:"gcAuthenticatedRegistry"` - E2eRegistry string `yaml:"e2eRegistry"` PromoterE2eRegistry string `yaml:"promoterE2eRegistry"` BuildImageRegistry string `yaml:"buildImageRegistry"` InvalidRegistry string `yaml:"invalidRegistry"` @@ -91,7 +90,6 @@ func initReg() RegistryList { var ( initRegistry = RegistryList{ GcAuthenticatedRegistry: "gcr.io/authenticated-image-pulling", - E2eRegistry: "gcr.io/kubernetes-e2e-test-images", PromoterE2eRegistry: "k8s.gcr.io/e2e-test-images", BuildImageRegistry: "k8s.gcr.io/build-image", InvalidRegistry: "invalid.com/invalid", @@ -212,7 +210,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) { configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.3"} configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-1"} configs[CheckMetadataConcealment] = Config{list.PromoterE2eRegistry, "metadata-concealment", "1.6"} - configs[CudaVectorAdd] = Config{list.E2eRegistry, "cuda-vector-add", "1.0"} + configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"} configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "buster-v1.6.5"} configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.3"} @@ -383,8 +381,6 @@ func replaceRegistryInImageURLWithList(imageURL string, reg RegistryList) (strin } switch registryAndUser { - case initRegistry.E2eRegistry: - registryAndUser = reg.E2eRegistry case initRegistry.GcRegistry: registryAndUser = reg.GcRegistry case initRegistry.SigStorageRegistry: diff --git a/test/utils/image/manifest_test.go b/test/utils/image/manifest_test.go index 82bf9db92fa..5a21ce0dff2 100644 --- a/test/utils/image/manifest_test.go +++ b/test/utils/image/manifest_test.go @@ -40,9 +40,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) { }, { in: "test", out: "test.io/library/test", - }, { - in: "gcr.io/kubernetes-e2e-test-images/test:123", - out: "test.io/kubernetes-e2e-test-images/test:123", }, { in: "k8s.gcr.io/test:123", out: "test.io/test:123", @@ -82,7 +79,6 @@ func TestReplaceRegistryInImageURL(t *testing.T) { // Set custom registries reg := RegistryList{ DockerLibraryRegistry: "test.io/library", - E2eRegistry: "test.io/kubernetes-e2e-test-images", GcRegistry: "test.io", GcrReleaseRegistry: "test.io/gke-release", PrivateRegistry: "test.io/k8s-authenticated-test",