github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move from k8s.gcr.io to registry.k8s.io

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2022-05-10 08:30:09 -04:00
parent aae07c6f7b
commit 50bea1dad8
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
232 changed files with 509 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/swagger.json generated
View File

@ -4932,7 +4932,7 @@
"description": "Describe a container image", "description": "Describe a container image",
"properties": { "properties": {
"names": { "names": {
"description": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "description": "Names by which this image is known. e.g. [\"kubernetes.example/hyperkube:v1.0.7\", \"cloud-vendor.registry.example/cloud-vendor/hyperkube:v1.0.7\"]",
"items": { "items": {
"type": "string" "type": "string"
}, },

2
api/openapi-spec/v3/api__v1_openapi.json
View File

@ -1230,7 +1230,7 @@
"description": "Describe a container image", "description": "Describe a container image",
"properties": { "properties": {
"names": { "names": {
"description": "Names by which this image is known. e.g. [\"k8s.gcr.io/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]", "description": "Names by which this image is known. e.g. [\"kubernetes.example/hyperkube:v1.0.7\", \"cloud-vendor.registry.example/cloud-vendor/hyperkube:v1.0.7\"]",
"items": { "items": {
"default": "", "default": "",
"type": "string" "type": "string"

4
build/common.sh
View File

@ -40,8 +40,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
readonly KUBE_BUILD_IMAGE_REPO=kube-build readonly KUBE_BUILD_IMAGE_REPO=kube-build
readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")" readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat "${KUBE_ROOT}/build/build-image/cross/VERSION")"
readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-k8s.gcr.io}" readonly KUBE_DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY:-registry.k8s.io}"
readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-k8s.gcr.io/build-image}" readonly KUBE_BASE_IMAGE_REGISTRY="${KUBE_BASE_IMAGE_REGISTRY:-registry.k8s.io/build-image}"
# This version number is used to cause everyone to rebuild their data containers # This version number is used to cause everyone to rebuild their data containers
# and build image. This is especially useful for automated build systems like # and build image. This is especially useful for automated build systems like

70
build/dependencies.yaml
View File

@ -32,11 +32,11 @@ dependencies:
version: 1.8.6 version: 1.8.6
refPaths: refPaths:
- path: cluster/addons/dns/coredns/coredns.yaml.base - path: cluster/addons/dns/coredns/coredns.yaml.base
match: k8s.gcr.io/coredns match: registry.k8s.io/coredns
- path: cluster/addons/dns/coredns/coredns.yaml.in - path: cluster/addons/dns/coredns/coredns.yaml.in
match: k8s.gcr.io/coredns match: registry.k8s.io/coredns
- path: cluster/addons/dns/coredns/coredns.yaml.sed - path: cluster/addons/dns/coredns/coredns.yaml.sed
match: k8s.gcr.io/coredns match: registry.k8s.io/coredns
- name: "coredns-kubeadm" - name: "coredns-kubeadm"
version: 1.8.6 version: 1.8.6
@ -109,29 +109,29 @@ dependencies:
#- path: hack/lib/golang.sh #- path: hack/lib/golang.sh
# match: minimum_go_version=go([0-9]+\.[0-9]+) # match: minimum_go_version=go([0-9]+\.[0-9]+)
- name: "k8s.gcr.io/kube-cross: dependents" - name: "registry.k8s.io/kube-cross: dependents"
version: v1.25.0-go1.18.2-bullseye.0 version: v1.25.0-go1.18.2-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
# Base images # Base images
- name: "k8s.gcr.io/debian-base: dependents" - name: "registry.k8s.io/debian-base: dependents"
version: bullseye-v1.2.0 version: bullseye-v1.2.0
refPaths: refPaths:
- path: cluster/images/etcd/Makefile - path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
- path: cluster/images/etcd/Makefile - path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-arm:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
- path: cluster/images/etcd/Makefile - path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-arm64:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-arm64:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
- path: cluster/images/etcd/Makefile - path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-ppc64le:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-ppc64le:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
- path: cluster/images/etcd/Makefile - path: cluster/images/etcd/Makefile
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) match: BASEIMAGE\?\=registry\.k8s\.io\/build-image\/debian-base-s390x:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
- path: test/conformance/image/Makefile - path: test/conformance/image/Makefile
match: BASE_IMAGE_VERSION\?= match: BASE_IMAGE_VERSION\?=
- name: "k8s.gcr.io/debian-iptables: dependents" - name: "registry.k8s.io/debian-iptables: dependents"
version: bullseye-v1.3.0 version: bullseye-v1.3.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
@ -139,27 +139,27 @@ dependencies:
- path: test/utils/image/manifest.go - path: test/utils/image/manifest.go
match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"} match: configs\[DebianIptables\] = Config{list\.BuildImageRegistry, "debian-iptables", "[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"}
- name: "k8s.gcr.io/go-runner: dependents" - name: "registry.k8s.io/go-runner: dependents"
version: v2.3.1-go1.18.2-bullseye.0 version: v2.3.1-go1.18.2-bullseye.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=
- name: "k8s.gcr.io/pause" - name: "registry.k8s.io/pause"
version: 3.7 version: 3.7
refPaths: refPaths:
- path: build/pause/Makefile - path: build/pause/Makefile
match: TAG\s*\?= match: TAG\s*\?=
- name: "k8s.gcr.io/pause: dependents" - name: "registry.k8s.io/pause: dependents"
version: 3.7 version: 3.7
refPaths: refPaths:
- path: cluster/gce/config-common.sh - path: cluster/gce/config-common.sh
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: cluster/gce/gci/configure-helper.sh - path: cluster/gce/gci/configure-helper.sh
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: cluster/gce/windows/smoke-test.sh - path: cluster/gce/windows/smoke-test.sh
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: cmd/kubeadm/app/constants/constants.go - path: cmd/kubeadm/app/constants/constants.go
match: PauseVersion\s+= match: PauseVersion\s+=
- path: cmd/kubeadm/app/util/template_test.go - path: cmd/kubeadm/app/util/template_test.go
@ -171,43 +171,43 @@ dependencies:
- path: cmd/kubelet/app/options/container_runtime.go - path: cmd/kubelet/app/options/container_runtime.go
match: defaultPodSandboxImageVersion\s+= match: defaultPodSandboxImageVersion\s+=
- path: hack/testdata/pod-with-precision.json - path: hack/testdata/pod-with-precision.json
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml - path: staging/src/k8s.io/kubectl/testdata/set/multi-resource-yaml.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml - path: staging/src/k8s.io/kubectl/testdata/set/namespaced-resource.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/cmd/core.sh - path: test/cmd/core.sh
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml - path: test/fixtures/pkg/kubectl/cmd/set/multi-resource-yaml.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml - path: test/fixtures/pkg/kubectl/cmd/set/namespaced-resource.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/benchmark-controller.json - path: test/integration/benchmark-controller.json
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-default.yaml - path: test/integration/scheduler_perf/config/pod-default.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-node-affinity.yaml - path: test/integration/scheduler_perf/config/pod-with-node-affinity.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml - path: test/integration/scheduler_perf/config/pod-with-pod-affinity.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml - path: test/integration/scheduler_perf/config/pod-with-pod-anti-affinity.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml - path: test/integration/scheduler_perf/config/pod-with-preferred-pod-affinity.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml - path: test/integration/scheduler_perf/config/pod-with-preferred-pod-anti-affinity.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml - path: test/integration/scheduler_perf/config/pod-with-preferred-topology-spreading.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-secret-volume.yaml - path: test/integration/scheduler_perf/config/pod-with-secret-volume.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml - path: test/integration/scheduler_perf/config/pod-with-topology-spreading.yaml
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/utils/runners.go - path: test/utils/runners.go
match: k8s.gcr.io\/pause:\d+\.\d+ match: registry.k8s.io\/pause:\d+\.\d+
- path: test/utils/image/manifest.go - path: test/utils/image/manifest.go
match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"}
- name: "k8s.gcr.io/setcap: dependents" - name: "registry.k8s.io/setcap: dependents"
version: bullseye-v1.2.0 version: bullseye-v1.2.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh

6
build/lib/release.sh
View File

@ -340,10 +340,10 @@ function kube::release::create_docker_images_for_server() {
images_dir="${RELEASE_IMAGES}/${arch}" images_dir="${RELEASE_IMAGES}/${arch}"
mkdir -p "${images_dir}" mkdir -p "${images_dir}"
# k8s.gcr.io is the constant tag in the docker archives, this is also the default for config scripts in GKE. # registry.k8s.io is the constant tag in the docker archives, this is also the default for config scripts in GKE.
# We can use KUBE_DOCKER_REGISTRY to include and extra registry in the docker archive. # We can use KUBE_DOCKER_REGISTRY to include and extra registry in the docker archive.
# If we use KUBE_DOCKER_REGISTRY="k8s.gcr.io", then the extra tag (same) is ignored, see release_docker_image_tag below. # If we use KUBE_DOCKER_REGISTRY="registry.k8s.io", then the extra tag (same) is ignored, see release_docker_image_tag below.
local -r docker_registry="k8s.gcr.io" local -r docker_registry="registry.k8s.io"
# Docker tags cannot contain '+' # Docker tags cannot contain '+'
local docker_tag="${KUBE_GIT_VERSION/+/_}" local docker_tag="${KUBE_GIT_VERSION/+/_}"
if [[ -z "${docker_tag}" ]]; then if [[ -z "${docker_tag}" ]]; then

2
build/pause/Makefile
View File

@ -40,7 +40,7 @@ ALL_OS_ARCH.windows = $(foreach arch, $(ALL_ARCH.windows), $(foreach osversion,
ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}}) ALL_OS_ARCH = $(foreach os, $(ALL_OS), ${ALL_OS_ARCH.${os}})
CFLAGS = -Os -Wall -Werror -static -DVERSION=v$(TAG)-$(REV) CFLAGS = -Os -Wall -Werror -static -DVERSION=v$(TAG)-$(REV)
KUBE_CROSS_IMAGE ?= k8s.gcr.io/build-image/kube-cross KUBE_CROSS_IMAGE ?= registry.k8s.io/build-image/kube-cross
KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION) KUBE_CROSS_VERSION ?= $(shell cat ../build-image/cross/VERSION)
# NOTE(claudiub): The Windows pause image also requires the wincat binary we're compiling for the # NOTE(claudiub): The Windows pause image also requires the wincat binary we're compiling for the

4
build/root/Makefile
View File

@ -410,8 +410,8 @@ define RELEASE_SKIP_TESTS_HELP_INFO
# Args: # Args:
# KUBE_RELEASE_RUN_TESTS: Whether to run tests. Set to 'y' to run tests anyways. # KUBE_RELEASE_RUN_TESTS: Whether to run tests. Set to 'y' to run tests anyways.
# KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'false' to do so. # KUBE_FASTBUILD: Whether to cross-compile for other architectures. Set to 'false' to do so.
# KUBE_DOCKER_REGISTRY: Registry of released images, default to k8s.gcr.io # KUBE_DOCKER_REGISTRY: Registry of released images, default to registry.k8s.io
# KUBE_BASE_IMAGE_REGISTRY: Registry of base images for controlplane binaries, default to k8s.gcr.io/build-image # KUBE_BASE_IMAGE_REGISTRY: Registry of base images for controlplane binaries, default to registry.k8s.io/build-image
# #
# Example: # Example:
# make release-skip-tests # make release-skip-tests

2
cluster/addons/addon-manager/Makefile
View File

@ -18,7 +18,7 @@ TEMP_DIR:=$(shell mktemp -d)
VERSION=v9.1.6 VERSION=v9.1.6
KUBECTL_VERSION?=v1.20.2 KUBECTL_VERSION?=v1.20.2
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):v1.0.1 BASEIMAGE=registry.k8s.io/debian-base-$(ARCH):v1.0.1
SUDO=$(if $(filter 0,$(shell id -u)),,sudo) SUDO=$(if $(filter 0,$(shell id -u)),,sudo)

4
cluster/addons/addon-manager/README.md
View File

@ -25,7 +25,7 @@ Otherwise it will be omitted.
#### Images #### Images
addon-manager images are pushed to `k8s.gcr.io`. As addon-manager is built for multiple architectures, there is an image per architecture in the format - `k8s.gcr.io/addon-manager/kube-addon-manager-$(ARCH):$(VERSION)`. addon-manager images are pushed to `registry.k8s.io`. As addon-manager is built for multiple architectures, there is an image per architecture in the format - `registry.k8s.io/addon-manager/kube-addon-manager-$(ARCH):$(VERSION)`.
#### How to release #### How to release
@ -56,4 +56,4 @@ $ make push ARCH=s390x
# ---> staging-k8s.gcr.io/addon-manager/kube-addon-manager-s390x:VERSION # ---> staging-k8s.gcr.io/addon-manager/kube-addon-manager-s390x:VERSION
``` ```
If you don't want to push the images, run `make` or `make build` instead If you don't want to push the images, run `make` or `make build` instead

2
cluster/addons/calico-policy-controller/calico-node-vertical-autoscaler-deployment.yaml
View File

@ -18,7 +18,7 @@ spec:
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- image: k8s.gcr.io/cpvpa-amd64:v0.8.3 - image: registry.k8s.io/cpvpa-amd64:v0.8.3
name: autoscaler name: autoscaler
command: command:
- /cpvpa - /cpvpa

2
cluster/addons/calico-policy-controller/typha-horizontal-autoscaler-deployment.yaml
View File

@ -21,7 +21,7 @@ spec:
supplementalGroups: [ 65534 ] supplementalGroups: [ 65534 ]
fsGroup: 65534 fsGroup: 65534
containers: containers:
- image: k8s.gcr.io/cluster-proportional-autoscaler-amd64:1.7.1 - image: registry.k8s.io/cluster-proportional-autoscaler-amd64:1.7.1
name: autoscaler name: autoscaler
command: command:
- /cluster-proportional-autoscaler - /cluster-proportional-autoscaler

2
cluster/addons/calico-policy-controller/typha-vertical-autoscaler-deployment.yaml
View File

@ -18,7 +18,7 @@ spec:
spec: spec:
priorityClassName: system-cluster-critical priorityClassName: system-cluster-critical
containers: containers:
- image: k8s.gcr.io/cpvpa-amd64:v0.8.3 - image: registry.k8s.io/cpvpa-amd64:v0.8.3
name: autoscaler name: autoscaler
command: command:
- /cpvpa - /cpvpa

2
cluster/addons/cluster-loadbalancing/glbc/default-svc-controller.yaml
View File

@ -26,7 +26,7 @@ spec:
# Any image is permissible as long as: # Any image is permissible as long as:
# 1. It serves a 404 page at / # 1. It serves a 404 page at /
# 2. It serves 200 on a /healthz endpoint # 2. It serves 200 on a /healthz endpoint
image: k8s.gcr.io/networking/ingress-gce-404-server-with-metrics-amd64:v1.10.11 image: registry.k8s.io/networking/ingress-gce-404-server-with-metrics-amd64:v1.10.11
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz

2
cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml
View File

@ -36,7 +36,7 @@ spec:
hostPath: hostPath:
path: /dev path: /dev
containers: containers:
- image: "k8s.gcr.io/nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa" - image: "registry.k8s.io/nvidia-gpu-device-plugin@sha256:4b036e8844920336fa48f36edeb7d4398f426d6a934ba022848deed2edbf09aa"
command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"] command: ["/usr/bin/nvidia-gpu-device-plugin", "-logtostderr"]
name: nvidia-gpu-device-plugin name: nvidia-gpu-device-plugin
resources: resources:

2
cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
View File

@ -86,7 +86,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: autoscaler - name: autoscaler
image: k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.4 image: registry.k8s.io/cpa/cluster-proportional-autoscaler:1.8.4
resources: resources:
requests: requests:
cpu: "20m" cpu: "20m"

2
cluster/addons/dns/coredns/coredns.yaml.base
View File

@ -139,7 +139,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: k8s.gcr.io/coredns/coredns:v1.8.6 image: registry.k8s.io/coredns/coredns:v1.8.6
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:

2
cluster/addons/dns/coredns/coredns.yaml.in
View File

@ -139,7 +139,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: k8s.gcr.io/coredns/coredns:v1.8.6 image: registry.k8s.io/coredns/coredns:v1.8.6
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:

2
cluster/addons/dns/coredns/coredns.yaml.sed
View File

@ -139,7 +139,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: k8s.gcr.io/coredns/coredns:v1.8.6 image: registry.k8s.io/coredns/coredns:v1.8.6
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
limits: limits:

6
cluster/addons/dns/kube-dns/kube-dns.yaml.base
View File

@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/dns/k8s-dns-kube-dns:1.21.1 image: registry.k8s.io/dns/k8s-dns-kube-dns:1.21.1
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@ -170,7 +170,7 @@ spec:
runAsUser: 1001 runAsUser: 1001
runAsGroup: 1001 runAsGroup: 1001
- name: dnsmasq - name: dnsmasq
image: k8s.gcr.io/dns/k8s-dns-dnsmasq-nanny:1.21.1 image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -217,7 +217,7 @@ spec:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- SETGID - SETGID
- name: sidecar - name: sidecar
image: k8s.gcr.io/dns/k8s-dns-sidecar:1.21.1 image: registry.k8s.io/dns/k8s-dns-sidecar:1.21.1
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

6
cluster/addons/dns/kube-dns/kube-dns.yaml.in
View File

@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/dns/k8s-dns-kube-dns:1.21.1 image: registry.k8s.io/dns/k8s-dns-kube-dns:1.21.1
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@ -170,7 +170,7 @@ spec:
runAsUser: 1001 runAsUser: 1001
runAsGroup: 1001 runAsGroup: 1001
- name: dnsmasq - name: dnsmasq
image: k8s.gcr.io/dns/k8s-dns-dnsmasq-nanny:1.21.1 image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -217,7 +217,7 @@ spec:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- SETGID - SETGID
- name: sidecar - name: sidecar
image: k8s.gcr.io/dns/k8s-dns-sidecar:1.21.1 image: registry.k8s.io/dns/k8s-dns-sidecar:1.21.1
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

6
cluster/addons/dns/kube-dns/kube-dns.yaml.sed
View File

@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: kubedns - name: kubedns
image: k8s.gcr.io/dns/k8s-dns-kube-dns:1.21.1 image: registry.k8s.io/dns/k8s-dns-kube-dns:1.21.1
resources: resources:
# TODO: Set memory limits when we've profiled the container for large # TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in # clusters, then set request = limit to keep this container in
@ -170,7 +170,7 @@ spec:
runAsUser: 1001 runAsUser: 1001
runAsGroup: 1001 runAsGroup: 1001
- name: dnsmasq - name: dnsmasq
image: k8s.gcr.io/dns/k8s-dns-dnsmasq-nanny:1.21.1 image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.21.1
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthcheck/dnsmasq path: /healthcheck/dnsmasq
@ -217,7 +217,7 @@ spec:
- NET_BIND_SERVICE - NET_BIND_SERVICE
- SETGID - SETGID
- name: sidecar - name: sidecar
image: k8s.gcr.io/dns/k8s-dns-sidecar:1.21.1 image: registry.k8s.io/dns/k8s-dns-sidecar:1.21.1
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /metrics path: /metrics

2
cluster/addons/dns/nodelocaldns/README.md
View File

@ -19,7 +19,7 @@ We have the following variables in the yaml:
Note: The local listen IP address for NodeLocal DNSCache can be any address that can be guaranteed to not collide with any existing IP in your cluster. It's recommended to use an address with a local scope, per example, from the link-local range 169.254.0.0/16 for IPv4 or from the Unique Local Address range in IPv6 fd00::/8. Note: The local listen IP address for NodeLocal DNSCache can be any address that can be guaranteed to not collide with any existing IP in your cluster. It's recommended to use an address with a local scope, per example, from the link-local range 169.254.0.0/16 for IPv4 or from the Unique Local Address range in IPv6 fd00::/8.
The following variables will be set by the node-cache images - k8s.gcr.io/k8s-dns-node-cache:1.15.6 or later. The following variables will be set by the node-cache images - registry.k8s.io/k8s-dns-node-cache:1.15.6 or later.
The values will be determined by reading the kube-dns configMap for custom The values will be determined by reading the kube-dns configMap for custom
Upstream server configuration. Upstream server configuration.
`__PILLAR__CLUSTER__DNS__` - Upstream server for in-cluster queries. `__PILLAR__CLUSTER__DNS__` - Upstream server for in-cluster queries.

2
cluster/addons/dns/nodelocaldns/nodelocaldns.yaml
View File

@ -138,7 +138,7 @@ spec:
operator: "Exists" operator: "Exists"
containers: containers:
- name: node-cache - name: node-cache
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.21.1 image: registry.k8s.io/dns/k8s-dns-node-cache:1.21.1
resources: resources:
requests: requests:
cpu: 25m cpu: 25m

2
cluster/addons/fluentd-gcp/scaler-deployment.yaml
View File

@ -19,7 +19,7 @@ spec:
serviceAccountName: fluentd-gcp-scaler serviceAccountName: fluentd-gcp-scaler
containers: containers:
- name: fluentd-gcp-scaler - name: fluentd-gcp-scaler
image: k8s.gcr.io/fluentd-gcp-scaler:0.5.2 image: registry.k8s.io/fluentd-gcp-scaler:0.5.2
command: command:
- /scaler.sh - /scaler.sh
- --ds-name=fluentd-gcp-{{ fluentd_gcp_yaml_version }} - --ds-name=fluentd-gcp-{{ fluentd_gcp_yaml_version }}

2
cluster/addons/ip-masq-agent/ip-masq-agent.yaml
View File

@ -29,7 +29,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: ip-masq-agent - name: ip-masq-agent
image: k8s.gcr.io/networking/ip-masq-agent-amd64:v2.6.0 image: registry.k8s.io/networking/ip-masq-agent-amd64:v2.6.0
args: args:
- --masq-chain=IP-MASQ - --masq-chain=IP-MASQ
- --nomasq-all-reserved-ranges - --nomasq-all-reserved-ranges

2
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View File

@ -43,7 +43,7 @@ spec:
effect: "NoSchedule" effect: "NoSchedule"
containers: containers:
- name: metadata-proxy - name: metadata-proxy
image: k8s.gcr.io/metadata-proxy:v0.1.12 image: registry.k8s.io/metadata-proxy:v0.1.12
args: ["--addr=0.0.0.0:988"] args: ["--addr=0.0.0.0:988"]
securityContext: securityContext:
privileged: true privileged: true

4
cluster/addons/metrics-server/metrics-server-deployment.yaml
View File

@ -50,7 +50,7 @@ spec:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- name: metrics-server - name: metrics-server
image: k8s.gcr.io/metrics-server/metrics-server:v0.5.2 image: registry.k8s.io/metrics-server/metrics-server:v0.5.2
command: command:
- /metrics-server - /metrics-server
- --metric-resolution=30s - --metric-resolution=30s
@ -81,7 +81,7 @@ spec:
- mountPath: /tmp - mountPath: /tmp
name: tmp-dir name: tmp-dir
- name: metrics-server-nanny - name: metrics-server-nanny
image: k8s.gcr.io/autoscaling/addon-resizer:1.8.14 image: registry.k8s.io/autoscaling/addon-resizer:1.8.14
resources: resources:
limits: limits:
cpu: 100m cpu: 100m

2
cluster/addons/node-problem-detector/npd.yaml
View File

@ -47,7 +47,7 @@ spec:
spec: spec:
containers: containers:
- name: node-problem-detector - name: node-problem-detector
image: k8s.gcr.io/node-problem-detector/node-problem-detector:v0.8.9 image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.9
command: command:
- "/bin/sh" - "/bin/sh"
- "-c" - "-c"

2
cluster/addons/volumesnapshots/volume-snapshot-controller/volume-snapshot-controller-deployment.yaml
View File

@ -22,7 +22,7 @@ spec:
serviceAccount: volume-snapshot-controller serviceAccount: volume-snapshot-controller
containers: containers:
- name: volume-snapshot-controller - name: volume-snapshot-controller
image: k8s.gcr.io/sig-storage/snapshot-controller:v4.0.0 image: registry.k8s.io/sig-storage/snapshot-controller:v4.0.0
args: args:
- "--v=5" - "--v=5"
- "--metrics-path=/metrics" - "--metrics-path=/metrics"

2
cluster/gce/addons/konnectivity-agent/konnectivity-agent-ds.yaml
View File

@ -27,7 +27,7 @@ spec:
nodeSelector: nodeSelector:
kubernetes.io/os: linux kubernetes.io/os: linux
containers: containers:
- image: k8s.gcr.io/kas-network-proxy/proxy-agent:v0.0.30 - image: registry.k8s.io/kas-network-proxy/proxy-agent:v0.0.30
name: konnectivity-agent name: konnectivity-agent
command: ["/proxy-agent"] command: ["/proxy-agent"]
args: [ args: [

2
cluster/gce/config-common.sh
View File

@ -160,7 +160,7 @@ export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfi
# Path for kube-proxy kubeconfig file on Windows nodes. # Path for kube-proxy kubeconfig file on Windows nodes.
export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig" export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig"
# Pause container image for Windows container. # Pause container image for Windows container.
export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.7" export WINDOWS_INFRA_CONTAINER="registry.k8s.io/pause:3.7"
# Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows. # Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows.
export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy" export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
# Version for csi-proxy # Version for csi-proxy

2
cluster/gce/config-test.sh
View File

@ -200,7 +200,7 @@ HEAPSTER_MACHINE_TYPE=${HEAPSTER_MACHINE_TYPE:-}
NUM_ADDITIONAL_NODES=${NUM_ADDITIONAL_NODES:-} NUM_ADDITIONAL_NODES=${NUM_ADDITIONAL_NODES:-}
ADDITIONAL_MACHINE_TYPE=${ADDITIONAL_MACHINE_TYPE:-} ADDITIONAL_MACHINE_TYPE=${ADDITIONAL_MACHINE_TYPE:-}
# Set etcd image (e.g. k8s.gcr.io/etcd) and version (e.g. v3.5.1-0) if you need # Set etcd image (e.g. registry.k8s.io/etcd) and version (e.g. v3.5.1-0) if you need
# non-default version. # non-default version.
export ETCD_IMAGE=${TEST_ETCD_IMAGE:-} export ETCD_IMAGE=${TEST_ETCD_IMAGE:-}
export ETCD_DOCKER_REPOSITORY=${TEST_ETCD_DOCKER_REPOSITORY:-} export ETCD_DOCKER_REPOSITORY=${TEST_ETCD_DOCKER_REPOSITORY:-}

16
cluster/gce/gci/configure-helper.sh
View File

@ -1720,7 +1720,7 @@ function prepare-kube-proxy-manifest-variables {
local -r src_file=$1; local -r src_file=$1;
local -r kubeconfig="--kubeconfig=/var/lib/kube-proxy/kubeconfig" local -r kubeconfig="--kubeconfig=/var/lib/kube-proxy/kubeconfig"
local kube_docker_registry="k8s.gcr.io" local kube_docker_registry="registry.k8s.io"
if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
kube_docker_registry=${KUBE_DOCKER_REGISTRY} kube_docker_registry=${KUBE_DOCKER_REGISTRY}
fi fi
@ -2057,7 +2057,7 @@ function compute-master-manifest-variables {
CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}}," CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}},"
CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true}," CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true},"
fi fi
DOCKER_REGISTRY="k8s.gcr.io" DOCKER_REGISTRY="registry.k8s.io"
if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY}" DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY}"
fi fi
@ -2989,7 +2989,7 @@ spec:
- name: vol - name: vol
containers: containers:
- name: pv-recycler - name: pv-recycler
image: k8s.gcr.io/debian-base:v2.0.0 image: registry.k8s.io/debian-base:v2.0.0
command: command:
- /bin/sh - /bin/sh
args: args:
@ -3002,7 +3002,7 @@ EOF
# fixup the alternate registry if specified # fixup the alternate registry if specified
if [[ -n "${KUBE_ADDON_REGISTRY:-}" ]]; then if [[ -n "${KUBE_ADDON_REGISTRY:-}" ]]; then
sed -i -e "s@k8s.gcr.io@${KUBE_ADDON_REGISTRY}@g" "${PV_RECYCLER_OVERRIDE_TEMPLATE}" sed -i -e "s@registry.k8s.io@${KUBE_ADDON_REGISTRY}@g" "${PV_RECYCLER_OVERRIDE_TEMPLATE}"
fi fi
} }
@ -3074,7 +3074,7 @@ oom_score = -999
[plugins."io.containerd.grpc.v1.cri"] [plugins."io.containerd.grpc.v1.cri"]
stream_server_address = "127.0.0.1" stream_server_address = "127.0.0.1"
max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144} max_container_log_line_size = ${CONTAINERD_MAX_CONTAINER_LOG_LINE:-262144}
sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"k8s.gcr.io/pause:3.7"}" sandbox_image = "${CONTAINERD_INFRA_CONTAINER:-"registry.k8s.io/pause:3.7"}"
[plugins."io.containerd.grpc.v1.cri".cni] [plugins."io.containerd.grpc.v1.cri".cni]
bin_dir = "${KUBE_HOME}/bin" bin_dir = "${KUBE_HOME}/bin"
conf_dir = "/etc/cni/net.d" conf_dir = "/etc/cni/net.d"
@ -3085,10 +3085,10 @@ oom_score = -999
runtime_type = "io.containerd.runc.v2" runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"] endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"]
# Enable registry.k8s.io as the primary mirror for k8s.gcr.io # Enable registry.k8s.io as the primary mirror for registry.k8s.io
# See: https://github.com/kubernetes/k8s.io/issues/3411 # See: https://github.com/kubernetes/k8s.io/issues/3411
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"] [plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.k8s.io"]
endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",] endpoint = ["https://registry.k8s.io", "https://registry.k8s.io",]
EOF EOF
if [[ "${CONTAINER_RUNTIME_TEST_HANDLER:-}" == "true" ]]; then if [[ "${CONTAINER_RUNTIME_TEST_HANDLER:-}" == "true" ]]; then

