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
232 changed files with 509 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ TEMP_DIR:=$(shell mktemp -d)
VERSION=v9.1.6
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)

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

@@ -25,7 +25,7 @@ Otherwise it will be omitted.
#### 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
@@ -56,4 +56,4 @@ $ make push ARCH=s390x
# ---> 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:
priorityClassName: system-cluster-critical
containers:
- image: k8s.gcr.io/cpvpa-amd64:v0.8.3
- image: registry.k8s.io/cpvpa-amd64:v0.8.3
name: autoscaler
command:
- /cpvpa

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

@@ -21,7 +21,7 @@ spec:
supplementalGroups: [ 65534 ]
fsGroup: 65534
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
command:
- /cluster-proportional-autoscaler

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

@@ -18,7 +18,7 @@ spec:
spec:
priorityClassName: system-cluster-critical
containers:
- image: k8s.gcr.io/cpvpa-amd64:v0.8.3
- image: registry.k8s.io/cpvpa-amd64:v0.8.3
name: autoscaler
command:
- /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:
# 1. It serves a 404 page at /
# 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:
httpGet:
path: /healthz

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

@@ -36,7 +36,7 @@ spec:
hostPath:
path: /dev
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"]
name: nvidia-gpu-device-plugin
resources:

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

@@ -86,7 +86,7 @@ spec:
kubernetes.io/os: linux
containers:
- 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:
requests:
cpu: "20m"

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

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

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

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

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

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

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

@@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux
containers:
- 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:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
runAsUser: 1001
runAsGroup: 1001
- 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:
httpGet:
path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
- NET_BIND_SERVICE
- SETGID
- 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:
httpGet:
path: /metrics

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

@@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux
containers:
- 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:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
runAsUser: 1001
runAsGroup: 1001
- 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:
httpGet:
path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
- NET_BIND_SERVICE
- SETGID
- 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:
httpGet:
path: /metrics

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

