From 6ac97882e2728f03d37f7ed1539eab0918f3e243 Mon Sep 17 00:00:00 2001 From: Feruzjon Muyassarov Date: Wed, 3 Feb 2021 22:11:19 +0200 Subject: [PATCH] Migrate gcr.io/kubernetes-ci-images to gcr.io/k8s-staging-ci-images --- .../crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml | 4 ++-- .../bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml | 4 ++-- bootstrap/kubeadm/types/v1beta1/types.go | 2 +- bootstrap/kubeadm/types/v1beta2/types.go | 2 +- .../controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml | 2 +- .../data/debian_injection_script.envsubst.sh | 2 +- test/framework/kubernetesversions/zz_generated.bindata.go | 2 +- test/framework/kubetest/run.go | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml index cfdf1fe17216..259b92d748e5 100644 --- a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml +++ b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml @@ -269,7 +269,7 @@ spec: description: ImageRepository sets the container registry to pull images from. If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version - starts with `ci/` or `ci-cross/`) `gcr.io/kubernetes-ci-images` + starts with `ci/` or `ci-cross/`) `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` will be used for all the other images. @@ -1079,7 +1079,7 @@ spec: description: ImageRepository sets the container registry to pull images from. If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version - starts with `ci/` or `ci-cross/`) `gcr.io/kubernetes-ci-images` + starts with `ci/` or `ci-cross/`) `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` will be used for all the other images. diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml index 191310ed0c5b..00ceb452fe9a 100644 --- a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml +++ b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml @@ -290,7 +290,7 @@ spec: to pull images from. If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/` or `ci-cross/`) - `gcr.io/kubernetes-ci-images` will be used as a default + `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` will be used for all the other images. type: string @@ -1134,7 +1134,7 @@ spec: to pull images from. If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/` or `ci-cross/`) - `gcr.io/kubernetes-ci-images` will be used as a default + `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` will be used for all the other images. type: string diff --git a/bootstrap/kubeadm/types/v1beta1/types.go b/bootstrap/kubeadm/types/v1beta1/types.go index 6e2c58ee29a6..84bab9953438 100644 --- a/bootstrap/kubeadm/types/v1beta1/types.go +++ b/bootstrap/kubeadm/types/v1beta1/types.go @@ -108,7 +108,7 @@ type ClusterConfiguration struct { // ImageRepository sets the container registry to pull images from. // If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/` or `ci-cross/`) - // `gcr.io/kubernetes-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` + // `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` // will be used for all the other images. // +optional ImageRepository string `json:"imageRepository,omitempty"` diff --git a/bootstrap/kubeadm/types/v1beta2/types.go b/bootstrap/kubeadm/types/v1beta2/types.go index f42f2a16ccae..7f604557dcfe 100644 --- a/bootstrap/kubeadm/types/v1beta2/types.go +++ b/bootstrap/kubeadm/types/v1beta2/types.go @@ -97,7 +97,7 @@ type ClusterConfiguration struct { // ImageRepository sets the container registry to pull images from. // If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/` or `ci-cross/`) - // `gcr.io/kubernetes-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` + // `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` // will be used for all the other images. ImageRepository string `json:"imageRepository,omitempty"` diff --git a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml index 9a33944a845a..6cd9780bd7b6 100644 --- a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml +++ b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml @@ -348,7 +348,7 @@ spec: description: ImageRepository sets the container registry to pull images from. If empty, `k8s.gcr.io` will be used by default; in case of kubernetes version is a CI build (kubernetes - version starts with `ci/` or `ci-cross/`) `gcr.io/kubernetes-ci-images` + version starts with `ci/` or `ci-cross/`) `gcr.io/k8s-staging-ci-images` will be used as a default for control plane components and for kube-proxy, while `k8s.gcr.io` will be used for all the other images. diff --git a/test/framework/kubernetesversions/data/debian_injection_script.envsubst.sh b/test/framework/kubernetesversions/data/debian_injection_script.envsubst.sh index 6763815822ea..e76468e9aaa9 100644 --- a/test/framework/kubernetesversions/data/debian_injection_script.envsubst.sh +++ b/test/framework/kubernetesversions/data/debian_injection_script.envsubst.sh @@ -95,7 +95,7 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then $${GSUTIL} cp "$${CI_URL}/$${CI_CONTAINER}.$${CONTAINER_EXT}" "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}" $${SUDO} ctr -n k8s.io images import "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}" || echo "* ignoring expected 'ctr images import' result" $${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "k8s.gcr.io/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}" - $${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/kubernetes-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}" + $${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}" done fi echo "* checking binary versions" diff --git a/test/framework/kubernetesversions/zz_generated.bindata.go b/test/framework/kubernetesversions/zz_generated.bindata.go index 85c01480ce85..5c1735910df6 100644 --- a/test/framework/kubernetesversions/zz_generated.bindata.go +++ b/test/framework/kubernetesversions/zz_generated.bindata.go @@ -94,7 +94,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _dataDebian_injection_scriptEnvsubstSh = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x57\x6d\x6f\xdb\x38\x12\xfe\xae\x5f\x31\x95\x83\x4d\xb3\x0d\xa5\x34\x5d\x14\xdd\x14\x5e\x9c\xeb\xa8\x3d\xa1\x81\x5d\xd8\xce\xbe\x20\xcd\x19\x34\x35\x96\x09\xd3\xa4\x8e\xa4\x9c\xf8\x1a\xdf\x6f\x3f\x90\x92\x1c\x3b\x71\xbb\xe9\x1e\xb0\xf9\xe2\x88\xe2\xbc\xf0\x19\x3e\xcf\x8c\x5a\xcf\xe2\x09\x97\xf1\x84\x9a\x59\x10\xb4\xa0\xab\x8a\x95\xe6\xf9\xcc\xc2\xe9\xc9\xe9\x09\x8c\x66\x08\x1f\xcb\x09\x6a\x89\x16\x0d\x74\x4a\x3b\x53\xda\x44\x41\x2b\x68\xc1\x05\x67\x28\x0d\x66\x50\xca\x0c\x35\xd8\x19\x42\xa7\xa0\x6c\x86\xcd\x9b\x63\xf8\x15\xb5\xe1\x4a\xc2\x69\x74\x02\xcf\xdd\x86\xb0\x7e\x15\x1e\xbd\x0d\x5a\xb0\x52\x25\x2c\xe8\x0a\xa4\xb2\x50\x1a\x04\x3b\xe3\x06\xa6\x5c\x20\xe0\x2d\xc3\xc2\x02\x97\xc0\xd4\xa2\x10\x9c\x4a\x86\x70\xc3\xed\xcc\x87\xa9\x9d\x44\x41\x0b\xfe\xa8\x5d\xa8\x89\xa5\x5c\x02\x05\xa6\x8a\x15\xa8\xe9\xf6\x3e\xa0\xd6\x27\xec\xfe\x66\xd6\x16\x67\x71\x7c\x73\x73\x13\x51\x9f\x6c\xa4\x74\x1e\x8b\x6a\xa3\x89\x2f\xd2\x6e\xd2\x1b\x26\xe4\x34\x3a\xf1\x26\x97\x52\xa0\x31\xa0\xf1\xdf\x25\xd7\x98\xc1\x64\x05\xb4\x28\x04\x67\x74\x22\x10\x04\xbd\x01\xa5\x81\xe6\x1a\x31\x03\xab\x5c\xbe\x37\x9a\x5b\x2e\xf3\x63\x30\x6a\x6a\x6f\xa8\xc6\xa0\x05\x19\x37\x56\xf3\x49\x69\x77\xc0\x6a\xb2\xe3\x66\x67\x83\x92\x40\x25\x84\x9d\x21\xa4\xc3\x10\xde\x75\x86\xe9\xf0\x38\x68\xc1\x6f\xe9\xe8\x9f\xfd\xcb\x11\xfc\xd6\x19\x0c\x3a\xbd\x51\x9a\x0c\xa1\x3f\x80\x6e\xbf\x77\x9e\x8e\xd2\x7e\x6f\x08\xfd\xf7\xd0\xe9\xfd\x01\x1f\xd3\xde\xf9\x31\x20\xb7\x33\xd4\x80\xb7\x85\x76\xf9\x2b\x0d\xdc\xc1\x88\x99\xc3\x6c\x88\xb8\x93\xc0\x54\x55\x09\x99\x02\x19\x9f\x72\x06\x82\xca\xbc\xa4\x39\x42\xae\x96\xa8\x25\x97\x39\x14\xa8\x17\xdc\xb8\x62\x1a\xa0\x32\x0b\x5a\x20\xf8\x82\x5b\x6a\xfd\xca\xa3\x43\x45\x41\xd0\x6a\xc1\x27\x81\xd4\xa0\x2b\xaf\x0b\x48\xed\x56\x81\x25\x62\x66\x1c\x64\x13\x04\x34\x8c\x16\x98\xf9\x3c\x50\x2e\x4d\x39\x31\xd6\xbd\x9a\x96\x92\x39\xff\xee\x5e\x9a\x19\x0a\xc1\x66\xc8\xe6\x0e\x2c\x87\x7e\x7b\xd8\x7d\x79\xf2\xe6\xd5\xf1\xb0\x7b\x7a\xf2\xea\x27\xff\xf3\xfa\xb5\xfb\x79\xf9\xf3\xab\x20\x30\x68\x81\x28\x90\xaa\x94\x06\x6d\xf3\x58\xf0\x02\xa7\x94\x8b\xe6\x19\xb5\xc6\x5b\x6e\x83\xe0\xea\x0a\x0e\x9e\xf3\x0c\x48\x79\x04\xcf\xda\x70\x02\xd7\xd7\xf0\xc3\x0f\x30\xbc\x3c\xef\xb7\x43\x53\x66\x2a\x84\xbb\xbb\xfa\x31\x0c\x82\xcb\x61\x32\xee\xa6\xe3\xce\x60\x94\xbe\xef\x74\x47\xc3\xf6\xc1\x97\x87\x4b\x67\xed\x29\x15\x06\xd7\x41\xc0\xa7\x70\x05\xcf\x20\x7c\xbc\x67\x1d\x42\x1b\xac\x2e\x11\xae\xdf\x3a\xf4\x64\x00\x80\x6c\xa6\x20\xec\x29\xe8\xa6\xd0\xd1\x96\x4f\x29\xb3\x06\xb8\x34\x96\x0a\xe1\xe1\x3e\x06\x97\x33\x97\x79\xe8\xb6\xdf\x72\x0b\x27\xc1\x94\x07\xc1\x87\xe1\xe5\x28\xbd\x68\xe7\xa6\xb4\x5c\xf8\xb0\xcf\x1c\x7b\x16\x54\x66\x40\x96\x70\x70\xf0\xa5\xda\xb1\x86\x5f\xe2\x0c\x97\xb1\x2c\x85\xd8\x84\xa5\x85\x25\x39\x5a\x28\x8b\x8c\x5a\xdc\x5a\xa8\x23\x03\x59\xf9\x25\xab\xa9\x34\x85\xd2\x96\x38\x26\x19\x60\x94\x30\x74\x69\x72\x46\x9d\x42\xe4\xb2\x2c\x72\x60\xa5\x16\x9b\xb3\x64\x38\x81\x2b\xc3\x73\x89\x19\x99\xac\xda\x71\x69\x74\x6c\x66\x54\x63\x3c\xc7\x95\xe6\x32\x37\x31\x13\xaa\xcc\xa2\x5c\xa9\x5c\x60\x94\x17\xf9\xb5\xe7\xa9\x39\x8b\xe3\x82\xb2\x39\xcd\xd1\x44\x3b\x5b\x98\x5a\xc4\xb4\xb0\xe0\x17\x89\xc9\xe6\xb0\xa0\x5c\x86\x70\xe7\x4e\xe9\xaa\xb4\x06\x8b\x08\x84\x42\x8c\x96\xb9\xad\xb1\x51\xa5\x66\x68\x22\xc1\x8d\x8d\xb2\xb8\x72\x44\x36\x0e\xfc\x7a\x00\x3e\xf3\xa7\x05\x8f\x33\xe5\x3d\x93\x39\xae\x5c\xce\xdb\xc1\xeb\x65\x20\xa4\x3e\x22\x3c\xe5\xd4\x40\xb3\x0c\xc8\x13\x8b\xf1\xf0\x00\xfe\x0a\x6c\xd5\x78\x59\x49\xaf\xe3\xce\xc8\xb1\xce\xa2\xd9\xd8\x3b\x41\xab\xa8\xd9\x9c\xd0\x29\xc4\x84\x4b\xaa\x39\x9a\x8a\xaa\x54\x23\x50\xd0\x68\x4a\x61\x1b\x3d\xed\xa6\x8e\xfb\x1b\xe3\x49\xc9\x45\xe6\x9a\x01\xa4\x16\x74\x29\x0d\x1c\x46\x51\x04\x84\xd4\xb1\x0f\x9b\xeb\xe7\x89\xbe\x44\xcd\xa7\xab\x46\x07\xf0\x3e\x9c\x8b\xc4\x94\xd6\xc8\xac\x58\x35\x29\xa2\x93\x18\x17\x6c\xca\x25\x15\x62\x05\xa5\xdc\x24\xef\xac\x37\xa5\x09\x5a\xf0\xbe\xd6\xaf\x47\x87\xe2\xd6\x1f\xdb\x80\xc3\xac\x4e\xca\x71\xa9\x52\xbb\xb2\x70\xf7\x18\xcc\x1c\x6f\xa2\xe0\x22\xed\x25\xe3\x61\xf2\xa9\x33\xe8\x8c\xfa\x83\x76\xf8\xe3\xf7\xfe\x85\x41\x75\xdb\x0f\x0e\xbe\xec\xfa\x5a\x87\x5e\x0b\xbb\xa2\x34\x16\x35\xb3\x02\x9c\xf8\x2c\xa9\xe6\x4e\xc5\x4c\xd0\x72\x7d\xe6\xe0\xe0\xcb\xc7\xcb\x77\xc9\xa0\x97\x8c\x92\xe1\xf8\xd7\x64\x30\x4c\xfb\xbd\x35\xdc\x70\x21\x9c\x42\x6a\x2c\x04\x65\x55\xff\x61\x1b\x47\xc1\x63\x93\xf6\x5e\x3f\x3e\x46\x0b\x12\x99\x6d\x59\x3f\x48\xc3\xcb\xd4\x95\xcf\x7f\x8f\x87\xd0\xa9\x62\x18\xc2\xf5\xbd\x50\x75\xd3\xf1\x79\x3a\x68\xc7\x76\x51\xc4\xf3\x37\x86\x30\x1e\x00\x2c\xe6\x19\xd7\x40\x0a\xef\xa7\xda\xb1\x76\x32\x95\x21\x13\xae\xce\x84\xc2\xa7\x4e\xf7\x63\xe7\x43\x32\x1c\x8f\xfa\xe3\x51\x32\x1c\xb5\x9f\x87\xf3\x72\xe2\x8a\x1f\x82\xff\x4f\xa0\xad\xff\xa3\xd9\x22\x3c\xda\xb5\xee\xf6\x7b\xa3\x4e\xda\x4b\x06\x0f\xed\x09\x2d\xb8\x41\xbd\x44\x5d\x1b\x13\xa6\xa4\xd5\x4a\x08\xd4\x64\x41\x25\xcd\xef\xdf\x14\x5a\xdd\xae\x9a\x07\xc3\x66\x98\x95\x02\xb5\x0f\xb5\xf1\x3f\x4e\x7e\x1f\xb5\x43\x4b\x75\xb8\x11\xb2\x1f\xfd\x6d\x72\x6c\xee\xa6\xcd\x75\xfa\x4a\xe5\x9c\x51\x0b\xba\xbe\x5f\xb9\xb6\x66\x70\xb1\x44\x1d\x00\xfc\x09\xca\xed\xff\xc2\xbf\x96\x57\x27\xe4\xe7\xeb\x17\x9f\xa3\xdd\xdf\x83\x6d\xf0\x3d\xfc\x97\x83\x8b\x76\x98\x3b\xa1\x9a\x6f\x46\x34\x52\x93\x20\x6e\x7e\xf7\x47\xf2\x33\x9f\xe0\xb2\xbc\x8d\xe9\x22\x7b\xfd\x53\xe8\x7d\xd6\x6f\xc7\xf5\xac\x31\xfe\x34\x48\xde\xa7\xbf\xb7\xf7\x67\xdb\x5a\xae\x2b\xab\xf3\xe4\x5d\xda\xe9\x8d\xdf\x0f\xfa\xbd\x51\xd2\x3b\x6f\x4b\x25\xb9\xb4\xa8\x29\xb3\x7c\x89\x4f\x6e\x24\x55\xcb\xa8\x15\x98\x98\xbf\x2c\xc2\x8d\xf6\x36\x62\x5a\x57\xef\xd0\xb5\xa1\xc6\x27\x2d\x6c\x74\x8f\x59\xc4\x55\x0c\x5b\x10\xde\xa2\xe4\x54\xf8\x96\x72\x08\xbf\x7c\xad\x83\x6c\xd9\xd7\xbd\x63\x8f\x70\xbb\x5b\x50\x93\x17\xa2\x6a\x80\xfd\x1c\xed\x60\x3d\x48\x3e\x24\x15\xc4\xfb\xd1\x8f\xe3\x28\xfe\xfc\x39\xaa\xb1\xae\xc9\xb3\xa1\x7b\x78\xf0\xdc\xc5\x64\x7e\xec\x5e\xd0\x8c\x1b\x25\xa1\x26\x11\xdc\x41\xae\xb1\xa2\xe2\x4e\xb4\x35\x71\x9d\x72\x86\x34\x03\x22\x5f\xc2\x1d\xb0\xd2\x02\xc9\xe0\xf0\xee\x10\xc8\x14\x4e\xe1\x0e\xac\xf6\x0b\x57\x67\xa6\xa0\x0c\xcf\xae\x0f\x8f\xaa\xf8\xee\x2e\x77\xd3\x71\x9d\x86\x93\x52\xe7\xfd\x21\xa5\xaf\xfe\x71\xbd\x0e\xdf\x42\xa6\xbc\xcd\x3d\x7d\xea\x2b\xe0\xe7\xc9\xaa\xaa\x67\x50\xe9\x44\xed\x61\x0d\xf7\xde\x76\xb8\xf4\xd7\xee\x59\xb8\xeb\xbc\xfd\x55\xe7\x99\x92\xae\x5a\x28\x0c\x3e\x85\x5c\xc4\x8d\x4f\x8c\x7f\x85\x5b\x64\x42\xff\x83\x62\x3f\xc3\xfe\x3f\xfc\x32\x75\x23\x85\xa2\x99\x03\xd0\xb7\xcf\x55\x83\xdf\xe5\xe0\x62\x1d\xef\x9e\xb6\x81\x6d\x6b\x26\x60\x1b\x5d\xde\xb7\x7f\x5b\xb3\xbf\xe2\x8b\xcd\x16\x2a\x83\x17\xb7\x4f\xd8\xba\x58\x7e\x6b\x13\x84\x7e\x20\x72\x18\xed\x33\xaf\xeb\x01\x60\x56\xc6\xe2\xc2\x75\x2b\x8d\xc6\x52\x6d\x9b\xcb\x1d\x00\x4c\x5d\xc3\xa9\x01\xdd\xc8\x76\x03\xe9\xe3\x3e\xb1\x0b\xea\x3e\x48\x1f\xdc\xc9\x2d\x8c\x36\xde\xd6\xd1\xb6\x6f\xd7\x23\xea\x8c\xff\x0c\xe5\x6f\x7a\xd8\x83\xd4\x93\x22\x56\xc3\x26\x73\x64\x95\x30\x7f\xe3\x84\x0c\xf8\xa2\x1a\x7d\x16\x7e\xb8\xf9\x4e\xc7\xee\x23\x67\x43\xd6\x5c\x2a\x3f\xba\xe2\x6d\x81\xcc\x7d\x99\x1e\xba\x48\x3b\xfe\x0f\xeb\x01\xf1\x29\x19\x59\x9a\x43\xe8\x96\x72\xa6\x9d\xe2\x3e\x4c\x87\x78\x9a\x9c\xed\xe5\x54\x1c\xbf\x88\xc7\x0e\xa7\x6f\xd8\x7f\xd3\xf2\xef\xca\xaf\xb6\xdd\x92\x0c\xc6\x49\x15\xe0\xbb\x13\xf6\x24\x98\xf2\xa0\x29\x88\xff\xfa\xbd\xa7\xfe\x66\xa0\x6d\x26\x4f\x77\xaa\x7a\xed\x0c\xdc\x9d\x7a\xbe\xb5\x72\xd4\xec\xaa\xe7\xaa\x07\x3b\x1f\xac\x02\x51\x6d\x33\x53\xda\xee\x98\x39\x1a\x3e\x36\xdb\x5a\x05\x42\x98\xe0\x28\x6d\xdb\x7f\xd4\x12\xe2\x7d\xf8\x87\x1d\x47\xae\x39\x3d\x76\xe4\x56\x37\xdf\x0e\x47\xdf\x9a\xa7\xff\x17\x00\x00\xff\xff\x3f\x8e\x7f\x9b\xb4\x12\x00\x00") +var _dataDebian_injection_scriptEnvsubstSh = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x57\x6d\x6f\xdb\x38\x12\xfe\xae\x5f\x31\x95\x83\x4d\xb3\x0d\xa5\x34\x5d\x14\xdd\x14\x5e\x9c\xeb\xa8\x3d\xa1\x81\x5d\xd8\xce\xbe\x20\xcd\x19\x34\x35\x96\x09\xd3\xa4\x8e\xa4\x9c\xf8\x1a\xdf\x6f\x3f\x90\x92\x1c\x3b\x71\xbb\xe9\x1e\xb0\xf9\xe2\x88\xe2\xbc\xf0\x19\x3e\xcf\x8c\x5a\xcf\xe2\x09\x97\xf1\x84\x9a\x59\x10\xb4\xa0\xab\x8a\x95\xe6\xf9\xcc\xc2\xe9\xc9\xe9\x09\x8c\x66\x08\x1f\xcb\x09\x6a\x89\x16\x0d\x74\x4a\x3b\x53\xda\x44\x41\x2b\x68\xc1\x05\x67\x28\x0d\x66\x50\xca\x0c\x35\xd8\x19\x42\xa7\xa0\x6c\x86\xcd\x9b\x63\xf8\x15\xb5\xe1\x4a\xc2\x69\x74\x02\xcf\xdd\x86\xb0\x7e\x15\x1e\xbd\x0d\x5a\xb0\x52\x25\x2c\xe8\x0a\xa4\xb2\x50\x1a\x04\x3b\xe3\x06\xa6\x5c\x20\xe0\x2d\xc3\xc2\x02\x97\xc0\xd4\xa2\x10\x9c\x4a\x86\x70\xc3\xed\xcc\x87\xa9\x9d\x44\x41\x0b\xfe\xa8\x5d\xa8\x89\xa5\x5c\x02\x05\xa6\x8a\x15\xa8\xe9\xf6\x3e\xa0\xd6\x27\xec\xfe\x66\xd6\x16\x67\x71\x7c\x73\x73\x13\x51\x9f\x6c\xa4\x74\x1e\x8b\x6a\xa3\x89\x2f\xd2\x6e\xd2\x1b\x26\xe4\x34\x3a\xf1\x26\x97\x52\xa0\x31\xa0\xf1\xdf\x25\xd7\x98\xc1\x64\x05\xb4\x28\x04\x67\x74\x22\x10\x04\xbd\x01\xa5\x81\xe6\x1a\x31\x03\xab\x5c\xbe\x37\x9a\x5b\x2e\xf3\x63\x30\x6a\x6a\x6f\xa8\xc6\xa0\x05\x19\x37\x56\xf3\x49\x69\x77\xc0\x6a\xb2\xe3\x66\x67\x83\x92\x40\x25\x84\x9d\x21\xa4\xc3\x10\xde\x75\x86\xe9\xf0\x38\x68\xc1\x6f\xe9\xe8\x9f\xfd\xcb\x11\xfc\xd6\x19\x0c\x3a\xbd\x51\x9a\x0c\xa1\x3f\x80\x6e\xbf\x77\x9e\x8e\xd2\x7e\x6f\x08\xfd\xf7\xd0\xe9\xfd\x01\x1f\xd3\xde\xf9\x31\x20\xb7\x33\xd4\x80\xb7\x85\x76\xf9\x2b\x0d\xdc\xc1\x88\x99\xc3\x6c\x88\xb8\x93\xc0\x54\x55\x09\x99\x02\x19\x9f\x72\x06\x82\xca\xbc\xa4\x39\x42\xae\x96\xa8\x25\x97\x39\x14\xa8\x17\xdc\xb8\x62\x1a\xa0\x32\x0b\x5a\x20\xf8\x82\x5b\x6a\xfd\xca\xa3\x43\x45\x41\xd0\x6a\xc1\x27\x81\xd4\xa0\x2b\xaf\x0b\x48\xed\x56\x81\x25\x62\x66\x1c\x64\x13\x04\x34\x8c\x16\x98\xf9\x3c\x50\x2e\x4d\x39\x31\xd6\xbd\x9a\x96\x92\x39\xff\xee\x5e\x9a\x19\x0a\xc1\x66\xc8\xe6\x0e\x2c\x87\x7e\x7b\xd8\x7d\x79\xf2\xe6\xd5\xf1\xb0\x7b\x7a\xf2\xea\x27\xff\xf3\xfa\xb5\xfb\x79\xf9\xf3\xab\x20\x30\x68\x81\x28\x90\xaa\x94\x06\x6d\xf3\x58\xf0\x02\xa7\x94\x8b\xe6\x19\xb5\xc6\x5b\x6e\x83\xe0\xea\x0a\x0e\x9e\xf3\x0c\x48\x79\x04\xcf\xda\x70\x02\xd7\xd7\xf0\xc3\x0f\x30\xbc\x3c\xef\xb7\x43\x53\x66\x2a\x84\xbb\xbb\xfa\x31\x0c\x82\xcb\x61\x32\xee\xa6\xe3\xce\x60\x94\xbe\xef\x74\x47\xc3\xf6\xc1\x97\x87\x4b\x67\xed\x29\x15\x06\xd7\x41\xc0\xa7\x70\x05\xcf\x20\x7c\xbc\x67\x1d\x42\x1b\xac\x2e\x11\xae\xdf\x3a\xf4\x64\x00\x80\x6c\xa6\x20\xec\x29\xe8\xa6\xd0\xd1\x96\x4f\x29\xb3\x06\xb8\x34\x96\x0a\xe1\xe1\x3e\x06\x97\x33\x97\x79\xe8\xb6\xdf\x72\x0b\x27\xc1\x94\x07\xc1\x87\xe1\xe5\x28\xbd\x68\xe7\xa6\xb4\x5c\xf8\xb0\xcf\x1c\x7b\x16\x54\x66\x40\x96\x70\x70\xf0\xa5\xda\xb1\x86\x5f\xe2\x0c\x97\xb1\x2c\x85\xd8\x84\xa5\x85\x25\x39\x5a\x28\x8b\x8c\x5a\xdc\x5a\xa8\x23\x03\x59\xf9\x25\xab\xa9\x34\x85\xd2\x96\x38\x26\x19\x60\x94\x30\x74\x69\x72\x46\x9d\x42\xe4\xb2\x2c\x72\x60\xa5\x16\x9b\xb3\x64\x38\x81\x2b\xc3\x73\x89\x19\x99\xac\xda\x71\x69\x74\x6c\x66\x54\x63\x3c\xc7\x95\xe6\x32\x37\x31\x13\xaa\xcc\xa2\x5c\xa9\x5c\x60\x94\x17\xf9\xb5\xe7\xa9\x39\x8b\xe3\x82\xb2\x39\xcd\xd1\x44\x3b\x5b\x98\x5a\xc4\xb4\xb0\xe0\x17\x89\xc9\xe6\xb0\xa0\x5c\x86\x70\xe7\x4e\xe9\xaa\xb4\x06\x8b\x08\x84\x42\x8c\x96\xb9\xad\xb1\x51\xa5\x66\x68\x22\xc1\x8d\x8d\xb2\xb8\x72\x44\x36\x0e\xfc\x7a\x00\x3e\xf3\xa7\x05\x8f\x33\xe5\x3d\x93\x39\xae\x5c\xce\xdb\xc1\xeb\x65\x20\xa4\x3e\x22\x3c\xe5\xd4\x40\xb3\x0c\xc8\x13\x8b\xf1\xf0\x00\xfe\x0a\x6c\xd5\x78\x59\x49\xaf\xe3\xce\xc8\xb1\xce\xa2\xd9\xd8\x3b\x41\xab\xa8\xd9\x9c\xd0\x29\xc4\x84\x4b\xaa\x39\x9a\x8a\xaa\x54\x23\x50\xd0\x68\x4a\x61\x1b\x3d\xed\xa6\x8e\xfb\x1b\xe3\x49\xc9\x45\xe6\x9a\x01\xa4\x16\x74\x29\x0d\x1c\x46\x51\x04\x84\xd4\xb1\x0f\x9b\xeb\xe7\x89\xbe\x44\xcd\xa7\xab\x46\x07\xf0\x3e\x9c\x8b\xc4\x94\xd6\xc8\xac\x58\x35\x29\xa2\x93\x18\x17\x6c\xca\x25\x15\x62\x05\xa5\xdc\x24\xef\xac\x37\xa5\x09\x5a\xf0\xbe\xd6\xaf\x47\x87\xe2\xd6\x1f\xdb\x80\xc3\xac\x4e\xca\x71\xa9\x52\xbb\xb2\x70\xf7\x18\xcc\x1c\x6f\xa2\xe0\x22\xed\x25\xe3\x61\xf2\xa9\x33\xe8\x8c\xfa\x83\x76\xf8\xe3\xf7\xfe\x85\x41\x75\xdb\x0f\x0e\xbe\xec\xfa\x5a\x87\x5e\x0b\xbb\xa2\x34\x16\x35\xb3\x02\x9c\xf8\x2c\xa9\xe6\x4e\xc5\x4c\xd0\x72\x7d\xe6\xe0\xe0\xcb\xc7\xcb\x77\xc9\xa0\x97\x8c\x92\xe1\xf8\xd7\x64\x30\x4c\xfb\xbd\x35\xdc\x70\x21\x9c\x42\x6a\x2c\x04\x65\x55\xff\x61\x1b\x47\xc1\x63\x93\xf6\x5e\x3f\x3e\x46\x0b\x12\x99\x6d\x59\x3f\x48\xc3\xcb\xd4\x95\xcf\x7f\x8f\x87\xd0\xa9\x62\x18\xc2\xf5\xbd\x50\x75\xd3\xf1\x79\x3a\x68\xc7\x76\x51\xc4\xf3\x37\x86\x30\x1e\x00\x2c\xe6\x19\xd7\x40\x0a\xef\xa7\xda\xb1\x76\x32\x95\x21\x13\xae\xce\x84\xc2\xa7\x4e\xf7\x63\xe7\x43\x32\x1c\x8f\xfa\xe3\x51\x32\x1c\xb5\x9f\x87\xf3\x72\xe2\x8a\x1f\x82\xff\x4f\xa0\xad\xff\xa3\xd9\x22\x3c\xda\xb5\xee\xf6\x7b\xa3\x4e\xda\x4b\x06\x0f\xed\x09\x2d\xb8\x41\xbd\x44\x5d\x1b\x13\xa6\xa4\xd5\x4a\x08\xd4\x64\x41\x25\xcd\xef\xdf\x14\x5a\xdd\xae\x9a\x07\xc3\x66\x98\x95\x02\xb5\x0f\xb5\xf1\x3f\x4e\x7e\x1f\xb5\x43\x4b\x75\xb8\x11\xb2\x1f\xfd\x6d\x72\x6c\xee\xa6\xcd\x75\xfa\x4a\xe5\x9c\x51\x0b\xba\xbe\x5f\xb9\xb6\x66\x70\xb1\x44\x1d\x00\xfc\x09\xca\xed\xff\xc2\xbf\x96\x57\x27\xe4\xe7\xeb\x17\x9f\xa3\xdd\xdf\x83\x6d\xf0\x3d\xfc\x97\x83\x8b\x76\x98\x3b\xa1\x9a\x6f\x46\x34\x52\x93\x20\x6e\x7e\xf7\x47\xf2\x33\x9f\xe0\xb2\xbc\x8d\xe9\x22\x7b\xfd\x53\xe8\x7d\xd6\x6f\xc7\xf5\xac\x31\xfe\x34\x48\xde\xa7\xbf\xb7\xf7\x67\xdb\x5a\xae\x2b\xab\xf3\xe4\x5d\xda\xe9\x8d\xdf\x0f\xfa\xbd\x51\xd2\x3b\x6f\x4b\x25\xb9\xb4\xa8\x29\xb3\x7c\x89\x4f\x6e\x24\x55\xcb\xa8\x15\x98\x98\xbf\x2c\xc2\x8d\xf6\x36\x62\x5a\x57\xef\xd0\xb5\xa1\xc6\x27\x2d\x6c\x74\x8f\x59\xc4\x55\x0c\x5b\x10\xde\xa2\xe4\x54\xf8\x96\x72\x08\xbf\x7c\xad\x83\x6c\xd9\xd7\xbd\x63\x8f\x70\xbb\x5b\x50\x93\x17\xa2\x6a\x80\xfd\x1c\xed\x60\x3d\x48\x3e\x24\x15\xc4\xfb\xd1\x8f\xe3\x28\xfe\xfc\x39\xaa\xb1\xae\xc9\xb3\xa1\x7b\x78\xf0\xdc\xc5\x64\x7e\xec\x5e\xd0\x8c\x1b\x25\xa1\x26\x11\xdc\x41\xae\xb1\xa2\xe2\x4e\xb4\x35\x71\x9d\x72\x86\x34\x03\x22\x5f\xc2\x1d\xb0\xd2\x02\xc9\xe0\xf0\xee\x10\xc8\x14\x4e\xe1\x0e\xac\xf6\x0b\x57\x67\xa6\xa0\x0c\xcf\xae\x0f\x8f\xaa\xf8\xee\x2e\x77\xd3\x71\x9d\x86\x93\x52\xe7\xfd\x21\xa5\xaf\xfe\x71\xbd\x0e\xdf\x42\xa6\xbc\xcd\x3d\x7d\xea\x2b\xe0\xe7\xc9\xaa\xaa\x67\x50\xe9\x44\xed\x61\x0d\xf7\xde\x76\xb8\xf4\xd7\xee\x59\xb8\xeb\xbc\xfd\x55\xe7\x99\x92\xae\x5a\x28\x0c\x3e\x85\x5c\xc4\x8d\x4f\x8c\x7f\x85\x5b\x64\x42\xff\x83\x62\x3f\xc3\xfe\x3f\xfc\x32\x75\x23\x85\xa2\x99\x03\xd0\xb7\xcf\x55\x83\xdf\xe5\xe0\x62\x1d\xef\x9e\xb6\x81\x6d\x6b\x26\x60\x1b\x5d\xde\xb7\x7f\x5b\xb3\xbf\xe2\x8b\xcd\x16\x2a\x83\x17\xb7\x4f\xd8\xba\x58\x7e\x6b\x13\x84\x7e\x20\x72\x18\xed\x33\xaf\xeb\x01\x60\x56\xc6\xe2\xc2\x75\x2b\x8d\xc6\x52\x6d\x9b\xcb\x1d\x00\x4c\x5d\xc3\xa9\x01\xdd\xc8\x76\x03\xe9\xe3\x3e\xb1\x0b\xea\x3e\x48\x1f\xdc\xc9\x2d\x8c\x36\xde\xd6\xd1\xb6\x6f\xd7\x23\xea\x8c\xff\x0c\xe5\x6f\x7a\xd8\x83\xd4\x93\x22\x56\xc3\x26\x73\x64\x95\x30\x7f\xe3\x84\x0c\xf8\xa2\x1a\x7d\x16\x7e\xb8\xf9\x4e\xc7\xee\x23\x67\x43\xd6\x5c\x2a\x3f\xba\xe2\x6d\x81\xcc\x7d\x99\x1e\xba\x48\x3b\xfe\x0f\xeb\x01\xf1\x29\x19\x59\x9a\x43\xe8\x96\x72\xa6\x9d\xe2\x3e\x4c\x87\x78\x9a\x9c\xed\xe5\x54\x1c\xbf\x88\xc7\x0e\xa7\x6f\xd8\x7f\xd3\xf2\xef\xca\xaf\xb6\x75\xf3\x90\xb1\x34\xe7\x32\x27\x8c\x93\x2a\xc2\x77\x67\xec\x59\x30\xe5\x41\x53\x11\xff\xf9\x7b\xcf\xfd\xcd\x44\xdb\x8c\x9e\xee\x58\xf5\xda\x19\xb8\x4b\xf5\x7c\x6b\xe5\xa8\xd9\x55\x0f\x56\x0f\x76\x3e\x58\x05\xa2\xda\x66\xa6\xb4\xdd\x31\x73\x3c\x7c\x6c\xb6\xb5\x0a\x84\x30\xc1\x51\xda\xb6\xff\xaa\x25\xc4\xfb\xf0\x0f\x3b\x8e\x5c\x77\x7a\xec\xc8\xad\x6e\x3e\x1e\x8e\xbe\x35\x50\xff\x2f\x00\x00\xff\xff\xed\x36\x40\xb7\xb5\x12\x00\x00") func dataDebian_injection_scriptEnvsubstShBytes() ([]byte, error) { return bindataRead( diff --git a/test/framework/kubetest/run.go b/test/framework/kubetest/run.go index f1bd5284e8da..72252fc95711 100644 --- a/test/framework/kubetest/run.go +++ b/test/framework/kubetest/run.go @@ -35,7 +35,7 @@ import ( const ( standardImage = "us.gcr.io/k8s-artifacts-prod/conformance" - ciArtifactImage = "gcr.io/kubernetes-ci-images/conformance" + ciArtifactImage = "gcr.io/k8s-staging-ci-images/conformance" ) const (