diff --git a/.zuul.yaml b/.zuul.yaml index dfbfe25b..94aa6955 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -25,7 +25,6 @@ - airship-promenade-chart-build-gate - airship-promenade-chart-build-latest-htk - airship-promenade-unit-py35 - - airship-promenade-genesis-gate - airship-promenade-genesis-containerd-gate gate: @@ -36,7 +35,6 @@ - airship-promenade-docker-build-gate-ubuntu_bionic - airship-promenade-chart-build-gate - airship-promenade-unit-py35 - - airship-promenade-genesis-gate - airship-promenade-genesis-containerd-gate post: @@ -56,19 +54,6 @@ - name: primary label: ubuntu-bionic -- job: - name: airship-promenade-genesis-gate - description: | - Deploy airship promenade genesis - run: tools/zuul/playbooks/deploy-promenade.yaml - post-run: tools/zuul/playbooks/debug-report.yaml - required-projects: - - openstack/openstack-helm-infra - timeout: 3600 - nodeset: airship-promenade-single-node-bionic - vars: - distro: ubuntu_bionic - - job: name: airship-promenade-genesis-containerd-gate description: | diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index b09437de..1fbbc03c 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.23.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 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 @@ -40,7 +40,7 @@ labels: command_prefix: - kube-apiserver - - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds apiserver_webhook: logging: diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index 5363d0cc..d709cd76 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: bitnami/kubectl:1.23.7 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.23.7 - key_rotate: bitnami/kubectl:1.23.7 + anchor: bitnami/kubectl:1.24.4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 + key_rotate: bitnami/kubectl:1.24.4 pull_policy: "IfNotPresent" local_registry: active: false diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index faf31f12..43be4341 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -16,8 +16,8 @@ release_group: null images: tags: - anchor: bitnami/kubectl:1.23.7 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 pull_policy: "IfNotPresent" labels: diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml index e3d92bd6..6f349ac2 100644 --- a/charts/haproxy/values.yaml +++ b/charts/haproxy/values.yaml @@ -64,7 +64,7 @@ conf: images: tags: - anchor: bitnami/kubectl:1.23.7 + anchor: bitnami/kubectl:1.24.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 8c339c00..8d670ddd 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.23.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.24.4 pull_policy: "IfNotPresent" proxy: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index bd651703..bee3f4a5 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -85,8 +85,8 @@ secrets: images: tags: - anchor: bitnami/kubectl:1.23.7 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 pull_policy: "IfNotPresent" network: diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index fd04b906..1007026b 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.23.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 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 6fcd5a55..0118b51c 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -16,13 +16,13 @@ Sample Document to run containers in Docker runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.8.2 + helm: lachlanevenson/k8s-helm:v3.9.4 monitoring_image: busybox:1.28.3 packages: repositories: @@ -115,13 +115,13 @@ Sample Document to run containers in Containerd runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.8.2 + helm: lachlanevenson/k8s-helm:v3.9.4 monitoring_image: busybox:1.28.3 packages: additional: diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 9e1ba7c7..1c9ea169 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.23.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 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 78e50a9b..1b7b114a 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.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/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.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service @@ -77,7 +77,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.8.2 + helm: lachlanevenson/k8s-helm:v3.9.4 packages: common: repositories: diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 04d1f42a..923164cf 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.23.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.24.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -626,7 +626,7 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 + anchor: bitnami/kubectl:1.24.4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -734,8 +734,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: bitnami/kubectl:1.23.7 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -800,8 +800,8 @@ data: values: images: tags: - anchor: bitnami/kubectl:1.23.7 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 secrets: service_account: private_key: placeholder @@ -874,8 +874,8 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 source: type: local diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 6d778d1f..8ebbf41c 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.23.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 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 3b79e83a..8b3741b6 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.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/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.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/logrotate.d/json-logrotate @@ -42,7 +42,7 @@ data: monitoring_image: busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.8.2 + helm: lachlanevenson/k8s-helm:v3.9.4 packages: common: repositories: diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index f82ffdf8..e59e3244 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.23.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.24.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -541,11 +541,10 @@ data: images: tags: calico_etcd: quay.io/coreos/etcd:v3.5.4 - calico_node: quay.io/calico/node:v2.6.5 - calico_cni: quay.io/calico/cni:v1.11.2 - calico_ctl: quay.io/calico/ctl:v1.6.2 - calico_settings: quay.io/calico/ctl:v1.6.2 - calico_kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0 + calico_node: quay.io/calico/node:v3.4.0 + calico_cni: quay.io/calico/cni:v3.4.0 + calico_ctl: quay.io/calico/ctl:v3.4.0 + calico_settings: quay.io/calico/ctl:v3.4.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 manifests: @@ -643,7 +642,7 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 + anchor: bitnami/kubectl:1.24.4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -736,8 +735,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: bitnami/kubectl:1.23.7 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 secrets: service_account: public_key: placeholder @@ -813,8 +812,8 @@ data: values: images: tags: - anchor: bitnami/kubectl:1.23.7 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 secrets: service_account: private_key: placeholder @@ -886,8 +885,8 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 source: type: local diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index 563b1f30..281d3d9d 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.23.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 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 65bbf31b..436071fa 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.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/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.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service @@ -85,7 +85,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.8.2 + helm: lachlanevenson/k8s-helm:v3.9.4 packages: common: additional: diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index fe3c16b6..fef86843 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.23.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.24.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -523,7 +523,7 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 + anchor: bitnami/kubectl:1.24.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: bitnami/kubectl:1.23.7 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -698,8 +698,8 @@ data: values: images: tags: - anchor: bitnami/kubectl:1.23.7 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 secrets: service_account: private_key: placeholder @@ -772,8 +772,8 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 source: type: local diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index 563b1f30..281d3d9d 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.23.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 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 2a02b2bb..43a466e1 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.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/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.23.7/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service @@ -77,7 +77,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.8.2 + helm: lachlanevenson/k8s-helm:v3.9.4 packages: common: repositories: diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index 892444fe..154d99e5 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.23.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.24.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -529,7 +529,7 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 + anchor: bitnami/kubectl:1.24.4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -638,8 +638,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: bitnami/kubectl:1.23.7 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -704,8 +704,8 @@ data: values: images: tags: - anchor: bitnami/kubectl:1.23.7 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 secrets: service_account: private_key: placeholder @@ -778,8 +778,8 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 source: type: local diff --git a/requirements-direct.txt b/requirements-direct.txt index 1c40237a..231dd4de 100644 --- a/requirements-direct.txt +++ b/requirements-direct.txt @@ -7,7 +7,7 @@ jsonschema==3.2.0 keystoneauth1==3.18.0 keystonemiddleware==5.3.0 setuptools==40.4.3 -kubernetes<24 +kubernetes~=24.2.0 oslo.context==2.21.0 oslo.policy==1.40.1 pastedeploy==1.5.2 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 588a2637..a73c6302 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -39,7 +39,7 @@ jsonschema==3.2.0 keystoneauth1==3.18.0 keystonemiddleware==5.3.0 kombu==4.6.10 -kubernetes==23.6.0; python_version >= '3.6' +kubernetes==24.2.0; python_version >= '3.6' linecache2==1.0.0 Mako==1.1.3 MarkupSafe==1.1.1 diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 13266c7b..4443e5ba 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -82,7 +82,7 @@ VALID_DOCS = [ 'apiserver': { 'command_prefix': [ '/apiserver', '--authorization-mode=Node,RBAC', - '--admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds', + '--enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds', '--service-cluster-ip-range=10.96.0.0/16', '--endpoint-reconciler-type=lease' ] @@ -104,13 +104,13 @@ VALID_DOCS = [ 'armada': 'quay.io/airshipit/armada:master-ubuntu_bionic', 'kubernetes': { 'apiserver': - 'k8s.gcr.io/kube-apiserver-amd64:v1.23.7', + 'k8s.gcr.io/kube-apiserver-amd64:v1.24.4', 'controller-manager': - 'k8s.gcr.io/kube-controller-manager-amd64:v1.23.7', + 'k8s.gcr.io/kube-controller-manager-amd64:v1.24.4', 'etcd': 'quay.io/coreos/etcd:v3.5.4', 'scheduler': - 'k8s.gcr.io/kube-scheduler-amd64:v1.23.7' + 'k8s.gcr.io/kube-scheduler-amd64:v1.24.4' } }, 'ip': @@ -146,7 +146,7 @@ VALID_DOCS = [ 'tar_path': 'kubernetes/node/bin/kubelet', 'tar_url': - 'https://dl.k8s.io/v1.23.7/kubernetes-node-linux-amd64.tar.gz' + 'https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz' }, { 'content': @@ -159,7 +159,7 @@ VALID_DOCS = [ 'images': { 'haproxy': 'haproxy:1.8.3', 'helm': { - 'helm': 'lachlanevenson/k8s-helm:v3.8.2' + 'helm': 'lachlanevenson/k8s-helm:v3.9.4' } }, 'packages': { diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 358a7eb7..6f19a592 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -14,7 +14,7 @@ data: command_prefix: - /apiserver - --authorization-mode=Node,RBAC - - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds - --service-cluster-ip-range=10.96.0.0/16 - --endpoint-reconciler-type=lease armada: @@ -32,10 +32,10 @@ data: images: armada: quay.io/airshipit/armada:master-ubuntu_bionic kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.23.7 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 etcd: quay.io/coreos/etcd:v3.5.4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 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 510f53c0..85234dd0 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.23.7/kubernetes-node-linux-amd64.tar.gz + # tar_url: https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz # tar_path: kubernetes/node/bin/kubelet # mode: 0555 - path: /etc/logrotate.d/json-logrotate @@ -38,7 +38,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.8.2 + helm: lachlanevenson/k8s-helm:v3.9.4 packages: common: repositories: diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index ab6f60bc..4b61eaca 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.23.7 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.24.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -427,11 +427,10 @@ data: images: tags: - calico_node: quay.io/calico/node:v2.6.5 - calico_cni: quay.io/calico/cni:v1.11.2 - calico_ctl: quay.io/calico/ctl:v1.6.2 - calico_settings: quay.io/calico/ctl:v1.6.2 - calico_kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0 + calico_node: quay.io/calico/node:v3.4.0 + calico_cni: quay.io/calico/cni:v3.4.0 + calico_ctl: quay.io/calico/ctl:v3.4.0 + calico_settings: quay.io/calico/ctl:v3.4.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 manifests: @@ -536,7 +535,7 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 + anchor: bitnami/kubectl:1.24.4 haproxy: haproxy:1.8.3 test: python:3.6 @@ -627,7 +626,7 @@ data: command_prefix: - /apiserver - --authorization-mode=Node,RBAC - - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds + - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds - --service-cluster-ip-range=10.96.0.0/16 - --endpoint-reconciler-type=lease apiserver: @@ -635,8 +634,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: bitnami/kubectl:1.23.7 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.24.4 secrets: service_account: public_key: placeholder @@ -712,8 +711,8 @@ data: values: images: tags: - anchor: bitnami/kubectl:1.23.7 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 secrets: service_account: private_key: placeholder @@ -785,8 +784,8 @@ data: images: tags: - anchor: bitnami/kubectl:1.23.7 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.23.7 + anchor: bitnami/kubectl:1.24.4 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.24.4 source: type: local diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml index c07a0619..f237875f 100644 --- a/tools/gate/config-templates/bootstrap-armada-config.yaml +++ b/tools/gate/config-templates/bootstrap-armada-config.yaml @@ -107,7 +107,7 @@ data: type: git location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: b7e2d6839ce600a7c1e2103f55d208ad3f5029ca + reference: ee331fd0d38e3584fecbefbf6218ba0c8e112338 dependencies: [] --- schema: armada/Chart/v1 diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 576cf889..244ae8bf 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -1,16 +1,16 @@ IMAGE_ARMADA=quay.io/airshipit/armada:master-ubuntu_bionic -IMAGE_CALICO_CNI=quay.io/calico/cni:v1.11.2 -IMAGE_CALICO_CTL=quay.io/calico/ctl:v1.6.3 -IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2 -IMAGE_CALICO_NODE=quay.io/calico/node:v2.6.5 +IMAGE_CALICO_CNI=quay.io/calico/cni:v3.4.0 +IMAGE_CALICO_CTL=quay.io/calico/ctl:v3.4.0 +IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v3.4.0 +IMAGE_CALICO_NODE=quay.io/calico/node:v3.4.0 IMAGE_COREDNS=coredns/coredns:1.8.6 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.5.4 IMAGE_HAPROXY=haproxy:1.8.3 -IMAGE_HELM=lachlanevenson/k8s-helm:v3.8.2 -IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.23.7 -IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.23.7 -IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.23.7 -IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.23.7 -IMAGE_ANCHOR=bitnami/kubectl:1.23.7 -KUBELET_URL=https://dl.k8s.io/v1.23.7/kubernetes-node-linux-amd64.tar.gz +IMAGE_HELM=lachlanevenson/k8s-helm:v3.9.4 +IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.24.4 +IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.24.4 +IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.24.4 +IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.24.4 +IMAGE_ANCHOR=bitnami/kubectl:1.24.4 +KUBELET_URL=https://dl.k8s.io/v1.24.4/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/helm_install.sh b/tools/helm_install.sh index 364d2805..cee81412 100755 --- a/tools/helm_install.sh +++ b/tools/helm_install.sh @@ -17,7 +17,7 @@ set -x HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.8.2-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.9.4-linux-amd64.tar.gz"} function install_helm_binary { diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index 78467143..63c92af8 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -1,17 +1,14 @@ # source_name, tag, cache_name coredns/coredns,1.8.6,coredns -bitnami/kubectl,1.23.7,kubectl -k8s.gcr.io/kube-apiserver-amd64,v1.23.7,apiserver -k8s.gcr.io/kube-controller-manager-amd64,v1.23.7,controller-manager -k8s.gcr.io/kube-scheduler-amd64,v1.23.7,scheduler -k8s.gcr.io/kube-proxy-amd64,v1.23.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 -lachlanevenson/k8s-helm,v3.8.2,helm +bitnami/kubectl,1.24.4,kubectl +k8s.gcr.io/kube-apiserver-amd64,v1.24.4,apiserver +k8s.gcr.io/kube-controller-manager-amd64,v1.24.4,controller-manager +k8s.gcr.io/kube-scheduler-amd64,v1.24.4,scheduler +k8s.gcr.io/kube-proxy-amd64,v1.24.4,proxy +lachlanevenson/k8s-helm,v3.9.4,helm quay.io/airshipit/armada,master,armada -quay.io/calico/cni,v1.11.0,calico-cni -quay.io/calico/ctl,v1.6.1,calico-ctl -quay.io/calico/kube-controllers,v1.0.0,calico-kube-controllers -quay.io/calico/node,v2.6.1,calico-node -quay.io/coreos/etcd,v3.4.3,etcd +quay.io/calico/cni,v3.4.0,calico-cni +quay.io/calico/ctl,v3.4.0,calico-ctl +quay.io/calico/kube-controllers,v3.4.0,calico-kube-controllers +quay.io/calico/node,v3.4.0,calico-node +quay.io/coreos/etcd,v3.5.4,etcd