@@ -114,7 +114,7 @@ spec:
kubernetes.io/os: linux
containers:
- 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:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
runAsUser: 1001
runAsGroup: 1001
- 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:
httpGet:
path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
- NET_BIND_SERVICE
- SETGID
- 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:
httpGet:
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.
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
Upstream server configuration.
`__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"
containers:
- 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:
requests:
cpu: 25m

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

@@ -19,7 +19,7 @@ spec:
serviceAccountName: fluentd-gcp-scaler
containers:
- 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:
- /scaler.sh
- --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
containers:
- 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:
- --masq-chain=IP-MASQ
- --nomasq-all-reserved-ranges

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

@@ -43,7 +43,7 @@ spec:
effect: "NoSchedule"
containers:
- 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"]
securityContext:
privileged: true

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

@@ -50,7 +50,7 @@ spec:
kubernetes.io/os: linux
containers:
- 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:
- /metrics-server
- --metric-resolution=30s
@@ -81,7 +81,7 @@ spec:
- mountPath: /tmp
name: tmp-dir
- 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:
limits:
cpu: 100m

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

@@ -47,7 +47,7 @@ spec:
spec:
containers:
- 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:
- "/bin/sh"
- "-c"

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

@@ -22,7 +22,7 @@ spec:
serviceAccount: volume-snapshot-controller
containers:
- 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:
- "--v=5"
- "--metrics-path=/metrics"

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

@@ -27,7 +27,7 @@ spec:
nodeSelector:
kubernetes.io/os: linux
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
command: ["/proxy-agent"]
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.
export WINDOWS_NODEPROBLEMDETECTOR_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\node-problem-detector.kubeconfig"
# 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.
export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/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:-}
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.
export ETCD_IMAGE=${TEST_ETCD_IMAGE:-}
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 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
kube_docker_registry=${KUBE_DOCKER_REGISTRY}
fi
@@ -2057,7 +2057,7 @@ function compute-master-manifest-variables {
CLOUD_CONFIG_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}},"
CLOUD_CONFIG_MOUNT="{\"name\": \"cloudconfigmount\",\"mountPath\": \"/etc/gce.conf\", \"readOnly\": true},"
fi
DOCKER_REGISTRY="k8s.gcr.io"
DOCKER_REGISTRY="registry.k8s.io"
if [[ -n "${KUBE_DOCKER_REGISTRY:-}" ]]; then
DOCKER_REGISTRY="${KUBE_DOCKER_REGISTRY}"
fi
@@ -2989,7 +2989,7 @@ spec:
- name: vol
containers:
- name: pv-recycler
image: k8s.gcr.io/debian-base:v2.0.0
image: registry.k8s.io/debian-base:v2.0.0
command:
- /bin/sh
args:
@@ -3002,7 +3002,7 @@ EOF
# fixup the alternate registry if specified
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
}
@@ -3074,7 +3074,7 @@ oom_score = -999
[plugins."io.containerd.grpc.v1.cri"]
stream_server_address = "127.0.0.1"
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]
bin_dir = "${KUBE_HOME}/bin"
conf_dir = "/etc/cni/net.d"
@@ -3085,10 +3085,10 @@ oom_score = -999
runtime_type = "io.containerd.runc.v2"
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."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
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."k8s.gcr.io"]
endpoint = ["https://registry.k8s.io", "https://k8s.gcr.io",]
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."registry.k8s.io"]
endpoint = ["https://registry.k8s.io", "https://registry.k8s.io",]
EOF
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"
download-or-bust "${manifests_tar_hash}" "${manifests_tar_urls[@]}"
tar xzf "${KUBE_HOME}/${manifests_tar}" -C "${dst_dir}" --overwrite
local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-k8s.gcr.io}"
if [[ "${kube_addon_registry}" != "k8s.gcr.io" ]]; then
local -r kube_addon_registry="${KUBE_ADDON_REGISTRY:-registry.k8s.io}"
if [[ "${kube_addon_registry}" != "registry.k8s.io" ]]; then
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 | \
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
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"
@@ -454,8 +454,8 @@ function try-load-docker-image {
container=${img##*/}
container=${container%.tar}
# 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 '/')
${tag_image_command} "k8s.gcr.io/${container}" "${KUBE_ADDON_REGISTRY}/${container}"
container=$(ctr -n k8s.io images ls | grep "registry.k8s.io/${container}" | awk '{print $1}' | cut -f 2 -d '/')
${tag_image_command} "registry.k8s.io/${container}" "${KUBE_ADDON_REGISTRY}/${container}"
fi
# Re-enable errexit.
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_VOLUME="{\"name\": \"cloudconfigmount\",\"hostPath\": {\"path\": \"/etc/gce.conf\", \"type\": \"FileOrCreate\"}},"
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 ETC_MANIFESTS=${KUBE_HOME}/etc/kubernetes/manifests
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": [
{
"name": "cluster-autoscaler",
"image": "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.0",
"image": "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.0",
"livenessProbe": {
"httpGet": {
"path": "/health-check",

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

@@ -18,7 +18,7 @@
{
"name": "etcd-container",
{{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": {
"requests": {
"cpu": {{ cpulimit }}

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

@@ -20,7 +20,7 @@ spec:
{{ disallow_privilege_escalation}}
{{ 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:
requests:
cpu: 25m

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

@@ -23,7 +23,7 @@ spec:
- all
# When updating version also bump it in:
# - 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:
- /bin/bash
- -c

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

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

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

@@ -7,6 +7,6 @@ spec:
hostNetwork: true
containers:
- 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:
- /etcd-version-monitor

22
cluster/images/etcd/Makefile
View File

@@ -15,7 +15,7 @@
# Build the etcd image
#
# 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
# 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.
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)
ARCH?=amd64
@@ -62,9 +62,9 @@ IMAGE_SUFFIX.linux = $(OS)-$(ARCH)
IMAGE_SUFFIX.windows = $(OS)-$(ARCH)-$(OSVERSION)
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.
REGISTRY?=k8s.gcr.io
REGISTRY?=registry.k8s.io
# Images should be pushed to staging-k8s.gcr.io.
PUSH_REGISTRY?=staging-k8s.gcr.io
@@ -92,19 +92,19 @@ DOCKERFILE.windows = Dockerfile.windows
DOCKERFILE := ${DOCKERFILE.${OS}}
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
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
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
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
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
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) \
/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>`, ...).
# 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
# 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 `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.
build-integration-test-image: build
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
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
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
SemVer of latest etcd version available in the image. The image revision
distinguishes between docker images with the same lastest etcd version but
changes (bug fixes and backward compatible improvements) to the migration
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
migration operator utility when performing downgrades and multi-step upgrades,
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
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.
#### 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
# for a list of available versions. This base image should be updated
# 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