diff --git a/test/e2e/common/runtime.go b/test/e2e/common/runtime.go index d3fe67cfbca..bd55a305632 100644 --- a/test/e2e/common/runtime.go +++ b/test/e2e/common/runtime.go @@ -276,13 +276,13 @@ while true; do sleep 1; done }, { description: "should be able to pull image from gcr.io", - image: "k8s.gcr.io/alpine-with-bash:1.0", + image: "gcr.io/google-containers/debian-base:0.3.2", phase: v1.PodRunning, waiting: false, }, { description: "should be able to pull image from docker hub", - image: "alpine:3.1", + image: "alpine:3.7", phase: v1.PodRunning, waiting: false, }, diff --git a/test/e2e/testing-manifests/ingress/http/rc.yaml b/test/e2e/testing-manifests/ingress/http/rc.yaml index e5522b696a5..f066984340f 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: k8s.gcr.io/echoserver:1.10 + image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 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 a239b824118..d60c984ed4d 100644 --- a/test/e2e/testing-manifests/ingress/http2/rc.yaml +++ b/test/e2e/testing-manifests/ingress/http2/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders - image: k8s.gcr.io/echoserver:1.10 + image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 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 79e2bfb0259..c20d8a8e931 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/google_containers/echoserver:1.10 + image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 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 de2246e6dcd..32938b628ba 100644 --- a/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml @@ -12,7 +12,7 @@ spec: run: hostname spec: containers: - - image: gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1 + - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 imagePullPolicy: IfNotPresent name: hostname - terminationGracePeriodSeconds: 120 \ No newline at end of file + 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 772253a133f..6ee21b2add4 100644 --- a/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml @@ -11,7 +11,7 @@ spec: run: hostname spec: containers: - - image: gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1 + - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 name: host1 command: - /bin/sh @@ -20,7 +20,7 @@ spec: ports: - protocol: TCP containerPort: 8000 - - image: gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1 + - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 name: host2 command: - /bin/sh diff --git a/test/e2e/testing-manifests/ingress/neg/rc.yaml b/test/e2e/testing-manifests/ingress/neg/rc.yaml index de2246e6dcd..32938b628ba 100644 --- a/test/e2e/testing-manifests/ingress/neg/rc.yaml +++ b/test/e2e/testing-manifests/ingress/neg/rc.yaml @@ -12,7 +12,7 @@ spec: run: hostname spec: containers: - - image: gcr.io/kubernetes-e2e-test-images/serve-hostname-amd64:1.1 + - image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 imagePullPolicy: IfNotPresent name: hostname - terminationGracePeriodSeconds: 120 \ No newline at end of file + 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 6bef004eddc..c20d8a8e931 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: k8s.gcr.io/echoserver:1.10 + image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml b/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml index 6bef004eddc..c20d8a8e931 100644 --- a/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml +++ b/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml @@ -11,6 +11,6 @@ spec: spec: containers: - name: echoheaders-https - image: k8s.gcr.io/echoserver:1.10 + image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 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 6bef004eddc..c20d8a8e931 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: k8s.gcr.io/echoserver:1.10 + image: gcr.io/kubernetes-e2e-test-images/echoserver:2.2 ports: - containerPort: 8080 diff --git a/test/e2e/testing-manifests/kubectl/redis-master-pod.yaml b/test/e2e/testing-manifests/kubectl/redis-master-pod.yaml index 589de648f5f..036c89a9707 100644 --- a/test/e2e/testing-manifests/kubectl/redis-master-pod.yaml +++ b/test/e2e/testing-manifests/kubectl/redis-master-pod.yaml @@ -9,7 +9,7 @@ metadata: spec: containers: - name: master - image: k8s.gcr.io/redis:v1 + image: gcr.io/kubernetes-e2e-test-images/redis:1.0 env: - name: MASTER value: "true" @@ -22,7 +22,7 @@ spec: - mountPath: /redis-master-data name: data - name: sentinel - image: kubernetes/redis:v1 + image: gcr.io/kubernetes-e2e-test-images/redis:1.0 env: - name: SENTINEL value: "true" diff --git a/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml index f09c090d5b3..5864be7b032 100644 --- a/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml +++ b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml @@ -12,7 +12,7 @@ spec: spec: containers: - name: netexec - image: k8s.gcr.io/netexec:1.4 + image: gcr.io/kubernetes-e2e-test-images/netexec:1.0 ports: - containerPort: 8080 # This is to force these pods to land on different hosts. diff --git a/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml b/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml index bc7e442dd67..d553eaa7f11 100644 --- a/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: etcd - image: k8s.gcr.io/etcd-amd64:2.2.5 + image: k8s.gcr.io/etcd:3.2.24 imagePullPolicy: Always ports: - containerPort: 2380 diff --git a/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml b/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml index 0436fe25bab..6426efd4349 100644 --- a/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/nginx/statefulset.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/nginx-slim:0.8 + image: nginx:1.15-alpine ports: - containerPort: 80 name: web diff --git a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml index bd06144a33e..b2ca79d7990 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: k8s.gcr.io/redis-install-3.2.0:e2e + image: gcr.io/kubernetes-e2e-test-images/pets/redis-installer:1.1 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 537a808cb48..90398e772f7 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: k8s.gcr.io/zookeeper-install-3.5.0-alpha:e2e + image: gcr.io/kubernetes-e2e-test-images/pets/zookeeper-installer:1.1 imagePullPolicy: Always args: - "--install-into=/opt" @@ -47,7 +47,7 @@ spec: mountPath: "/tmp/zookeeper" containers: - name: zk - image: java:openjdk-8-jre + image: openjdk:8-jre ports: - containerPort: 2888 name: peer diff --git a/test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml b/test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml index 64145553558..aecd746ec94 100644 --- a/test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml +++ b/test/fixtures/doc-yaml/user-guide/downward-api/dapi-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: busybox command: [ "/bin/sh", "-c", "env" ] env: - name: MY_POD_NAME diff --git a/test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml b/test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml index 204c4ddf59d..c07db26c922 100644 --- a/test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml +++ b/test/fixtures/doc-yaml/user-guide/liveness/exec-liveness.yaml @@ -10,7 +10,7 @@ spec: - /bin/sh - -c - echo ok > /tmp/health; sleep 10; rm -rf /tmp/health; sleep 600 - image: k8s.gcr.io/busybox + image: busybox livenessProbe: exec: command: diff --git a/test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml b/test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml index 1a6ef7bc64c..713ff6ee616 100644 --- a/test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml +++ b/test/fixtures/doc-yaml/user-guide/liveness/http-liveness.yaml @@ -8,7 +8,7 @@ spec: containers: - args: - /server - image: k8s.gcr.io/liveness + image: gcr.io/kubernetes-e2e-test-images/liveness:1.0 livenessProbe: httpGet: path: /healthz diff --git a/test/fixtures/doc-yaml/user-guide/multi-pod.yaml b/test/fixtures/doc-yaml/user-guide/multi-pod.yaml index c795ce6f4d2..0f6698ade66 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: kubernetes/redis:v1 + image: gcr.io/kubernetes-e2e-test-images/redis:1.0 env: - name: MASTER value: "true" @@ -23,7 +23,7 @@ spec: - mountPath: /redis-master-data name: data - name: sentinel - image: kubernetes/redis:v1 + image: gcr.io/kubernetes-e2e-test-images/redis:1.0 env: - name: SENTINEL value: "true" @@ -42,7 +42,7 @@ metadata: spec: containers: - name: kubernetes-serve-hostname - image: k8s.gcr.io/serve_hostname + image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.0 resources: limits: cpu: "1" diff --git a/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml b/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml index 0948371e182..5c470d2ef6a 100644 --- a/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml +++ b/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml @@ -27,7 +27,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google-samples/gb-redisslave:v3 resources: requests: cpu: 100m diff --git a/test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml b/test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml index d93d4095e14..e7b80789f4a 100644 --- a/test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml +++ b/test/fixtures/doc-yaml/user-guide/secrets/secret-env-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/busybox + image: busybox command: [ "/bin/sh", "-c", "env" ] env: - name: MY_SECRET_DATA diff --git a/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml b/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml index 1ff2e8652f1..3448b8f57a0 100644 --- a/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml +++ b/test/fixtures/doc-yaml/user-guide/secrets/secret-pod.yaml @@ -5,7 +5,7 @@ metadata: spec: containers: - name: test-container - image: k8s.gcr.io/mounttest:0.8 + image: gcr.io/kubernetes-e2e-test-images/mounttest:1.0 command: [ "/mt", "--file_content=/etc/secret-volume/data-1" ] volumeMounts: # name must match the volume name below diff --git a/test/fixtures/doc-yaml/user-guide/walkthrough/podtemplate.json b/test/fixtures/doc-yaml/user-guide/walkthrough/podtemplate.json index bd4327414a1..beefa3c50af 100644 --- a/test/fixtures/doc-yaml/user-guide/walkthrough/podtemplate.json +++ b/test/fixtures/doc-yaml/user-guide/walkthrough/podtemplate.json @@ -14,7 +14,7 @@ "spec": { "containers": [{ "name": "nginx", - "image": "dockerfile/nginx", + "image": "nginx", "ports": [{"containerPort": 80}] }] } 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 958e054ec51..e920baa7bd0 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,7 @@ items: spec: containers: - name: kubernetes-serve-hostname - image: k8s.gcr.io/serve_hostname + image: gcr.io/kubernetes-e2e-test-images/serve-hostname:1.1 resources: limits: cpu: "1" diff --git a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml index 4c1c6f244f2..6a2eed872a9 100644 --- a/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml +++ b/test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:2.0 + image: k8s.gcr.io/pause:3.1 --- apiVersion: v1 kind: ReplicationController @@ -30,4 +30,4 @@ spec: spec: containers: - name: mock-container - image: k8s.gcr.io/pause:2.0 + image: k8s.gcr.io/pause:3.1