diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index 378eb775..4fc4fa32 100644 --- a/charts/apiserver-webhook/values.yaml +++ b/charts/apiserver-webhook/values.yaml @@ -17,7 +17,7 @@ release_uuid: null images: tags: - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest scripted_test: docker.io/openstackhelm/heat:newton dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index e60cdcda..339a36ae 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -57,9 +57,9 @@ const: images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 - key_rotate: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + key_rotate: cwedgwood/kubectl:v1.18.6-4 pull_policy: "IfNotPresent" local_registry: active: false diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index 7ee9e76b..2db091ce 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -16,8 +16,8 @@ release_group: null images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 pull_policy: "IfNotPresent" labels: diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml index e6fb17c2..4f02982b 100644 --- a/charts/haproxy/values.yaml +++ b/charts/haproxy/values.yaml @@ -64,7 +64,7 @@ conf: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 haproxy: haproxy:1.8.25 test: python:3.6 pull_policy: "IfNotPresent" diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml index dfe726d4..1196df83 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -67,7 +67,7 @@ pod: images: tags: - proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 pull_policy: "IfNotPresent" proxy: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index c7da91b5..c41e3c4b 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -85,8 +85,8 @@ secrets: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 pull_policy: "IfNotPresent" network: diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 35db36c0..49e14226 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -51,10 +51,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 etcd: quay.io/coreos/etcd:v3.4.3 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index b268e4ae..63c949fc 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -627,7 +627,7 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -728,8 +728,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -794,8 +794,8 @@ data: values: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 secrets: service_account: private_key: placeholder @@ -868,8 +868,8 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 source: type: local diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index ed4e1566..cf4638fd 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -39,10 +39,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 etcd: quay.io/coreos/etcd:v3.4.3 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index f84927e9..cc38d3a4 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -201,7 +201,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -644,7 +644,7 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -730,8 +730,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 secrets: service_account: public_key: placeholder @@ -807,8 +807,8 @@ data: values: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 secrets: service_account: private_key: placeholder @@ -880,8 +880,8 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 source: type: local diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index 7ef9b003..91aec827 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -51,10 +51,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 etcd: quay.io/coreos/etcd:v3.4.3 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 59269cdf..791f30fa 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -524,7 +524,7 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -626,8 +626,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -692,8 +692,8 @@ data: values: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 secrets: service_account: private_key: placeholder @@ -766,8 +766,8 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 source: type: local diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index 7ef9b003..91aec827 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -51,10 +51,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller-manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 etcd: quay.io/coreos/etcd:v3.4.3 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index ac16e446..415e71d4 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/hyperkube-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -530,7 +530,7 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -632,8 +632,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - apiserver: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -698,8 +698,8 @@ data: values: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - controller_manager: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 secrets: service_account: private_key: placeholder @@ -772,8 +772,8 @@ data: images: tags: - anchor: k8s.gcr.io/hyperkube-amd64:v1.18.6 - scheduler: k8s.gcr.io/hyperkube-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.18.6-4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 source: type: local diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index f5eb5a78..ccd7b6b1 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -1,6 +1,10 @@ # source_name, tag, cache_name -coredns/coredns,0.9.9,coredns -k8s.gcr.io/hyperkube-amd64,v1.18.6,hyperkube +coredns/coredns,1.6.4,coredns +cwedgwood/kubectl,v1.18.6-4,kubectl +k8s.gcr.io/kube-apiserver-amd64,v1.18.6,apiserver +k8s.gcr.io/kube-controller-manager-amd64,v1.18.6,controller-manager +k8s.gcr.io/kube-scheduler-amd64,v1.18.6,scheduler +k8s.gcr.io/kube-proxy-amd64,v1.18.6,proxy k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64 k8s.gcr.io/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64 k8s.gcr.io/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64