12
cluster/gce/gci/configure.sh
View File

@ -399,12 +399,12 @@ function install-kube-manifests {
echo "Downloading k8s manifests tar" echo "Downloading k8s manifests tar"
download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}" download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}"
tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite
local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-k8s.gcr.io}" local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-registry.k8s.io}"
if [[ "${kube_addon_registry}" != "k8s.gcr.io" ]]; then if [[ "${kube_addon_registry}" != "registry.k8s.io" ]]; then
find "${dst_dir}" \( -name '*.yaml' -or -name '*.yaml.in' \) -print0 | \ find "${dst_dir}" \( -name '*.yaml' -or -name '*.yaml.in' \) -print0 | \
xargs -0 sed -ri "s@(image:\s.*)k8s.gcr.io@\1${kube_addon_registry}@" xargs -0 sed -ri "s@(image:\s.*)registry.k8s.io@\1${kube_addon_registry}@"
find "${dst_dir}" \( -name '*.manifest' -or -name '*.json' \) -print0 | \ find "${dst_dir}" \( -name '*.manifest' -or -name '*.json' \) -print0 | \
xargs -0 sed -ri "s@(image\":\s+\")k8s.gcr.io@\1${kube_addon_registry}@" xargs -0 sed -ri "s@(image\":\s+\")registry.k8s.io@\1${kube_addon_registry}@"
fi fi
cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_BIN}/configure-helper.sh" cp "${dst_dir}/kubernetes/gci-trusty/gci-configure-helper.sh" "${KUBE_BIN}/configure-helper.sh"
cp "${dst_dir}/kubernetes/gci-trusty/configure-kubeapiserver.sh" "${KUBE_BIN}/configure-kubeapiserver.sh" cp "${dst_dir}/kubernetes/gci-trusty/configure-kubeapiserver.sh" "${KUBE_BIN}/configure-kubeapiserver.sh"
@ -454,8 +454,8 @@ function try-load-docker-image {
container=${img##*/} container=${img##*/}
container=${container%.tar} container=${container%.tar}
# find the right one for which we will need an additional tag # find the right one for which we will need an additional tag
container=$(ctr -n k8s.io images ls | grep "k8s.gcr.io/${container}" | awk '{print $1}' | cut -f 2 -d '/') container=$(ctr -n k8s.io images ls | grep "registry.k8s.io/${container}" | awk '{print $1}' | cut -f 2 -d '/')
${tag_image_command} "k8s.gcr.io/${container}" "${KUBE_ADDON_REGISTRY}/${container}" ${tag_image_command} "registry.k8s.io/${container}" "${KUBE_ADDON_REGISTRY}/${container}"
fi fi
# Re-enable errexit. # Re-enable errexit.
set -e set -e

2
cluster/gce/gci/testdata/kube-apiserver/base.template vendored
View File

@ -10,7 +10,7 @@ readonly APISERVER_CLIENT_CERT_PATH=/foo/bar
readonly CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true}," readonly CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true},"
readonly CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}}," readonly CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}},"
readonly INSECURE_PORT_MAPPING="{ \"name\": \"local\", \"containerPort\": 8080, \"hostPort\": 8080}," readonly INSECURE_PORT_MAPPING="{ \"name\": \"local\", \"containerPort\": 8080, \"hostPort\": 8080},"
readonly DOCKER_REGISTRY="k8s.gcr.io" readonly DOCKER_REGISTRY="registry.k8s.io"
readonly ENABLE_LEGACY_ABAC=false readonly ENABLE_LEGACY_ABAC=false
readonly ETC_MANIFESTS=${KUBE_HOME}/etc/kubernetes/manifests readonly ETC_MANIFESTS=${KUBE_HOME}/etc/kubernetes/manifests
readonly KUBE_API_SERVER_DOCKER_TAG=v1.11.0-alpha.0.1808_3c7452dc11645d-dirty readonly KUBE_API_SERVER_DOCKER_TAG=v1.11.0-alpha.0.1808_3c7452dc11645d-dirty

