diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index c883e3e5..ae4caa47 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.20.5 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 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 08540048..f388dee6 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -58,9 +58,9 @@ const: images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.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 + anchor: cwedgwood/kubectl:v1.21.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 + key_rotate: cwedgwood/kubectl:v1.21.7-1 pull_policy: "IfNotPresent" local_registry: active: false diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index d02cb8c3..bcc4b2ff 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.20.5-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 pull_policy: "IfNotPresent" labels: diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml index be1ba803..287648dd 100644 --- a/charts/haproxy/values.yaml +++ b/charts/haproxy/values.yaml @@ -64,7 +64,7 @@ conf: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 + anchor: cwedgwood/kubectl:v1.21.7-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 4159a823..0a590bf6 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -68,7 +68,7 @@ pod: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7 pull_policy: "IfNotPresent" proxy: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index 70481e00..328530fb 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -85,8 +85,8 @@ secrets: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 pull_policy: "IfNotPresent" network: diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index a08e1ad1..9c3b0e4d 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -42,10 +42,10 @@ Here is a complete sample document: images: armada: quay.io/airshipit/armada:latest kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 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 5570a8b8..4a513eb3 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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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 58e386bf..86d21746 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -46,10 +46,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 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 f6d44633..08b67e59 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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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 3f901565..3f48465d 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -626,7 +626,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 + anchor: cwedgwood/kubectl:v1.21.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -734,8 +734,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -800,8 +800,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 secrets: service_account: private_key: placeholder @@ -874,8 +874,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 source: type: local diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index ab0aa1f9..8cec2c0f 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -35,10 +35,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 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 af1f887b..8dfee424 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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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 da791922..c581fed1 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -200,7 +200,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -643,7 +643,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 + anchor: cwedgwood/kubectl:v1.21.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -736,8 +736,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 secrets: service_account: public_key: placeholder @@ -813,8 +813,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 secrets: service_account: private_key: placeholder @@ -886,8 +886,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 source: type: local diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index d603f572..09957894 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -46,10 +46,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 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 e5c3a397..711510ff 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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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 35f532db..0680fe10 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -523,7 +523,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 + anchor: cwedgwood/kubectl:v1.21.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -632,8 +632,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -698,8 +698,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 secrets: service_account: private_key: placeholder @@ -772,8 +772,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 source: type: local diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index d603f572..09957894 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -46,10 +46,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 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 d050ad8d..a363adac 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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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.20.5/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.21.7/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 f57794c3..5eca6648 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -529,7 +529,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 + anchor: cwedgwood/kubectl:v1.21.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -638,8 +638,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -704,8 +704,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 secrets: service_account: private_key: placeholder @@ -778,8 +778,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 source: type: local diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index b996124d..2a70ea52 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -104,13 +104,13 @@ VALID_DOCS = [ 'armada': 'quay.io/airshipit/armada:master-ubuntu_bionic', 'kubernetes': { 'apiserver': - 'k8s.gcr.io/kube-apiserver-amd64:v1.20.5', + 'k8s.gcr.io/kube-apiserver-amd64:v1.21.7', 'controller-manager': - 'k8s.gcr.io/kube-controller-manager-amd64:v1.20.5', + 'k8s.gcr.io/kube-controller-manager-amd64:v1.21.7', 'etcd': 'quay.io/coreos/etcd:v3.4.13', 'scheduler': - 'k8s.gcr.io/kube-scheduler-amd64:v1.20.5' + 'k8s.gcr.io/kube-scheduler-amd64:v1.21.7' } }, 'ip': @@ -146,7 +146,7 @@ VALID_DOCS = [ 'tar_path': 'kubernetes/node/bin/kubelet', 'tar_url': - 'https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz' + 'https://dl.k8s.io/v1.21.7/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 4e216db4..88d9cdd6 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -32,10 +32,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 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 f3fbe1e7..ed126c8c 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.20.5/kubernetes-node-linux-amd64.tar.gz + # tar_url: https://dl.k8s.io/v1.21.7/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 a479ef3d..1ac2bd86 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -536,7 +536,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 + anchor: cwedgwood/kubectl:v1.21.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -635,8 +635,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7 secrets: service_account: public_key: placeholder @@ -712,8 +712,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 secrets: service_account: private_key: placeholder @@ -785,8 +785,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.20.5-1 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 + anchor: cwedgwood/kubectl:v1.21.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7 source: type: local diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 70ababca..dcb87a67 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -8,9 +8,9 @@ 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:v3.6.2 -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 -KUBELET_URL=https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz +IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.21.7 +IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.21.7 +IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.21.7 +IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.21.7 +IMAGE_ANCHOR=cwedgwood/kubectl:v1.21.7-1 +KUBELET_URL=https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index b4dd8ec6..fc2e0316 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -1,10 +1,10 @@ # source_name, tag, cache_name coredns/coredns,1.7.0,coredns -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 +cwedgwood/kubectl,v1.21.7-1,kubectl +k8s.gcr.io/kube-apiserver-amd64,v1.21.7,apiserver +k8s.gcr.io/kube-controller-manager-amd64,v1.21.7,controller-manager +k8s.gcr.io/kube-scheduler-amd64,v1.21.7,scheduler +k8s.gcr.io/kube-proxy-amd64,v1.21.7,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