github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Update e2e test images url

Browse Source 
Removes any reference from the registry gcr.io/kubernetes-e2e-test-images in
kubernetes/kubernetes, replacing it with k8s.gcr.io/kubernetes-e2e-test-images.
In some cases, the images had to be updated since a few things have changed since
their original implementation, most notably being the fact that some of the images
have been centralized into the agnhost image.

Co-Authored-By: Claudiu Belu <cbelu@cloudbasesolutions.com>
This commit is contained in:
Caleb Woodbine 2021-03-23 16:33:10 +13:00 committed by Claudiu Belu
parent f6c2068623
commit bbb368b701
20 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/testdata/pod-with-large-name.yaml vendored
View File

@ -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"]

4
staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
View File

@ -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" ]

2
test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml
View File

@ -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

2
test/e2e/testing-manifests/ingress/http/rc.yaml
View File

@ -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:

2
test/e2e/testing-manifests/ingress/http2/rc.yaml
View File

@ -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

2
test/e2e/testing-manifests/ingress/multiple-certs/rc.yaml
View File

@ -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

3
test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml
View File

@ -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

14
test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml
View File

@ -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

3
test/e2e/testing-manifests/ingress/neg/rc.yaml
View File

@ -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

2
test/e2e/testing-manifests/ingress/pre-shared-cert/rc.yaml
View File

@ -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

2
test/e2e/testing-manifests/ingress/static-ip/rc.yaml
View File

@ -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

4
test/e2e/testing-manifests/kubectl/agnhost-primary-pod.yaml
View File

@ -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"

3
test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml
View File

@ -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.

7
test/fixtures/doc-yaml/user-guide/multi-pod.yaml vendored
View File

@ -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"

3
test/fixtures/pkg/kubectl/cmd/auth/rbac-resource-plus.yaml vendored
View File

@ -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"

2
test/images/Makefile
View File

@ -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

5
test/images/README.md
View File

@ -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

2
test/images/windows/Makefile
View File

@ -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

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

@ -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:

4
test/utils/image/manifest_test.go
View File

@ -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",