2
cluster/gce/manifests/cluster-autoscaler.manifest
View File

@ -19,7 +19,7 @@
"containers": [ "containers": [
{ {
"name": "cluster-autoscaler", "name": "cluster-autoscaler",
"image": "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.0", "image": "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.0",
"livenessProbe": { "livenessProbe": {
"httpGet": { "httpGet": {
"path": "/health-check", "path": "/health-check",

2
cluster/gce/manifests/etcd.manifest
View File

@ -18,7 +18,7 @@
{ {
"name": "etcd-container", "name": "etcd-container",
{{security_context}} {{security_context}}
"image": "{{ pillar.get('etcd_docker_repository', 'k8s.gcr.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.3-0') }}", "image": "{{ pillar.get('etcd_docker_repository', 'registry.k8s.io/etcd') }}:{{ pillar.get('etcd_docker_tag', '3.5.3-0') }}",
"resources": { "resources": {
"requests": { "requests": {
"cpu": {{ cpulimit }} "cpu": {{ cpulimit }}

2
cluster/gce/manifests/konnectivity-server.yaml
View File

@ -20,7 +20,7 @@ spec:
{{ disallow_privilege_escalation}} {{ disallow_privilege_escalation}}
{{ capabilities }} {{ capabilities }}
{{ drop_capabilities }} {{ drop_capabilities }}
image: k8s.gcr.io/kas-network-proxy/proxy-server:v0.0.30 image: registry.k8s.io/kas-network-proxy/proxy-server:v0.0.30
resources: resources:
requests: requests:
cpu: 25m cpu: 25m

2
cluster/gce/manifests/kube-addon-manager.yaml
View File

@ -23,7 +23,7 @@ spec:
- all - all
# When updating version also bump it in: # When updating version also bump it in:
# - test/kubemark/resources/manifests/kube-addon-manager.yaml # - test/kubemark/resources/manifests/kube-addon-manager.yaml
image: k8s.gcr.io/addon-manager/kube-addon-manager:v9.1.6 image: registry.k8s.io/addon-manager/kube-addon-manager:v9.1.6
command: command:
- /bin/bash - /bin/bash
- -c - -c

2
cluster/gce/windows/smoke-test.sh
View File

@ -358,7 +358,7 @@ spec:
spec: spec:
containers: containers:
- name: pause-win - name: pause-win
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7
nodeSelector: nodeSelector:
kubernetes.io/os: windows kubernetes.io/os: windows
tolerations: tolerations:

2
cluster/images/etcd-version-monitor/etcd-version-monitor.yaml
View File

@ -7,6 +7,6 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: etcd-version-monitor - name: etcd-version-monitor
image: k8s.gcr.io/etcd-version-monitor:0.1.3 image: registry.k8s.io/etcd-version-monitor:0.1.3
command: command:
- /etcd-version-monitor - /etcd-version-monitor

22
cluster/images/etcd/Makefile
View File

@ -15,7 +15,7 @@
# Build the etcd image # Build the etcd image
# #
# Usage: # Usage:
# [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.4] [REGISTRY=k8s.gcr.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [BUNDLED_ETCD_VERSIONS=3.0.17 3.1.20 3.2.32 3.3.17 3.4.18 3.5.4] [REGISTRY=registry.k8s.io] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
# #
# The image contains different etcd versions to simplify # The image contains different etcd versions to simplify
# upgrades. Thus be careful when removing any versions from here. # upgrades. Thus be careful when removing any versions from here.
@ -36,7 +36,7 @@ LATEST_ETCD_VERSION?=3.5.4
# for each revision of this image at that etcd version. # for each revision of this image at that etcd version.
REVISION?=0 REVISION?=0
# IMAGE_TAG Uniquely identifies k8s.gcr.io/etcd docker image with a tag of the form "<etcd-version>-<revision>". # IMAGE_TAG Uniquely identifies registry.k8s.io/etcd docker image with a tag of the form "<etcd-version>-<revision>".
IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION) IMAGE_TAG=$(LATEST_ETCD_VERSION)-$(REVISION)
ARCH?=amd64 ARCH?=amd64
@ -62,9 +62,9 @@ IMAGE_SUFFIX.linux = $(OS)-$(ARCH)
IMAGE_SUFFIX.windows = $(OS)-$(ARCH)-$(OSVERSION) IMAGE_SUFFIX.windows = $(OS)-$(ARCH)-$(OSVERSION)
IMAGE_SUFFIX := ${IMAGE_SUFFIX.${OS}} IMAGE_SUFFIX := ${IMAGE_SUFFIX.${OS}}
# Image should be pulled from k8s.gcr.io, which will auto-detect # Image should be pulled from registry.k8s.io, which will auto-detect
# region (us, eu, asia, ...) and pull from the closest. # region (us, eu, asia, ...) and pull from the closest.
REGISTRY?=k8s.gcr.io REGISTRY?=registry.k8s.io
# Images should be pushed to staging-k8s.gcr.io. # Images should be pushed to staging-k8s.gcr.io.
PUSH_REGISTRY?=staging-k8s.gcr.io PUSH_REGISTRY?=staging-k8s.gcr.io
@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
DOCKERFILE := ${DOCKERFILE.${OS}} DOCKERFILE := ${DOCKERFILE.${OS}}
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base:bullseye-v1.2.0 BASEIMAGE?=registry.k8s.io/build-image/debian-base:bullseye-v1.2.0
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm:bullseye-v1.2.0 BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm:bullseye-v1.2.0
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-arm64:bullseye-v1.2.0 BASEIMAGE?=registry.k8s.io/build-image/debian-base-arm64:bullseye-v1.2.0
endif endif
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-v1.2.0 BASEIMAGE?=registry.k8s.io/build-image/debian-base-ppc64le:bullseye-v1.2.0
endif endif
ifeq ($(ARCH),s390x) ifeq ($(ARCH),s390x)
BASEIMAGE?=k8s.gcr.io/build-image/debian-base-s390x:bullseye-v1.2.0 BASEIMAGE?=registry.k8s.io/build-image/debian-base-s390x:bullseye-v1.2.0
endif endif
BASE.windows = mcr.microsoft.com/windows/nanoserver BASE.windows = mcr.microsoft.com/windows/nanoserver
@ -240,8 +240,8 @@ unit-test:
docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \
/bin/bash -c "CGO_ENABLED=0 go test -v k8s.io/kubernetes/cluster/images/etcd/migrate" /bin/bash -c "CGO_ENABLED=0 go test -v k8s.io/kubernetes/cluster/images/etcd/migrate"
# Integration tests require both a golang build environment and all the etcd binaries from a `k8s.gcr.io/etcd` image (`/usr/local/bin/etcd-<version>`, ...). # Integration tests require both a golang build environment and all the etcd binaries from a `registry.k8s.io/etcd` image (`/usr/local/bin/etcd-<version>`, ...).
# Since the `k8s.gcr.io/etcd` image is for runtime only and does not have a build golang environment, we create a new docker image to run integration tests # Since the `registry.k8s.io/etcd` image is for runtime only and does not have a build golang environment, we create a new docker image to run integration tests
# with. # with.
build-integration-test-image: build build-integration-test-image: build
cp -r $(TEMP_DIR) $(TEMP_DIR)_integration_test cp -r $(TEMP_DIR) $(TEMP_DIR)_integration_test

8
cluster/images/etcd/README.md
View File

@ -1,4 +1,4 @@
### k8s.gcr.io/etcd docker image ### registry.k8s.io/etcd docker image
Provides docker images containing etcd and etcdctl binaries for multiple etcd Provides docker images containing etcd and etcdctl binaries for multiple etcd
version as well as a migration operator utility for upgrading and downgrading version as well as a migration operator utility for upgrading and downgrading
@ -6,14 +6,14 @@ etcd--it's data directory in particular--to a target version.
#### Versioning #### Versioning
Each `k8s.gcr.io/etcd` docker image is tagged with an version string of the form Each `registry.k8s.io/etcd` docker image is tagged with an version string of the form
`<etcd-version>-<image-revision>`, e.g. `3.0.17-0`. The etcd version is the `<etcd-version>-<image-revision>`, e.g. `3.0.17-0`. The etcd version is the
SemVer of latest etcd version available in the image. The image revision SemVer of latest etcd version available in the image. The image revision
distinguishes between docker images with the same lastest etcd version but distinguishes between docker images with the same lastest etcd version but
changes (bug fixes and backward compatible improvements) to the migration changes (bug fixes and backward compatible improvements) to the migration
utility bundled with the image. utility bundled with the image.
In addition to the latest etcd version, each `k8s.gcr.io/etcd` image contains In addition to the latest etcd version, each `registry.k8s.io/etcd` image contains
etcd and etcdctl binaries for older versions of etcd. These are used by the etcd and etcdctl binaries for older versions of etcd. These are used by the
migration operator utility when performing downgrades and multi-step upgrades, migration operator utility when performing downgrades and multi-step upgrades,
but can also be used as the etcd target version. but can also be used as the etcd target version.
@ -41,7 +41,7 @@ Downgrades to the previous minor version of the 3.x series is supported.
By default, `migrate` will write data directory files with default permissions By default, `migrate` will write data directory files with default permissions
according to the umask it is run with. When run in the published according to the umask it is run with. When run in the published
`k8s.gcr.io/etcd` images the default umask is 0022 which will result in 0755 `registry.k8s.io/etcd` images the default umask is 0022 which will result in 0755
directory permissions and 0644 file permissions. directory permissions and 0644 file permissions.
#### Cross building #### Cross building

2
cluster/images/kubemark/Dockerfile
View File

@ -19,6 +19,6 @@
# See https://console.cloud.google.com/gcr/images/k8s-staging-build-image/global/go-runner # See https://console.cloud.google.com/gcr/images/k8s-staging-build-image/global/go-runner
# for a list of available versions. This base image should be updated # for a list of available versions. This base image should be updated
# periodically. # periodically.
FROM k8s.gcr.io/build-image/go-runner:v2.3.1-go1.17.2-bullseye.0 FROM registry.k8s.io/build-image/go-runner:v2.3.1-go1.17.2-bullseye.0
COPY kubemark /kubemark COPY kubemark /kubemark

4
cmd/kubeadm/app/apis/kubeadm/types.go
View File

@ -116,8 +116,8 @@ type ClusterConfiguration struct {
CertificatesDir string CertificatesDir string
// ImageRepository sets the container registry to pull images from. // 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/`) // If empty, `registry.k8s.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`)
// `gcr.io/k8s-staging-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 `registry.k8s.io`
// will be used for all the other images. // will be used for all the other images.
ImageRepository string ImageRepository string

3
cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go
View File

@ -40,7 +40,8 @@ const (
// DefaultCertificatesDir defines default certificate directory // DefaultCertificatesDir defines default certificate directory
DefaultCertificatesDir = "/etc/kubernetes/pki" DefaultCertificatesDir = "/etc/kubernetes/pki"
// DefaultImageRepository defines default image registry // DefaultImageRepository defines default image registry
DefaultImageRepository = "k8s.gcr.io" // (previously this defaulted to k8s.gcr.io)
DefaultImageRepository = "registry.k8s.io"
// DefaultManifestsDir defines default manifests directory // DefaultManifestsDir defines default manifests directory
DefaultManifestsDir = "/etc/kubernetes/manifests" DefaultManifestsDir = "/etc/kubernetes/manifests"
// DefaultClusterName defines the default cluster name // DefaultClusterName defines the default cluster name

4
cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go
View File

@ -188,7 +188,7 @@ limitations under the License.
// etcd: // etcd:
// # one of local or external // # one of local or external
// local: // local:
// imageRepository: "k8s.gcr.io" // imageRepository: "registry.k8s.io"
// imageTag: "3.2.24" // imageTag: "3.2.24"
// dataDir: "/var/lib/etcd" // dataDir: "/var/lib/etcd"
// extraArgs: // extraArgs:
@ -242,7 +242,7 @@ limitations under the License.
// readOnly: false // readOnly: false
// pathType: File // pathType: File
// certificatesDir: "/etc/kubernetes/pki" // certificatesDir: "/etc/kubernetes/pki"
// imageRepository: "k8s.gcr.io" // imageRepository: "registry.k8s.io"
// useHyperKubeImage: false // useHyperKubeImage: false
// clusterName: "example-cluster" // clusterName: "example-cluster"
// --- // ---

4
cmd/kubeadm/app/apis/kubeadm/v1beta2/types.go
View File

@ -96,8 +96,8 @@ type ClusterConfiguration struct {
CertificatesDir string `json:"certificatesDir,omitempty"` CertificatesDir string `json:"certificatesDir,omitempty"`
// ImageRepository sets the container registry to pull images from. // 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/`) // If empty, `registry.k8s.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`)
// `gcr.io/k8s-staging-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 `registry.k8s.io`
// will be used for all the other images. // will be used for all the other images.
ImageRepository string `json:"imageRepository,omitempty"` ImageRepository string `json:"imageRepository,omitempty"`

3
cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go
View File

@ -42,7 +42,8 @@ const (
// DefaultCertificatesDir defines default certificate directory // DefaultCertificatesDir defines default certificate directory
DefaultCertificatesDir = "/etc/kubernetes/pki" DefaultCertificatesDir = "/etc/kubernetes/pki"
// DefaultImageRepository defines default image registry // DefaultImageRepository defines default image registry
DefaultImageRepository = "k8s.gcr.io" // (previously this defaulted to k8s.gcr.io)
DefaultImageRepository = "registry.k8s.io"
// DefaultManifestsDir defines default manifests directory // DefaultManifestsDir defines default manifests directory
DefaultManifestsDir = "/etc/kubernetes/manifests" DefaultManifestsDir = "/etc/kubernetes/manifests"
// DefaultClusterName defines the default cluster name // DefaultClusterName defines the default cluster name

4
cmd/kubeadm/app/apis/kubeadm/v1beta3/doc.go
View File

@ -195,7 +195,7 @@ limitations under the License.
// etcd: // etcd:
// # one of local or external // # one of local or external
// local: // local:
// imageRepository: "k8s.gcr.io" // imageRepository: "registry.k8s.io"
// imageTag: "3.2.24" // imageTag: "3.2.24"
// dataDir: "/var/lib/etcd" // dataDir: "/var/lib/etcd"
// extraArgs: // extraArgs:
@ -249,7 +249,7 @@ limitations under the License.
// readOnly: false // readOnly: false
// pathType: File // pathType: File
// certificatesDir: "/etc/kubernetes/pki" // certificatesDir: "/etc/kubernetes/pki"
// imageRepository: "k8s.gcr.io" // imageRepository: "registry.k8s.io"
// clusterName: "example-cluster" // clusterName: "example-cluster"
// --- // ---
// apiVersion: kubelet.config.k8s.io/v1beta1 // apiVersion: kubelet.config.k8s.io/v1beta1

4
cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go
View File

@ -122,8 +122,8 @@ type ClusterConfiguration struct {
CertificatesDir string `json:"certificatesDir,omitempty"` CertificatesDir string `json:"certificatesDir,omitempty"`
// ImageRepository sets the container registry to pull images from. // 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/`) // If empty, `registry.k8s.io` will be used by default; in case of kubernetes version is a CI build (kubernetes version starts with `ci/`)
// `gcr.io/k8s-staging-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 `registry.k8s.io`
// will be used for all the other images. // will be used for all the other images.
// +optional // +optional
ImageRepository string `json:"imageRepository,omitempty"` ImageRepository string `json:"imageRepository,omitempty"`

60
cmd/kubeadm/app/cmd/config_test.go
View File

@ -235,13 +235,13 @@ func TestConfigImagesListOutput(t *testing.T) {
KubernetesVersion: dummyKubernetesVersionStr, KubernetesVersion: dummyKubernetesVersionStr,
}, },
outputFormat: "text", outputFormat: "text",
expectedOutput: `k8s.gcr.io/kube-apiserver:{{.KubeVersion}} expectedOutput: `registry.k8s.io/kube-apiserver:{{.KubeVersion}}
k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} registry.k8s.io/kube-controller-manager:{{.KubeVersion}}
k8s.gcr.io/kube-scheduler:{{.KubeVersion}} registry.k8s.io/kube-scheduler:{{.KubeVersion}}
k8s.gcr.io/kube-proxy:{{.KubeVersion}} registry.k8s.io/kube-proxy:{{.KubeVersion}}
k8s.gcr.io/pause:{{.PauseVersion}} registry.k8s.io/pause:{{.PauseVersion}}
k8s.gcr.io/etcd:{{.EtcdVersion}} registry.k8s.io/etcd:{{.EtcdVersion}}
k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}}
`, `,
}, },
{ {
@ -254,13 +254,13 @@ k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}
"kind": "Images", "kind": "Images",
"apiVersion": "output.kubeadm.k8s.io/v1alpha2", "apiVersion": "output.kubeadm.k8s.io/v1alpha2",
"images": [ "images": [
"k8s.gcr.io/kube-apiserver:{{.KubeVersion}}", "registry.k8s.io/kube-apiserver:{{.KubeVersion}}",
"k8s.gcr.io/kube-controller-manager:{{.KubeVersion}}", "registry.k8s.io/kube-controller-manager:{{.KubeVersion}}",
"k8s.gcr.io/kube-scheduler:{{.KubeVersion}}", "registry.k8s.io/kube-scheduler:{{.KubeVersion}}",
"k8s.gcr.io/kube-proxy:{{.KubeVersion}}", "registry.k8s.io/kube-proxy:{{.KubeVersion}}",
"k8s.gcr.io/pause:{{.PauseVersion}}", "registry.k8s.io/pause:{{.PauseVersion}}",
"k8s.gcr.io/etcd:{{.EtcdVersion}}", "registry.k8s.io/etcd:{{.EtcdVersion}}",
"k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}" "registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}}"
] ]
} }
`, `,
@ -273,13 +273,13 @@ k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}
outputFormat: "yaml", outputFormat: "yaml",
expectedOutput: `apiVersion: output.kubeadm.k8s.io/v1alpha2 expectedOutput: `apiVersion: output.kubeadm.k8s.io/v1alpha2
images: images:
- k8s.gcr.io/kube-apiserver:{{.KubeVersion}} - registry.k8s.io/kube-apiserver:{{.KubeVersion}}
- k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} - registry.k8s.io/kube-controller-manager:{{.KubeVersion}}
- k8s.gcr.io/kube-scheduler:{{.KubeVersion}} - registry.k8s.io/kube-scheduler:{{.KubeVersion}}
- k8s.gcr.io/kube-proxy:{{.KubeVersion}} - registry.k8s.io/kube-proxy:{{.KubeVersion}}
- k8s.gcr.io/pause:{{.PauseVersion}} - registry.k8s.io/pause:{{.PauseVersion}}
- k8s.gcr.io/etcd:{{.EtcdVersion}} - registry.k8s.io/etcd:{{.EtcdVersion}}
- k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} - registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}}
kind: Images kind: Images
`, `,
}, },
@ -289,13 +289,13 @@ kind: Images
KubernetesVersion: dummyKubernetesVersionStr, KubernetesVersion: dummyKubernetesVersionStr,
}, },
outputFormat: `go-template={{range .images}}{{.}}{{"\n"}}{{end}}`, outputFormat: `go-template={{range .images}}{{.}}{{"\n"}}{{end}}`,
expectedOutput: `k8s.gcr.io/kube-apiserver:{{.KubeVersion}} expectedOutput: `registry.k8s.io/kube-apiserver:{{.KubeVersion}}
k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} registry.k8s.io/kube-controller-manager:{{.KubeVersion}}
k8s.gcr.io/kube-scheduler:{{.KubeVersion}} registry.k8s.io/kube-scheduler:{{.KubeVersion}}
k8s.gcr.io/kube-proxy:{{.KubeVersion}} registry.k8s.io/kube-proxy:{{.KubeVersion}}
k8s.gcr.io/pause:{{.PauseVersion}} registry.k8s.io/pause:{{.PauseVersion}}
k8s.gcr.io/etcd:{{.EtcdVersion}} registry.k8s.io/etcd:{{.EtcdVersion}}
k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}}
`, `,
}, },
{ {
@ -304,8 +304,8 @@ k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}}
KubernetesVersion: dummyKubernetesVersionStr, KubernetesVersion: dummyKubernetesVersionStr,
}, },
outputFormat: `jsonpath={range.images[*]}{@} {end}`, outputFormat: `jsonpath={range.images[*]}{@} {end}`,
expectedOutput: "k8s.gcr.io/kube-apiserver:{{.KubeVersion}} k8s.gcr.io/kube-controller-manager:{{.KubeVersion}} k8s.gcr.io/kube-scheduler:{{.KubeVersion}} " + expectedOutput: "registry.k8s.io/kube-apiserver:{{.KubeVersion}} registry.k8s.io/kube-controller-manager:{{.KubeVersion}} registry.k8s.io/kube-scheduler:{{.KubeVersion}} " +
"k8s.gcr.io/kube-proxy:{{.KubeVersion}} k8s.gcr.io/pause:{{.PauseVersion}} k8s.gcr.io/etcd:{{.EtcdVersion}} k8s.gcr.io/coredns/coredns:{{.CoreDNSVersion}} ", "registry.k8s.io/kube-proxy:{{.KubeVersion}} registry.k8s.io/pause:{{.PauseVersion}} registry.k8s.io/etcd:{{.EtcdVersion}} registry.k8s.io/coredns/coredns:{{.CoreDNSVersion}} ",
}, },
} }

