diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md index e6552fa8b3..b4a5b4aaf3 100644 --- a/CHANGELOG-1.0.md +++ b/CHANGELOG-1.0.md @@ -1,5 +1,11 @@ # Changelog 1.0 +## [1.0.11] YYYY-MM-DD + +### Updated + +- [#3346](https://github.com/epiphany-platform/epiphany/issues/3346) - Switch from `k8s.gcr.io` to `registry.k8s.io` + ## [1.0.10] 2023-03-21 ### Fixed diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt index d41ed7d259..294e270772 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.txt @@ -191,13 +191,13 @@ jboss/keycloak:9.0.0 rabbitmq:3.8.9 # K8s upgrade ## v1.14.6 -k8s.gcr.io/kube-apiserver:v1.14.6 -k8s.gcr.io/kube-controller-manager:v1.14.6 -k8s.gcr.io/kube-proxy:v1.14.6 -k8s.gcr.io/kube-scheduler:v1.14.6 -k8s.gcr.io/coredns:1.3.1 -k8s.gcr.io/etcd:3.3.10 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.14.6 +registry.k8s.io/kube-controller-manager:v1.14.6 +registry.k8s.io/kube-proxy:v1.14.6 +registry.k8s.io/kube-scheduler:v1.14.6 +registry.k8s.io/coredns:1.3.1 +registry.k8s.io/etcd:3.3.10 +registry.k8s.io/pause:3.1 coredns/coredns:1.5.0 # Old v1 repos not compatible with Crane. Pulling from ghcr.io/epiphany-platform/flannel as workarround. #quay.io/coreos/flannel:v0.11.0-amd64 @@ -209,29 +209,29 @@ calico/kube-controllers:v3.8.1 calico/node:v3.8.1 calico/pod2daemon-flexvol:v3.8.1 ## v1.15.10 -k8s.gcr.io/kube-apiserver:v1.15.10 -k8s.gcr.io/kube-controller-manager:v1.15.10 -k8s.gcr.io/kube-proxy:v1.15.10 -k8s.gcr.io/kube-scheduler:v1.15.10 -k8s.gcr.io/coredns:1.3.1 -k8s.gcr.io/etcd:3.3.10 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.15.10 +registry.k8s.io/kube-controller-manager:v1.15.10 +registry.k8s.io/kube-proxy:v1.15.10 +registry.k8s.io/kube-scheduler:v1.15.10 +registry.k8s.io/coredns:1.3.1 +registry.k8s.io/etcd:3.3.10 +registry.k8s.io/pause:3.1 ## 1.16.7 -k8s.gcr.io/kube-apiserver:v1.16.7 -k8s.gcr.io/kube-controller-manager:v1.16.7 -k8s.gcr.io/kube-proxy:v1.16.7 -k8s.gcr.io/kube-scheduler:v1.16.7 -k8s.gcr.io/coredns:1.6.2 -k8s.gcr.io/etcd:3.3.15-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.16.7 +registry.k8s.io/kube-controller-manager:v1.16.7 +registry.k8s.io/kube-proxy:v1.16.7 +registry.k8s.io/kube-scheduler:v1.16.7 +registry.k8s.io/coredns:1.6.2 +registry.k8s.io/etcd:3.3.15-0 +registry.k8s.io/pause:3.1 ## v1.17.4 -k8s.gcr.io/kube-apiserver:v1.17.4 -k8s.gcr.io/kube-controller-manager:v1.17.4 -k8s.gcr.io/kube-scheduler:v1.17.4 -k8s.gcr.io/kube-proxy:v1.17.4 -k8s.gcr.io/coredns:1.6.5 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.17.4 +registry.k8s.io/kube-controller-manager:v1.17.4 +registry.k8s.io/kube-scheduler:v1.17.4 +registry.k8s.io/kube-proxy:v1.17.4 +registry.k8s.io/coredns:1.6.5 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.1 # Old v1 repos not compatible with Crane. Pulling from ghcr.io/epiphany-platform/flannel as workarround. #quay.io/coreos/flannel:v0.11.0-amd64 #quay.io/coreos/flannel:v0.11.0 @@ -245,13 +245,13 @@ calico/node:v3.12.0 calico/pod2daemon-flexvol:v3.11.2 calico/pod2daemon-flexvol:v3.12.0 ## v1.17.7 -k8s.gcr.io/kube-apiserver:v1.17.7 -k8s.gcr.io/kube-controller-manager:v1.17.7 -k8s.gcr.io/kube-scheduler:v1.17.7 -k8s.gcr.io/kube-proxy:v1.17.7 -k8s.gcr.io/coredns:1.6.5 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.17.7 +registry.k8s.io/kube-controller-manager:v1.17.7 +registry.k8s.io/kube-scheduler:v1.17.7 +registry.k8s.io/kube-proxy:v1.17.7 +registry.k8s.io/coredns:1.6.5 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.1 quay.io/coreos/flannel:v0.12.0-amd64 quay.io/coreos/flannel:v0.12.0 calico/cni:v3.15.0 @@ -259,13 +259,13 @@ calico/kube-controllers:v3.15.0 calico/node:v3.15.0 calico/pod2daemon-flexvol:v3.15.0 ## v1.18.6 -k8s.gcr.io/kube-apiserver:v1.18.6 -k8s.gcr.io/kube-controller-manager:v1.18.6 -k8s.gcr.io/kube-scheduler:v1.18.6 -k8s.gcr.io/kube-proxy:v1.18.6 -k8s.gcr.io/coredns:1.6.7 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.2 +registry.k8s.io/kube-apiserver:v1.18.6 +registry.k8s.io/kube-controller-manager:v1.18.6 +registry.k8s.io/kube-scheduler:v1.18.6 +registry.k8s.io/kube-proxy:v1.18.6 +registry.k8s.io/coredns:1.6.7 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.2 quay.io/coreos/flannel:v0.12.0-amd64 quay.io/coreos/flannel:v0.12.0 calico/cni:v3.15.0 diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt index e2b156d13d..5722843958 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.txt @@ -187,13 +187,13 @@ jboss/keycloak:9.0.0 rabbitmq:3.8.9 # K8s upgrade ## v1.14.6 -k8s.gcr.io/kube-apiserver:v1.14.6 -k8s.gcr.io/kube-controller-manager:v1.14.6 -k8s.gcr.io/kube-proxy:v1.14.6 -k8s.gcr.io/kube-scheduler:v1.14.6 -k8s.gcr.io/coredns:1.3.1 -k8s.gcr.io/etcd:3.3.10 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.14.6 +registry.k8s.io/kube-controller-manager:v1.14.6 +registry.k8s.io/kube-proxy:v1.14.6 +registry.k8s.io/kube-scheduler:v1.14.6 +registry.k8s.io/coredns:1.3.1 +registry.k8s.io/etcd:3.3.10 +registry.k8s.io/pause:3.1 coredns/coredns:1.5.0 # Old v1 repos not compatible with Crane. Pulling from ghcr.io/epiphany-platform/flannel as workarround. #quay.io/coreos/flannel:v0.11.0-amd64 @@ -205,29 +205,29 @@ calico/kube-controllers:v3.8.1 calico/node:v3.8.1 calico/pod2daemon-flexvol:v3.8.1 ## v1.15.10 -k8s.gcr.io/kube-apiserver:v1.15.10 -k8s.gcr.io/kube-controller-manager:v1.15.10 -k8s.gcr.io/kube-proxy:v1.15.10 -k8s.gcr.io/kube-scheduler:v1.15.10 -k8s.gcr.io/coredns:1.3.1 -k8s.gcr.io/etcd:3.3.10 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.15.10 +registry.k8s.io/kube-controller-manager:v1.15.10 +registry.k8s.io/kube-proxy:v1.15.10 +registry.k8s.io/kube-scheduler:v1.15.10 +registry.k8s.io/coredns:1.3.1 +registry.k8s.io/etcd:3.3.10 +registry.k8s.io/pause:3.1 ## 1.16.7 -k8s.gcr.io/kube-apiserver:v1.16.7 -k8s.gcr.io/kube-controller-manager:v1.16.7 -k8s.gcr.io/kube-proxy:v1.16.7 -k8s.gcr.io/kube-scheduler:v1.16.7 -k8s.gcr.io/coredns:1.6.2 -k8s.gcr.io/etcd:3.3.15-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.16.7 +registry.k8s.io/kube-controller-manager:v1.16.7 +registry.k8s.io/kube-proxy:v1.16.7 +registry.k8s.io/kube-scheduler:v1.16.7 +registry.k8s.io/coredns:1.6.2 +registry.k8s.io/etcd:3.3.15-0 +registry.k8s.io/pause:3.1 ## v1.17.4 -k8s.gcr.io/kube-apiserver:v1.17.4 -k8s.gcr.io/kube-controller-manager:v1.17.4 -k8s.gcr.io/kube-scheduler:v1.17.4 -k8s.gcr.io/kube-proxy:v1.17.4 -k8s.gcr.io/coredns:1.6.5 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.17.4 +registry.k8s.io/kube-controller-manager:v1.17.4 +registry.k8s.io/kube-scheduler:v1.17.4 +registry.k8s.io/kube-proxy:v1.17.4 +registry.k8s.io/coredns:1.6.5 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.1 # Old v1 repos not compatible with Crane. Pulling from ghcr.io/epiphany-platform/flannel as workarround. #quay.io/coreos/flannel:v0.11.0-amd64 #quay.io/coreos/flannel:v0.11.0 @@ -241,13 +241,13 @@ calico/node:v3.12.0 calico/pod2daemon-flexvol:v3.11.2 calico/pod2daemon-flexvol:v3.12.0 ## v1.17.7 -k8s.gcr.io/kube-apiserver:v1.17.7 -k8s.gcr.io/kube-controller-manager:v1.17.7 -k8s.gcr.io/kube-scheduler:v1.17.7 -k8s.gcr.io/kube-proxy:v1.17.7 -k8s.gcr.io/coredns:1.6.5 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.17.7 +registry.k8s.io/kube-controller-manager:v1.17.7 +registry.k8s.io/kube-scheduler:v1.17.7 +registry.k8s.io/kube-proxy:v1.17.7 +registry.k8s.io/coredns:1.6.5 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.1 quay.io/coreos/flannel:v0.12.0-amd64 quay.io/coreos/flannel:v0.12.0 calico/cni:v3.15.0 @@ -255,13 +255,13 @@ calico/kube-controllers:v3.15.0 calico/node:v3.15.0 calico/pod2daemon-flexvol:v3.15.0 ## v1.18.6 -k8s.gcr.io/kube-apiserver:v1.18.6 -k8s.gcr.io/kube-controller-manager:v1.18.6 -k8s.gcr.io/kube-scheduler:v1.18.6 -k8s.gcr.io/kube-proxy:v1.18.6 -k8s.gcr.io/coredns:1.6.7 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.2 +registry.k8s.io/kube-apiserver:v1.18.6 +registry.k8s.io/kube-controller-manager:v1.18.6 +registry.k8s.io/kube-scheduler:v1.18.6 +registry.k8s.io/kube-proxy:v1.18.6 +registry.k8s.io/coredns:1.6.7 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.2 quay.io/coreos/flannel:v0.12.0-amd64 quay.io/coreos/flannel:v0.12.0 calico/cni:v3.15.0 diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt index 15d943213d..5b9f495167 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.txt @@ -244,13 +244,13 @@ jboss/keycloak:9.0.0 rabbitmq:3.8.9 # K8s upgrade ## v1.14.6 -k8s.gcr.io/kube-apiserver:v1.14.6 -k8s.gcr.io/kube-controller-manager:v1.14.6 -k8s.gcr.io/kube-proxy:v1.14.6 -k8s.gcr.io/kube-scheduler:v1.14.6 -k8s.gcr.io/coredns:1.3.1 -k8s.gcr.io/etcd:3.3.10 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.14.6 +registry.k8s.io/kube-controller-manager:v1.14.6 +registry.k8s.io/kube-proxy:v1.14.6 +registry.k8s.io/kube-scheduler:v1.14.6 +registry.k8s.io/coredns:1.3.1 +registry.k8s.io/etcd:3.3.10 +registry.k8s.io/pause:3.1 coredns/coredns:1.5.0 # Old v1 repos not compatible with Crane. Pulling from ghcr.io/epiphany-platform/flannel as workarround. #quay.io/coreos/flannel:v0.11.0-amd64 @@ -262,29 +262,29 @@ calico/kube-controllers:v3.8.1 calico/node:v3.8.1 calico/pod2daemon-flexvol:v3.8.1 ## v1.15.10 -k8s.gcr.io/kube-apiserver:v1.15.10 -k8s.gcr.io/kube-controller-manager:v1.15.10 -k8s.gcr.io/kube-proxy:v1.15.10 -k8s.gcr.io/kube-scheduler:v1.15.10 -k8s.gcr.io/coredns:1.3.1 -k8s.gcr.io/etcd:3.3.10 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.15.10 +registry.k8s.io/kube-controller-manager:v1.15.10 +registry.k8s.io/kube-proxy:v1.15.10 +registry.k8s.io/kube-scheduler:v1.15.10 +registry.k8s.io/coredns:1.3.1 +registry.k8s.io/etcd:3.3.10 +registry.k8s.io/pause:3.1 ## 1.16.7 -k8s.gcr.io/kube-apiserver:v1.16.7 -k8s.gcr.io/kube-controller-manager:v1.16.7 -k8s.gcr.io/kube-proxy:v1.16.7 -k8s.gcr.io/kube-scheduler:v1.16.7 -k8s.gcr.io/coredns:1.6.2 -k8s.gcr.io/etcd:3.3.15-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.16.7 +registry.k8s.io/kube-controller-manager:v1.16.7 +registry.k8s.io/kube-proxy:v1.16.7 +registry.k8s.io/kube-scheduler:v1.16.7 +registry.k8s.io/coredns:1.6.2 +registry.k8s.io/etcd:3.3.15-0 +registry.k8s.io/pause:3.1 ## v1.17.4 -k8s.gcr.io/kube-apiserver:v1.17.4 -k8s.gcr.io/kube-controller-manager:v1.17.4 -k8s.gcr.io/kube-scheduler:v1.17.4 -k8s.gcr.io/kube-proxy:v1.17.4 -k8s.gcr.io/coredns:1.6.5 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.17.4 +registry.k8s.io/kube-controller-manager:v1.17.4 +registry.k8s.io/kube-scheduler:v1.17.4 +registry.k8s.io/kube-proxy:v1.17.4 +registry.k8s.io/coredns:1.6.5 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.1 # Old v1 repos not compatible with Crane. Pulling from ghcr.io/epiphany-platform/flannel as workarround. #quay.io/coreos/flannel:v0.11.0-amd64 #quay.io/coreos/flannel:v0.11.0 @@ -298,13 +298,13 @@ calico/node:v3.12.0 calico/pod2daemon-flexvol:v3.11.2 calico/pod2daemon-flexvol:v3.12.0 ## v1.17.7 -k8s.gcr.io/kube-apiserver:v1.17.7 -k8s.gcr.io/kube-controller-manager:v1.17.7 -k8s.gcr.io/kube-scheduler:v1.17.7 -k8s.gcr.io/kube-proxy:v1.17.7 -k8s.gcr.io/coredns:1.6.5 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.1 +registry.k8s.io/kube-apiserver:v1.17.7 +registry.k8s.io/kube-controller-manager:v1.17.7 +registry.k8s.io/kube-scheduler:v1.17.7 +registry.k8s.io/kube-proxy:v1.17.7 +registry.k8s.io/coredns:1.6.5 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.1 quay.io/coreos/flannel:v0.12.0-amd64 quay.io/coreos/flannel:v0.12.0 calico/cni:v3.15.0 @@ -312,13 +312,13 @@ calico/kube-controllers:v3.15.0 calico/node:v3.15.0 calico/pod2daemon-flexvol:v3.15.0 ## v1.18.6 -k8s.gcr.io/kube-apiserver:v1.18.6 -k8s.gcr.io/kube-controller-manager:v1.18.6 -k8s.gcr.io/kube-scheduler:v1.18.6 -k8s.gcr.io/kube-proxy:v1.18.6 -k8s.gcr.io/coredns:1.6.7 -k8s.gcr.io/etcd:3.4.3-0 -k8s.gcr.io/pause:3.2 +registry.k8s.io/kube-apiserver:v1.18.6 +registry.k8s.io/kube-controller-manager:v1.18.6 +registry.k8s.io/kube-scheduler:v1.18.6 +registry.k8s.io/kube-proxy:v1.18.6 +registry.k8s.io/coredns:1.6.7 +registry.k8s.io/etcd:3.4.3-0 +registry.k8s.io/pause:3.2 quay.io/coreos/flannel:v0.12.0-amd64 quay.io/coreos/flannel:v0.12.0 calico/cni:v3.15.0 diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/templates/kubernetes/coredns-config-for-k8s-below-1.16.yml.j2 b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/templates/kubernetes/coredns-config-for-k8s-below-1.16.yml.j2 index 67e08e4ac4..fbcc014cb6 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/templates/kubernetes/coredns-config-for-k8s-below-1.16.yml.j2 +++ b/core/src/epicli/data/common/ansible/playbooks/roles/upgrade/templates/kubernetes/coredns-config-for-k8s-below-1.16.yml.j2 @@ -59,7 +59,7 @@ spec: beta.kubernetes.io/os: linux containers: - name: coredns - image: {{ image_registry_address }}/k8s.gcr.io/coredns:1.3.1 + image: {{ image_registry_address }}/registry.k8s.io/coredns:1.3.1 imagePullPolicy: IfNotPresent resources: limits: diff --git a/core/src/epicli/data/common/defaults/configuration/image-registry.yml b/core/src/epicli/data/common/defaults/configuration/image-registry.yml index d2ef666457..ce177d50a4 100644 --- a/core/src/epicli/data/common/defaults/configuration/image-registry.yml +++ b/core/src/epicli/data/common/defaults/configuration/image-registry.yml @@ -36,19 +36,19 @@ specification: current: - name: "haproxy:2.2.2-alpine" file_name: haproxy-2.2.2-alpine.tar - - name: "k8s.gcr.io/kube-apiserver:v1.18.6" + - name: "registry.k8s.io/kube-apiserver:v1.18.6" file_name: kube-apiserver-v1.18.6.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.18.6" + - name: "registry.k8s.io/kube-controller-manager:v1.18.6" file_name: kube-controller-manager-v1.18.6.tar - - name: "k8s.gcr.io/kube-proxy:v1.18.6" + - name: "registry.k8s.io/kube-proxy:v1.18.6" file_name: kube-proxy-v1.18.6.tar - - name: "k8s.gcr.io/kube-scheduler:v1.18.6" + - name: "registry.k8s.io/kube-scheduler:v1.18.6" file_name: kube-scheduler-v1.18.6.tar - - name: "k8s.gcr.io/coredns:1.6.7" + - name: "registry.k8s.io/coredns:1.6.7" file_name: coredns-1.6.7.tar - - name: "k8s.gcr.io/etcd:3.4.3-0" + - name: "registry.k8s.io/etcd:3.4.3-0" file_name: etcd-3.4.3-0.tar - - name: "k8s.gcr.io/pause:3.2" + - name: "registry.k8s.io/pause:3.2" file_name: pause-3.2.tar # flannel - name: "quay.io/coreos/flannel:v0.12.0-amd64" @@ -66,25 +66,25 @@ specification: file_name: pod2daemon-flexvol-v3.15.0.tar legacy: # v1.14.6 - Epiphany >= 0.4.0 && < 0.6.0 - - name: "k8s.gcr.io/kube-apiserver:v1.14.6" + - name: "registry.k8s.io/kube-apiserver:v1.14.6" file_name: kube-apiserver-v1.14.6.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.14.6" + - name: "registry.k8s.io/kube-controller-manager:v1.14.6" file_name: kube-controller-manager-v1.14.6.tar - - name: "k8s.gcr.io/kube-scheduler:v1.14.6" + - name: "registry.k8s.io/kube-scheduler:v1.14.6" file_name: kube-scheduler-v1.14.6.tar - - name: "k8s.gcr.io/kube-proxy:v1.14.6" + - name: "registry.k8s.io/kube-proxy:v1.14.6" file_name: kube-proxy-v1.14.6.tar # Disable this dual entry because of validation issues. # We leave it for reference. - # - name: "k8s.gcr.io/etcd:3.3.10" + # - name: "registry.k8s.io/etcd:3.3.10" # file_name: etcd-3.3.10.tar - # - name: "k8s.gcr.io/coredns:1.3.1" + # - name: "registry.k8s.io/coredns:1.3.1" # file_name: coredns-1.3.1.tar - name: "coredns/coredns:1.5.0" file_name: coredns-1.5.0.tar # Disable this dual entry because of validation issues. # We leave it for reference - # - name: "k8s.gcr.io/pause:3.1" + # - name: "registry.k8s.io/pause:3.1" # file_name: pause-3.1.tar # - name: "quay.io/coreos/flannel:v0.11.0-amd64" # file_name: flannel-v0.11.0-amd64.tar @@ -99,47 +99,47 @@ specification: - name: "calico/pod2daemon-flexvol:v3.8.1" file_name: pod2daemon-flexvol-v3.8.1.tar # v1.15.10 - - name: "k8s.gcr.io/kube-proxy:v1.15.10" + - name: "registry.k8s.io/kube-proxy:v1.15.10" file_name: kube-proxy-v1.15.10.tar - - name: "k8s.gcr.io/kube-apiserver:v1.15.10" + - name: "registry.k8s.io/kube-apiserver:v1.15.10" file_name: kube-apiserver-v1.15.10.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.15.10" + - name: "registry.k8s.io/kube-controller-manager:v1.15.10" file_name: kube-controller-manager-v1.15.10.tar - - name: "k8s.gcr.io/kube-scheduler:v1.15.10" + - name: "registry.k8s.io/kube-scheduler:v1.15.10" file_name: kube-scheduler-v1.15.10.tar - - name: "k8s.gcr.io/coredns:1.3.1" + - name: "registry.k8s.io/coredns:1.3.1" file_name: coredns-1.3.1.tar - - name: "k8s.gcr.io/etcd:3.3.10" + - name: "registry.k8s.io/etcd:3.3.10" file_name: etcd-3.3.10.tar # v1.16.7 - - name: "k8s.gcr.io/kube-scheduler:v1.16.7" + - name: "registry.k8s.io/kube-scheduler:v1.16.7" file_name: kube-scheduler-v1.16.7.tar - - name: "k8s.gcr.io/kube-proxy:v1.16.7" + - name: "registry.k8s.io/kube-proxy:v1.16.7" file_name: kube-proxy-v1.16.7.tar - - name: "k8s.gcr.io/kube-apiserver:v1.16.7" + - name: "registry.k8s.io/kube-apiserver:v1.16.7" file_name: kube-apiserver-v1.16.7.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.16.7" + - name: "registry.k8s.io/kube-controller-manager:v1.16.7" file_name: kube-controller-manager-v1.16.7.tar - - name: "k8s.gcr.io/etcd:3.3.15-0" + - name: "registry.k8s.io/etcd:3.3.15-0" file_name: etcd-3.3.15-0.tar - - name: "k8s.gcr.io/coredns:1.6.2" + - name: "registry.k8s.io/coredns:1.6.2" file_name: coredns-1.6.2.tar # v1.17.4 - Epiphany >= 0.6.0 && < 0.7.0 - - name: "k8s.gcr.io/kube-apiserver:v1.17.4" + - name: "registry.k8s.io/kube-apiserver:v1.17.4" file_name: kube-apiserver-v1.17.4.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.17.4" + - name: "registry.k8s.io/kube-controller-manager:v1.17.4" file_name: kube-controller-manager-v1.17.4.tar - - name: "k8s.gcr.io/kube-scheduler:v1.17.4" + - name: "registry.k8s.io/kube-scheduler:v1.17.4" file_name: kube-scheduler-v1.17.4.tar - - name: "k8s.gcr.io/kube-proxy:v1.17.4" + - name: "registry.k8s.io/kube-proxy:v1.17.4" file_name: kube-proxy-v1.17.4.tar # Disable this dual entry because of validation issues. # We leave it for reference. - # - name: "k8s.gcr.io/etcd:3.4.3-0" + # - name: "registry.k8s.io/etcd:3.4.3-0" # file_name: etcd-3.4.3-0.tar - # - name: "k8s.gcr.io/coredns:1.6.5" + # - name: "registry.k8s.io/coredns:1.6.5" # file_name: coredns-1.6.5.tar - # - name: "k8s.gcr.io/pause:3.1" + # - name: "registry.k8s.io/pause:3.1" # file_name: pause-3.1.tar # flannel - name: "quay.io/coreos/flannel:v0.11.0-amd64" @@ -163,19 +163,19 @@ specification: - name: "calico/pod2daemon-flexvol:v3.11.2" file_name: pod2daemon-flexvol-v3.11.2.tar # v1.17.7 - Epiphany 0.7.0 - - name: "k8s.gcr.io/kube-apiserver:v1.17.7" + - name: "registry.k8s.io/kube-apiserver:v1.17.7" file_name: kube-apiserver-v1.17.7.tar - - name: "k8s.gcr.io/kube-controller-manager:v1.17.7" + - name: "registry.k8s.io/kube-controller-manager:v1.17.7" file_name: kube-controller-manager-v1.17.7.tar - - name: "k8s.gcr.io/kube-proxy:v1.17.7" + - name: "registry.k8s.io/kube-proxy:v1.17.7" file_name: kube-proxy-v1.17.7.tar - - name: "k8s.gcr.io/kube-scheduler:v1.17.7" + - name: "registry.k8s.io/kube-scheduler:v1.17.7" file_name: kube-scheduler-v1.17.7.tar - - name: "k8s.gcr.io/coredns:1.6.5" + - name: "registry.k8s.io/coredns:1.6.5" file_name: coredns-1.6.5.tar - - name: "k8s.gcr.io/etcd:3.4.3-0" + - name: "registry.k8s.io/etcd:3.4.3-0" file_name: etcd-3.4.3-0.tar - - name: "k8s.gcr.io/pause:3.1" + - name: "registry.k8s.io/pause:3.1" file_name: pause-3.1.tar # flannel - name: "quay.io/coreos/flannel:v0.12.0-amd64" diff --git a/core/src/epicli/data/common/defaults/configuration/kubernetes-master.yml b/core/src/epicli/data/common/defaults/configuration/kubernetes-master.yml index 4b7d14f893..c930362b60 100644 --- a/core/src/epicli/data/common/defaults/configuration/kubernetes-master.yml +++ b/core/src/epicli/data/common/defaults/configuration/kubernetes-master.yml @@ -29,7 +29,7 @@ specification: dnsDomain: cluster.local serviceSubnet: 10.96.0.0/12 plugin: flannel # valid options: calico, flannel, canal (due to lack of support for calico on Azure - use canal) - imageRepository: k8s.gcr.io + imageRepository: registry.k8s.io certificates: location: /etc/kubernetes/pki expiration_days: 365 # values greater than 24855 are not recommended