Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-1.25] Switch from k8s.gcr.io to registry.k8s.io #2407

Merged
merged 1 commit into from
Nov 15, 2022
Merged

[Backport release-1.25] Switch from k8s.gcr.io to registry.k8s.io #2407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/airgap/listimages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
s.Equal("custom-repository/my-custom-konnectivity-image:v0.0.1", a.Konnectivity.URI())
s.Equal("1.0.0", a.CoreDNS.Version)
s.Equal("custom.io/coredns/coredns", a.CoreDNS.Image)
s.Equal("k8s.gcr.io/metrics-server/metrics-server", a.MetricsServer.Image)
s.Equal("registry.k8s.io/metrics-server/metrics-server", a.MetricsServer.Image)
}

func TestCLITestSuite(t *testing.T) {
Expand Down
20 changes: 10 additions & 10 deletions docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@ spec:
kubeSchedulerUser: kube-scheduler
images:
konnectivity:
image: k8s.gcr.io/kas-network-proxy/proxy-agent
version: v0.0.25
image: quay.io/k0sproject/apiserver-network-proxy-agent
version: 0.0.32-k0s1
metricsserver:
image: k8s.gcr.io/metrics-server/metrics-server
version: v0.5.0
image: registry.k8s.io/metrics-server/metrics-server
version: v0.6.1
kubeproxy:
image: k8s.gcr.io/kube-proxy
image: registry.k8s.io/kube-proxy
version: v1.25.4
coredns:
image: k8s.gcr.io/coredns/coredns
version: v1.7.0
image: docker.io/coredns/coredns
version: 1.9.4
jnummelin marked this conversation as resolved.
Show resolved Hide resolved
calico:
cni:
image: docker.io/calico/cni
Expand All @@ -108,10 +108,10 @@ spec:
kuberouter:
cni:
image: docker.io/cloudnativelabs/kube-router
version: v1.2.1
version: v1.5.1
cniInstaller:
image: quay.io/k0sproject/cni-node
version: 0.1.0
version: 1.1.1-k0s.0
default_pull_policy: IfNotPresent
konnectivity:
agentPort: 8132
Expand Down Expand Up @@ -313,7 +313,7 @@ images:
image: calico/kube-controllers
version: v3.16.2
metricsserver:
image: k8s.gcr.io/metrics-server/metrics-server
image: registry.k8s.io/metrics-server/metrics-server
version: v0.5.0
```

Expand Down
8 changes: 4 additions & 4 deletions docs/docker-shim.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ docker ps --format "table {{.ID}}\t{{.Names}}\t{{.State}}\t{{.Status}}\t{{.Image
CONTAINER ID NAMES STATE STATUS IMAGE
1b9b4624ddfd k8s_konnectivity-agent_konnectivity-agent-5jpd7_kube-system_1b3101ea-baeb-4a22-99a2-088d7ca5be85_1 running Up 51 minutes quay.io/k0sproject/apiserver-network-proxy-agent
414758a8a951 k8s_kube-router_kube-router-qlkgg_kube-system_9a1b67bf-5347-4acd-98ac-f9a67f2db730_1 running Up 51 minutes 3a67679337a5
b81960bb304c k8s_kube-proxy_kube-proxy-tv95n_kube-system_164dc9f8-f47c-4f6c-acb7-ede5dbcd63cd_1 running Up 51 minutes k8s.gcr.io/kube-proxy
fb888cbc5ae0 k8s_POD_kube-router-qlkgg_kube-system_9a1b67bf-5347-4acd-98ac-f9a67f2db730_0 running Up 51 minutes k8s.gcr.io/pause:3.1
382d0a938c9d k8s_POD_konnectivity-agent-5jpd7_kube-system_1b3101ea-baeb-4a22-99a2-088d7ca5be85_0 running Up 51 minutes k8s.gcr.io/pause:3.1
72d4a47b5609 k8s_POD_kube-proxy-tv95n_kube-system_164dc9f8-f47c-4f6c-acb7-ede5dbcd63cd_0 running Up 51 minutes k8s.gcr.io/pause:3.1
b81960bb304c k8s_kube-proxy_kube-proxy-tv95n_kube-system_164dc9f8-f47c-4f6c-acb7-ede5dbcd63cd_1 running Up 51 minutes registry.k8s.io/kube-proxy
fb888cbc5ae0 k8s_POD_kube-router-qlkgg_kube-system_9a1b67bf-5347-4acd-98ac-f9a67f2db730_0 running Up 51 minutes registry.k8s.io/pause:3.1
382d0a938c9d k8s_POD_konnectivity-agent-5jpd7_kube-system_1b3101ea-baeb-4a22-99a2-088d7ca5be85_0 running Up 51 minutes registry.k8s.io/pause:3.1
72d4a47b5609 k8s_POD_kube-proxy-tv95n_kube-system_164dc9f8-f47c-4f6c-acb7-ede5dbcd63cd_0 running Up 51 minutes registry.k8s.io/pause:3.1
```

On the controller, you'll be able to see the worker started with the new docker container runtime:
Expand Down
6 changes: 3 additions & 3 deletions docs/raspberry-pi4.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,9 @@ ubuntu@ubuntu:~$ KUBECONFIG=/path/to/kubeconfig kubectl get nodes,deployments,po
NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME
node/ubuntu Ready <none> 5m1s v1.25.4+k0s 10.152.56.54 <none> Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.6.9

NAMESPACE NAME READY UP-TO-DATE AVAILABLE AGE CONTAINERS IMAGES SELECTOR
kube-system deployment.apps/coredns 1/1 1 1 33m coredns k8s.gcr.io/coredns/coredns:v1.7.0 k8s-app=kube-dns
kube-system deployment.apps/metrics-server 1/1 1 1 33m metrics-server k8s.gcr.io/metrics-server/metrics-server:v0.5.2 k8s-app=metrics-server
NAMESPACE NAME READY UP-TO-DATE AVAILABLE AGE CONTAINERS IMAGES SELECTOR
kube-system deployment.apps/coredns 1/1 1 1 33m coredns registry.k8s.io/coredns/coredns:v1.7.0 k8s-app=kube-dns
kube-system deployment.apps/metrics-server 1/1 1 1 33m metrics-server registry.k8s.io/metrics-server/metrics-server:v0.5.2 k8s-app=metrics-server

NAMESPACE NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES
kube-system pod/coredns-88b745646-pkk5w 1/1 Running 0 33m 10.244.0.5 ubuntu <none> <none>
Expand Down
2 changes: 1 addition & 1 deletion inttest/airgap/airgap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
const etcHosts = `
127.0.0.8 docker.io
127.0.0.8 gcr.io
127.0.0.8 k8s.gcr.io
127.0.0.8 registry.k8s.io
jnummelin marked this conversation as resolved.
Show resolved Hide resolved
127.0.0.8 us.gcr.io
127.0.0.8 quay.io
`
Expand Down
4 changes: 2 additions & 2 deletions inttest/psp/psp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func (s *PSPSuite) TestK0sGetsUp() {
TypeMeta: v1.TypeMeta{Kind: "Pod", APIVersion: "v1"},
ObjectMeta: v1.ObjectMeta{Name: "test-pod-non-privileged"},
Spec: corev1.PodSpec{
Containers: []corev1.Container{{Name: "pause", Image: "k8s.gcr.io/pause"}},
Containers: []corev1.Container{{Name: "pause", Image: "registry.k8s.io/pause"}},
},
}

Expand All @@ -83,7 +83,7 @@ func (s *PSPSuite) TestK0sGetsUp() {
Containers: []corev1.Container{
{
Name: "pause",
Image: "k8s.gcr.io/pause",
Image: "registry.k8s.io/pause",
SecurityContext: &corev1.SecurityContext{
RunAsUser: int64ptr(0),
},
Expand Down
2 changes: 1 addition & 1 deletion pkg/constant/constant_posix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const (
DataDirDefault = "/var/lib/k0s"
KubeletVolumePluginDir = "/usr/libexec/k0s/kubelet-plugins/volume/exec"
KineSocket = "kine/kine.sock:2379"
KubePauseContainerImage = "k8s.gcr.io/pause"
KubePauseContainerImage = "registry.k8s.io/pause"
KubePauseContainerImageVersion = "3.6"
K0sConfigPathDefault = "/etc/k0s/k0s.yaml"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/constant/constant_shared.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ const (
KonnectivityImageVersion = "0.0.32-k0s1"
PushGatewayImage = "quay.io/k0sproject/pushgateway-ttl"
PushGatewayImageVersion = "edge@sha256:7031f6bf6c957e2fdb496161fe3bea0a5bde3de800deeba7b2155187196ecbd9"
MetricsImage = "k8s.gcr.io/metrics-server/metrics-server"
MetricsImage = "registry.k8s.io/metrics-server/metrics-server"
MetricsImageVersion = "v0.6.1"
KubeProxyImage = "k8s.gcr.io/kube-proxy"
KubeProxyImage = "registry.k8s.io/kube-proxy"
KubeProxyImageVersion = "v1.25.4"
CoreDNSImage = "docker.io/coredns/coredns"
CoreDNSImageVersion = "1.9.4"
Expand Down