4
cmd/kubeadm/app/componentconfigs/fakeconfig_test.go
View File

@ -218,7 +218,7 @@ var (
etcd: etcd:
local: local:
dataDir: /var/lib/etcd dataDir: /var/lib/etcd
imageRepository: k8s.gcr.io imageRepository: registry.k8s.io
kind: ClusterConfiguration kind: ClusterConfiguration
kubernetesVersion: 1.2.3 kubernetesVersion: 1.2.3
networking: networking:
@ -234,7 +234,7 @@ var (
ClusterName: "LeCluster", ClusterName: "LeCluster",
KubernetesVersion: "1.2.3", KubernetesVersion: "1.2.3",
CertificatesDir: "/etc/kubernetes/pki", CertificatesDir: "/etc/kubernetes/pki",
ImageRepository: "k8s.gcr.io", ImageRepository: "registry.k8s.io",
Networking: kubeadmapiv1.Networking{ Networking: kubeadmapiv1.Networking{
DNSDomain: "cluster.local", DNSDomain: "cluster.local",
ServiceSubnet: "10.96.0.0/12", ServiceSubnet: "10.96.0.0/12",

2
cmd/kubeadm/app/images/images.go
View File

@ -48,7 +48,7 @@ func GetDNSImage(cfg *kubeadmapi.ClusterConfiguration) string {
if cfg.DNS.ImageRepository != "" { if cfg.DNS.ImageRepository != "" {
dnsImageRepository = cfg.DNS.ImageRepository dnsImageRepository = cfg.DNS.ImageRepository
} }
// Handle the renaming of the official image from "k8s.gcr.io/coredns" to "k8s.gcr.io/coredns/coredns // Handle the renaming of the official image from "registry.k8s.io/coredns" to "registry.k8s.io/coredns/coredns
if dnsImageRepository == kubeadmapiv1beta2.DefaultImageRepository { if dnsImageRepository == kubeadmapiv1beta2.DefaultImageRepository {
dnsImageRepository = fmt.Sprintf("%s/coredns", dnsImageRepository) dnsImageRepository = fmt.Sprintf("%s/coredns", dnsImageRepository)
} }

2
cmd/kubeadm/app/images/images_test.go
View File

@ -29,7 +29,7 @@ import (
const ( const (
testversion = "v10.1.2-alpha.1.100+0123456789abcdef+SOMETHING" testversion = "v10.1.2-alpha.1.100+0123456789abcdef+SOMETHING"
expected = "v10.1.2-alpha.1.100_0123456789abcdef_SOMETHING" expected = "v10.1.2-alpha.1.100_0123456789abcdef_SOMETHING"
gcrPrefix = "k8s.gcr.io" gcrPrefix = "registry.k8s.io"
) )
func TestGetGenericImage(t *testing.T) { func TestGetGenericImage(t *testing.T) {

4
cmd/kubeadm/app/phases/kubelet/flags_test.go
View File

@ -77,12 +77,12 @@ func TestBuildKubeletArgMap(t *testing.T) {
nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{ nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
CRISocket: "unix:///var/run/containerd/containerd.sock", CRISocket: "unix:///var/run/containerd/containerd.sock",
}, },
pauseImage: "k8s.gcr.io/pause:3.7", pauseImage: "registry.k8s.io/pause:3.7",
}, },
expected: map[string]string{ expected: map[string]string{
"container-runtime": "remote", "container-runtime": "remote",
"container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock", "container-runtime-endpoint": "unix:///var/run/containerd/containerd.sock",
"pod-infra-container-image": "k8s.gcr.io/pause:3.7", "pod-infra-container-image": "registry.k8s.io/pause:3.7",
}, },
}, },
} }

2
cmd/kubeadm/app/phases/upgrade/compute_test.go
View File

@ -83,7 +83,7 @@ metadata:
spec: spec:
containers: containers:
- name: etcd - name: etcd
image: k8s.gcr.io/etcd:` + fakeCurrentEtcdVersion image: registry.k8s.io/etcd:` + fakeCurrentEtcdVersion
func getEtcdVersion(v *versionutil.Version) string { func getEtcdVersion(v *versionutil.Version) string {
etcdVer, _, _ := constants.EtcdSupportedVersion(constants.SupportedEtcdVersion, v.String()) etcdVer, _, _ := constants.EtcdSupportedVersion(constants.SupportedEtcdVersion, v.String())

4
cmd/kubeadm/app/phases/upgrade/staticpods_test.go
View File

@ -80,7 +80,7 @@ etcd:
local: local:
dataDir: %%s dataDir: %%s
image: "" image: ""
imageRepository: k8s.gcr.io imageRepository: registry.k8s.io
kubernetesVersion: %%s kubernetesVersion: %%s
networking: networking:
dnsDomain: cluster.local dnsDomain: cluster.local
@ -997,7 +997,7 @@ metadata:
spec: spec:
containers: containers:
- name: etcd - name: etcd
image: k8s.gcr.io/etcd:` + expectedEtcdVersion image: registry.k8s.io/etcd:` + expectedEtcdVersion
manifestsDir, err := os.MkdirTemp("", "GetEtcdImageTagFromStaticPod-test-manifests") manifestsDir, err := os.MkdirTemp("", "GetEtcdImageTagFromStaticPod-test-manifests")
if err != nil { if err != nil {

8
cmd/kubeadm/app/util/template_test.go
View File

@ -22,8 +22,8 @@ import (
const ( const (
validTmpl = "image: {{ .ImageRepository }}/pause:3.7" validTmpl = "image: {{ .ImageRepository }}/pause:3.7"
validTmplOut = "image: k8s.gcr.io/pause:3.7" validTmplOut = "image: registry.k8s.io/pause:3.7"
doNothing = "image: k8s.gcr.io/pause:3.7" doNothing = "image: registry.k8s.io/pause:3.7"
invalidTmpl1 = "{{ .baz }/d}" invalidTmpl1 = "{{ .baz }/d}"
invalidTmpl2 = "{{ !foobar }}" invalidTmpl2 = "{{ !foobar }}"
) )
@ -40,7 +40,7 @@ func TestParseTemplate(t *testing.T) {
name: "should parse a valid template and set the right values", name: "should parse a valid template and set the right values",
template: validTmpl, template: validTmpl,
data: struct{ ImageRepository, Arch string }{ data: struct{ ImageRepository, Arch string }{
ImageRepository: "k8s.gcr.io", ImageRepository: "registry.k8s.io",
Arch: "amd64", Arch: "amd64",
}, },
output: validTmplOut, output: validTmplOut,
@ -50,7 +50,7 @@ func TestParseTemplate(t *testing.T) {
name: "should noop if there aren't any {{ .foo }} present", name: "should noop if there aren't any {{ .foo }} present",
template: doNothing, template: doNothing,
data: struct{ ImageRepository, Arch string }{ data: struct{ ImageRepository, Arch string }{
ImageRepository: "k8s.gcr.io", ImageRepository: "registry.k8s.io",
Arch: "amd64", Arch: "amd64",
}, },
output: doNothing, output: doNothing,

2
cmd/kubelet/app/options/container_runtime.go
View File

@ -23,7 +23,7 @@ import (
const ( const (
// When these values are updated, also update test/utils/image/manifest.go // When these values are updated, also update test/utils/image/manifest.go
defaultPodSandboxImageName = "k8s.gcr.io/pause" defaultPodSandboxImageName = "registry.k8s.io/pause"
defaultPodSandboxImageVersion = "3.7" defaultPodSandboxImageVersion = "3.7"
) )

2
hack/print-workspace-status.sh
View File

@ -43,7 +43,7 @@ STABLE_BUILD_SCM_REVISION ${KUBE_GIT_VERSION-}
STABLE_BUILD_MAJOR_VERSION ${KUBE_GIT_MAJOR-} STABLE_BUILD_MAJOR_VERSION ${KUBE_GIT_MAJOR-}
STABLE_BUILD_MINOR_VERSION ${KUBE_GIT_MINOR-} STABLE_BUILD_MINOR_VERSION ${KUBE_GIT_MINOR-}
STABLE_DOCKER_TAG ${KUBE_GIT_VERSION/+/_} STABLE_DOCKER_TAG ${KUBE_GIT_VERSION/+/_}
STABLE_DOCKER_REGISTRY ${KUBE_DOCKER_REGISTRY:-k8s.gcr.io} STABLE_DOCKER_REGISTRY ${KUBE_DOCKER_REGISTRY:-registry.k8s.io}
STABLE_DOCKER_PUSH_REGISTRY ${KUBE_DOCKER_PUSH_REGISTRY:-${KUBE_DOCKER_REGISTRY:-staging-k8s.gcr.io}} STABLE_DOCKER_PUSH_REGISTRY ${KUBE_DOCKER_PUSH_REGISTRY:-${KUBE_DOCKER_REGISTRY:-staging-k8s.gcr.io}}
gitCommit ${KUBE_GIT_COMMIT-} gitCommit ${KUBE_GIT_COMMIT-}
gitTreeState ${KUBE_GIT_TREE_STATE-} gitTreeState ${KUBE_GIT_TREE_STATE-}

2
hack/testdata/deployment-label-change1.yaml vendored
View File

@ -16,6 +16,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:test-cmd image: registry.k8s.io/nginx:test-cmd
ports: ports:
- containerPort: 80 - containerPort: 80

2
hack/testdata/deployment-label-change2.yaml vendored
View File

@ -17,6 +17,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:test-cmd image: registry.k8s.io/nginx:test-cmd
ports: ports:
- containerPort: 80 - containerPort: 80

2
hack/testdata/deployment-label-change3.yaml vendored
View File

@ -17,6 +17,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:test-cmd image: registry.k8s.io/nginx:test-cmd
ports: ports:
- containerPort: 80 - containerPort: 80

4
hack/testdata/deployment-multicontainer-resources.yaml vendored
View File

@ -16,9 +16,9 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:test-cmd image: registry.k8s.io/nginx:test-cmd
ports: ports:
- containerPort: 80 - containerPort: 80
- name: perl - name: perl
image: k8s.gcr.io/perl image: registry.k8s.io/perl
terminationGracePeriodSeconds: 0 terminationGracePeriodSeconds: 0

4
hack/testdata/deployment-multicontainer.yaml vendored
View File

@ -16,8 +16,8 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:test-cmd image: registry.k8s.io/nginx:test-cmd
ports: ports:
- containerPort: 80 - containerPort: 80
- name: perl - name: perl
image: k8s.gcr.io/perl image: registry.k8s.io/perl

2
hack/testdata/deployment-revision1.yaml vendored
View File

@ -16,6 +16,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:test-cmd image: registry.k8s.io/nginx:test-cmd
ports: ports:
- containerPort: 80 - containerPort: 80

2
hack/testdata/deployment-revision2.yaml vendored
View File

@ -16,6 +16,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:1.7.9 image: registry.k8s.io/nginx:1.7.9
ports: ports:
- containerPort: 80 - containerPort: 80

2
hack/testdata/filter/pod-apply-selector.yaml vendored
View File

@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7

2
hack/testdata/filter/pod-dont-apply.yaml vendored
View File

@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7

2
hack/testdata/multi-resource-1.yaml vendored
View File

@ -11,7 +11,7 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7
--- ---
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace

6
hack/testdata/multi-resource-3.yaml vendored
View File

@ -8,7 +8,7 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7
--- ---
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
@ -17,7 +17,7 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7
--- ---
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
@ -26,5 +26,5 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7

2
hack/testdata/multi-resource-json-modify.json vendored
View File

@ -43,7 +43,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "k8s.gcr.io/pause:3.7", "image": "registry.k8s.io/pause:3.7",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

2
hack/testdata/multi-resource-json.json vendored
View File

@ -41,7 +41,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "k8s.gcr.io/pause:3.7", "image": "registry.k8s.io/pause:3.7",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

2
hack/testdata/multi-resource-list-modify.json vendored
View File

@ -47,7 +47,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "k8s.gcr.io/pause:3.7", "image": "registry.k8s.io/pause:3.7",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

2
hack/testdata/multi-resource-list.json vendored
View File

@ -45,7 +45,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "k8s.gcr.io/pause:3.7", "image": "registry.k8s.io/pause:3.7",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

4
hack/testdata/multi-resource-rclist-modify.json vendored
View File

@ -26,7 +26,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "k8s.gcr.io/pause:3.7", "image": "registry.k8s.io/pause:3.7",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"
@ -60,7 +60,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "k8s.gcr.io/pause:3.7", "image": "registry.k8s.io/pause:3.7",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

4
hack/testdata/multi-resource-rclist.json vendored
View File

@ -26,7 +26,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "k8s.gcr.io/pause:3.7", "image": "registry.k8s.io/pause:3.7",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"
@ -60,7 +60,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "k8s.gcr.io/pause:3.7", "image": "registry.k8s.io/pause:3.7",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

2
hack/testdata/multi-resource-yaml-modify.yaml vendored
View File

@ -29,7 +29,7 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7
ports: ports:
- containerPort: 9949 - containerPort: 9949
protocol: TCP protocol: TCP

2
hack/testdata/multi-resource-yaml.yaml vendored
View File

@ -27,7 +27,7 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7
ports: ports:
- containerPort: 9949 - containerPort: 9949
protocol: TCP protocol: TCP

2
hack/testdata/null-propagation/deployment-l1.yaml vendored
View File

@ -15,4 +15,4 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:1.7.9 image: registry.k8s.io/nginx:1.7.9

2
hack/testdata/null-propagation/deployment-l2.yaml vendored
View File

@ -14,5 +14,5 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:1.7.9 image: registry.k8s.io/nginx:1.7.9
terminationMessagePolicy: null terminationMessagePolicy: null

2
hack/testdata/pod-apply.yaml vendored
View File

@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7

2
hack/testdata/pod-changed.yaml vendored
View File

@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.4 image: registry.k8s.io/pause:3.4

2
hack/testdata/pod-with-api-env.yaml vendored
View File

@ -5,7 +5,7 @@ metadata:
spec: spec:
containers: containers:
- name: test-container - name: test-container
image: k8s.gcr.io/busybox image: registry.k8s.io/busybox
command: [ "/bin/sh", "-c", "env" ] command: [ "/bin/sh", "-c", "env" ]
env: env:
- name: TEST_CMD_1 - name: TEST_CMD_1

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

@ -8,5 +8,5 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-serve-hostname - name: kubernetes-serve-hostname
image: k8s.gcr.io/e2e-test-images/agnhost:2.32 image: registry.k8s.io/e2e-test-images/agnhost:2.32
command: ["/agnhost", "serve-hostname"] command: ["/agnhost", "serve-hostname"]

2
hack/testdata/pod-with-precision.json vendored
View File

@ -9,7 +9,7 @@
"containers": [ "containers": [
{ {
"name": "kubernetes-pause", "name": "kubernetes-pause",
"image": "k8s.gcr.io/pause:3.7" "image": "registry.k8s.io/pause:3.7"
} }
], ],
"restartPolicy": "Never", "restartPolicy": "Never",

2
hack/testdata/pod.yaml vendored
View File

@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7

2
hack/testdata/prune/a.yaml vendored
View File

@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7

2
hack/testdata/prune/b.yaml vendored
View File

@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7

2
hack/testdata/recursive/deployment/deployment/nginx-broken.yaml vendored
View File

@ -16,6 +16,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:1.7.9 image: registry.k8s.io/nginx:1.7.9
ports: ports:
- containerPort: 80 - containerPort: 80

2
hack/testdata/recursive/deployment/deployment/nginx.yaml vendored
View File

@ -16,6 +16,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:1.7.9 image: registry.k8s.io/nginx:1.7.9
ports: ports:
- containerPort: 80 - containerPort: 80

2
hack/testdata/recursive/deployment/nginx.yaml vendored
View File

@ -16,6 +16,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx:1.7.9 image: registry.k8s.io/nginx:1.7.9
ports: ports:
- containerPort: 80 - containerPort: 80

4
hack/testdata/rollingupdate-daemonset-rv2.yaml vendored
View File

@ -29,6 +29,6 @@ spec:
namespaces: [] namespaces: []
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:latest image: registry.k8s.io/pause:latest
- name: app - name: app
image: k8s.gcr.io/nginx:test-cmd image: registry.k8s.io/nginx:test-cmd

2
hack/testdata/rollingupdate-daemonset.yaml vendored
View File

@ -29,4 +29,4 @@ spec:
namespaces: [] namespaces: []
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: k8s.gcr.io/pause:2.0 image: registry.k8s.io/pause:2.0

4
hack/testdata/rollingupdate-statefulset-rv2.yaml vendored
View File

@ -20,7 +20,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx-slim:0.8 image: registry.k8s.io/nginx-slim:0.8
ports: ports:
- containerPort: 80 - containerPort: 80
name: web name: web
@ -29,7 +29,7 @@ spec:
- -c - -c
- 'while true; do sleep 1; done' - 'while true; do sleep 1; done'
- name: pause - name: pause
image: k8s.gcr.io/pause:2.0 image: registry.k8s.io/pause:2.0
ports: ports:
- containerPort: 81 - containerPort: 81
name: web-2 name: web-2

2
hack/testdata/rollingupdate-statefulset.yaml vendored
View File

@ -20,7 +20,7 @@ spec:
terminationGracePeriodSeconds: 5 terminationGracePeriodSeconds: 5
containers: containers:
- name: nginx - name: nginx
image: k8s.gcr.io/nginx-slim:0.7 image: registry.k8s.io/nginx-slim:0.7
ports: ports:
- containerPort: 80 - containerPort: 80
name: web name: web

2
hack/testdata/sorted-pods/sorted-pod1.yaml vendored
View File

@ -8,7 +8,7 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause2 - name: kubernetes-pause2
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7
resources: resources:
requests: requests:
memory: "64Mi" memory: "64Mi"

2
hack/testdata/sorted-pods/sorted-pod2.yaml vendored
View File

@ -8,7 +8,7 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause1 - name: kubernetes-pause1
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7
resources: resources:
requests: requests:
memory: "1G" memory: "1G"

2
hack/testdata/sorted-pods/sorted-pod3.yaml vendored
View File

@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause3 - name: kubernetes-pause3
image: k8s.gcr.io/pause:3.7 image: registry.k8s.io/pause:3.7

Some files were not shown because too many files have changed in this diff Show More