diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index 9f0f5e18..fa8bbf46 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/kube-apiserver-amd64:v1.19.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 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 f9d6465a..571cdc9d 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -59,9 +59,9 @@ const: images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - anchor: cwedgwood/kubectl:v1.19.7-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 - key_rotate: cwedgwood/kubectl:v1.19.7-1 + anchor: cwedgwood/kubectl:v1.20.5-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + key_rotate: cwedgwood/kubectl:v1.20.5-1 pull_policy: "IfNotPresent" local_registry: active: false diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index fb86ded0..d02cb8c3 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -16,8 +16,8 @@ release_group: null images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 pull_policy: "IfNotPresent" labels: diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml index d05cb8a2..be1ba803 100644 --- a/charts/haproxy/values.yaml +++ b/charts/haproxy/values.yaml @@ -64,7 +64,7 @@ conf: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 + anchor: cwedgwood/kubectl:v1.20.5-1 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 72061516..56c6e2d0 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -67,7 +67,7 @@ pod: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.19.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 pull_policy: "IfNotPresent" proxy: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index 6b8f9389..70481e00 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -85,8 +85,8 @@ secrets: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 pull_policy: "IfNotPresent" network: diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index 90708ad0..eaa57f17 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -48,10 +48,10 @@ Here is a complete sample document: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "" diff --git a/doc/source/configuration/host-system.rst b/doc/source/configuration/host-system.rst index c67bc238..8a2026e0 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -16,7 +16,7 @@ Sample Document to run containers in Docker runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: @@ -115,7 +115,7 @@ Sample Document to run containers in Containerd runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 288a273c..d80600bc 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -50,10 +50,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml index c1a47fa8..20e68ad5 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -13,11 +13,11 @@ data: enable: true files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index d0439a43..de54e890 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/kube-proxy-amd64:v1.19.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -627,7 +627,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 + anchor: cwedgwood/kubectl:v1.20.5-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -735,8 +735,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -801,8 +801,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 secrets: service_account: private_key: placeholder @@ -875,8 +875,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 source: type: local diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 171ba872..e3c9d992 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/kube-apiserver-amd64:v1.19.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml index 7b1add99..f0e18e94 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -10,11 +10,11 @@ metadata: data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/logrotate.d/json-logrotate diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index cfdc9b91..2d221099 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/kube-proxy-amd64:v1.19.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -644,7 +644,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 + anchor: cwedgwood/kubectl:v1.20.5-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -737,8 +737,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 secrets: service_account: public_key: placeholder @@ -814,8 +814,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 secrets: service_account: private_key: placeholder @@ -887,8 +887,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 source: type: local diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index 60c1b537..af8e3f82 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -50,10 +50,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/containerd/HostSystem.yaml b/examples/containerd/HostSystem.yaml index b0539734..843aa1d2 100644 --- a/examples/containerd/HostSystem.yaml +++ b/examples/containerd/HostSystem.yaml @@ -13,11 +13,11 @@ data: enable: true files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 6203ca13..325edbe8 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/kube-proxy-amd64:v1.19.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -524,7 +524,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 + anchor: cwedgwood/kubectl:v1.20.5-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -633,8 +633,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -699,8 +699,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 secrets: service_account: private_key: placeholder @@ -773,8 +773,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 source: type: local diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index 60c1b537..af8e3f82 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -50,10 +50,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/gate/HostSystem.yaml b/examples/gate/HostSystem.yaml index debbce75..0793b46d 100644 --- a/examples/gate/HostSystem.yaml +++ b/examples/gate/HostSystem.yaml @@ -13,11 +13,11 @@ data: enable: true files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index a574de32..694b473e 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/kube-proxy-amd64:v1.19.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -530,7 +530,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 + anchor: cwedgwood/kubectl:v1.20.5-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -639,8 +639,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -705,8 +705,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 secrets: service_account: private_key: placeholder @@ -779,8 +779,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 source: type: local diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 42fab326..b37203e1 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -107,13 +107,13 @@ VALID_DOCS = [ }, 'kubernetes': { 'apiserver': - 'k8s.gcr.io/kube-apiserver-amd64:v1.19.7', + 'k8s.gcr.io/kube-apiserver-amd64:v1.20.5', 'controller-manager': - 'k8s.gcr.io/kube-controller-manager-amd64:v1.19.7', + 'k8s.gcr.io/kube-controller-manager-amd64:v1.20.5', 'etcd': 'quay.io/coreos/etcd:v3.4.13', 'scheduler': - 'k8s.gcr.io/kube-scheduler-amd64:v1.19.7' + 'k8s.gcr.io/kube-scheduler-amd64:v1.20.5' } }, 'ip': @@ -149,7 +149,7 @@ VALID_DOCS = [ 'tar_path': 'kubernetes/node/bin/kubelet', 'tar_url': - 'https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz' + 'https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz' }, { 'content': diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 0cd8129e..9e6d19d2 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -36,10 +36,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/tests/unit/builder_data/simple/HostSystem.yaml b/tests/unit/builder_data/simple/HostSystem.yaml index c83c4d37..b8e4cdb8 100644 --- a/tests/unit/builder_data/simple/HostSystem.yaml +++ b/tests/unit/builder_data/simple/HostSystem.yaml @@ -14,7 +14,7 @@ data: # attempt to actually run Kubernetes, only to construct the genesis and # join scripts. # - path: /opt/kubernetes/bin/kubelet - # tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz + # tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz # tar_path: kubernetes/node/bin/kubelet # mode: 0555 - path: /etc/logrotate.d/json-logrotate diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index ec0fc902..f7290f6f 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -161,7 +161,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.19.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -537,7 +537,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 + anchor: cwedgwood/kubectl:v1.20.5-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -636,8 +636,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 secrets: service_account: public_key: placeholder @@ -713,8 +713,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 secrets: service_account: private_key: placeholder @@ -786,8 +786,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.19.7-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 + anchor: cwedgwood/kubectl:v1.20.5-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 source: type: local diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index a583422b..6765fca9 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -8,10 +8,10 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.4.13 IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0 -IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.19.7 -IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 -IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.19.7 -IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.19.7 -IMAGE_ANCHOR=cwedgwood/kubectl:v1.19.7-1 +IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.20.5 +IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 +IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.20.5 +IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.20.5 +IMAGE_ANCHOR=cwedgwood/kubectl:v1.20.5-1 IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.16.1 -KUBELET_URL=https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz +KUBELET_URL=https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index 3ac3d40b..bd106745 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -1,10 +1,10 @@ # source_name, tag, cache_name coredns/coredns,1.6.4,coredns -cwedgwood/kubectl,v1.19.7-1,kubectl -k8s.gcr.io/kube-apiserver-amd64,v1.19.7,apiserver -k8s.gcr.io/kube-controller-manager-amd64,v1.19.7,controller-manager -k8s.gcr.io/kube-scheduler-amd64,v1.19.7,scheduler -k8s.gcr.io/kube-proxy-amd64,v1.19.7,proxy +cwedgwood/kubectl,v1.20.5-1,kubectl +k8s.gcr.io/kube-apiserver-amd64,v1.20.5,apiserver +k8s.gcr.io/kube-controller-manager-amd64,v1.20.5,controller-manager +k8s.gcr.io/kube-scheduler-amd64,v1.20.5,scheduler +k8s.gcr.io/kube-proxy-amd64,v1.20.5,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