From a58678d5d2b0d3cfa30c4c9d3c648b332d0021c6 Mon Sep 17 00:00:00 2001 From: Ruslan Aliev Date: Wed, 17 Apr 2024 23:47:04 -0500 Subject: [PATCH] Add configurable ETCD parameters to aux cluster Bump k8s, calico, etcd, coredns and helm. Signed-off-by: Ruslan Aliev Change-Id: I77373c223c6ea723ee31fe51e6fb4a9e84be03f7 --- charts/apiserver-webhook/values.yaml | 4 +- charts/apiserver/values.yaml | 4 +- charts/controller_manager/values.yaml | 2 +- charts/coredns/Chart.yaml | 2 +- charts/coredns/values.yaml | 2 +- charts/etcd/values.yaml | 4 +- charts/promenade/values.yaml | 2 +- charts/proxy/values.yaml | 2 +- charts/scheduler/values.yaml | 2 +- doc/source/configuration/genesis.rst | 8 ++-- doc/source/configuration/host-system.rst | 8 ++-- examples/basic/Genesis.yaml | 8 ++-- examples/basic/HostSystem.yaml | 8 ++-- examples/basic/armada-resources.yaml | 20 ++++---- examples/complete/Genesis.yaml | 8 ++-- examples/complete/HostSystem.yaml | 8 ++-- examples/complete/armada-resources.yaml | 46 +++++++++---------- examples/containerd/Genesis.yaml | 8 ++-- examples/containerd/HostSystem.yaml | 8 ++-- examples/containerd/armada-resources.yaml | 20 ++++---- examples/gate/Genesis.yaml | 8 ++-- examples/gate/HostSystem.yaml | 8 ++-- examples/gate/armada-resources.yaml | 20 ++++---- promenade/schemas/Genesis.yaml | 10 ++++ .../genesis-etcd/server-container.yaml | 20 ++++++++ tests/unit/api/test_validatedesign.py | 14 +++--- tests/unit/builder_data/simple/Genesis.yaml | 8 ++-- .../unit/builder_data/simple/HostSystem.yaml | 6 +-- .../builder_data/simple/armada-resources.yaml | 16 +++---- tools/gate/default-config-env | 20 ++++---- tools/helm_install.sh | 2 +- tools/registry/IMAGES | 14 +++--- 32 files changed, 175 insertions(+), 145 deletions(-) diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index f653be61..2e0fe3c1 100644 --- a/charts/apiserver-webhook/values.yaml +++ b/charts/apiserver-webhook/values.yaml @@ -17,10 +17,10 @@ release_uuid: null images: tags: - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.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 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/docker:17.07.0 ks_user: docker.io/openstackhelm/heat:ocata pull_policy: IfNotPresent diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index 621b2817..9a00fc95 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 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 key_rotate: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal pull_policy: "IfNotPresent" local_registry: diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index 9922f25f..5d870e9b 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -17,7 +17,7 @@ release_group: null images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 pull_policy: "IfNotPresent" labels: diff --git a/charts/coredns/Chart.yaml b/charts/coredns/Chart.yaml index c4ac01ad..479768c1 100644 --- a/charts/coredns/Chart.yaml +++ b/charts/coredns/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 description: A chart for coredns name: coredns version: 0.3.0 -appVersion: "1.9.4" +appVersion: "1.11.1" diff --git a/charts/coredns/values.yaml b/charts/coredns/values.yaml index f362a939..98f1d236 100644 --- a/charts/coredns/values.yaml +++ b/charts/coredns/values.yaml @@ -28,7 +28,7 @@ conf: images: tags: - coredns: coredns/coredns:1.9.4 + coredns: coredns/coredns:1.11.1 test: quay.io/airshipit/promenade:latest-ubuntu_focal pull_policy: "IfNotPresent" diff --git a/charts/etcd/values.yaml b/charts/etcd/values.yaml index b79b0676..739db2c8 100644 --- a/charts/etcd/values.yaml +++ b/charts/etcd/values.yaml @@ -14,10 +14,10 @@ images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal etcdctl_backup: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic pull_policy: "IfNotPresent" local_registry: diff --git a/charts/promenade/values.yaml b/charts/promenade/values.yaml index 38688618..505a446c 100644 --- a/charts/promenade/values.yaml +++ b/charts/promenade/values.yaml @@ -53,7 +53,7 @@ images: ks_user: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_endpoints: docker.io/openstackhelm/heat:newton - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" local_registry: diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml index 7e61fae6..bf41e795 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -68,7 +68,7 @@ pod: images: tags: - proxy: registry.k8s.io/kube-proxy-amd64:v1.29.2 + proxy: registry.k8s.io/kube-proxy-amd64:v1.29.4 pull_policy: "IfNotPresent" proxy: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index 157ae25e..72160f44 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -81,7 +81,7 @@ secrets: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.4 pull_policy: "IfNotPresent" network: diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index afd5f3fa..286c8874 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -43,11 +43,11 @@ Here is a complete sample document: armada: quay.io/airshipit/armada:latest armada-operator: quay.io/airshipit/armada-operator:latest kubernetes: - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 - controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 - etcd: quay.io/coreos/etcd:v3.5.11 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.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 2abcf7ac..54d667de 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -16,11 +16,11 @@ Sample Document to run containers in Docker runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 helm: helm: lachlanevenson/k8s-helm:v3.10.2 monitoring_image: busybox:1.28.3 @@ -115,11 +115,11 @@ Sample Document to run containers in Containerd runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 helm: helm: lachlanevenson/k8s-helm:v3.10.2 monitoring_image: busybox:1.28.3 diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 88fa4732..e0ddc6e0 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -47,11 +47,11 @@ data: armada: quay.io/airshipit/armada:latest-ubuntu_focal armada-operator: quay.io/airshipit/armada-operator:latest kubernetes: - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 - controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 - etcd: quay.io/coreos/etcd:v3.5.11 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.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 f7110242..d40dc39d 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.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.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.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service @@ -83,9 +83,9 @@ data: endpoint = ["http://registry:5000"] images: monitoring_image: &busybox busybox:1.28.3 - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 helm: - helm: lachlanevenson/k8s-helm:v3.13.2 + helm: lachlanevenson/k8s-helm:v3.14.4 packages: common: repositories: diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 6d26fcf4..75d96ef3 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: registry.k8s.io/kube-proxy-amd64:v1.29.2 + proxy: registry.k8s.io/kube-proxy-amd64:v1.29.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -363,7 +363,7 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 @@ -519,13 +519,13 @@ data: images: tags: - calico_etcd: quay.io/coreos/etcd:v3.5.11 + calico_etcd: quay.io/coreos/etcd:v3.5.12 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 calico_kube_controllers: quay.io/calico/kube-controllers:v3.4.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal manifests: daemonset_calico_etcd: false @@ -565,7 +565,7 @@ data: - kubernetes.default.svc.cluster.local images: tags: - coredns: coredns/coredns:1.9.4 + coredns: coredns/coredns:1.11.1 test: quay.io/airshipit/promenade:master source: type: local @@ -627,7 +627,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 test: python:3.6 source: @@ -735,7 +735,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -801,7 +801,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 secrets: service_account: private_key: placeholder @@ -875,7 +875,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.4 source: type: local @@ -1071,7 +1071,7 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 8ee1dcbc..7a90f6da 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -36,11 +36,11 @@ data: armada: quay.io/airshipit/armada:latest-ubuntu_focal armada-operator: quay.io/airshipit/armada-operator:latest kubernetes: - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 - controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 - etcd: quay.io/coreos/etcd:v3.5.11 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.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 c8b92779..995971d2 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -13,11 +13,11 @@ data: enable: true files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.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.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service @@ -83,9 +83,9 @@ data: endpoint = ["http://registry:5000"] images: monitoring_image: busybox:1.28.3 - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 helm: - helm: lachlanevenson/k8s-helm:v3.13.2 + helm: lachlanevenson/k8s-helm:v3.14.4 packages: common: repositories: diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index 2b439f68..de7c0fd5 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -200,7 +200,7 @@ data: values: images: tags: - proxy: registry.k8s.io/kube-proxy-amd64:v1.29.2 + proxy: registry.k8s.io/kube-proxy-amd64:v1.29.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -400,7 +400,7 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 @@ -540,7 +540,7 @@ data: images: tags: - calico_etcd: quay.io/coreos/etcd:v3.5.11 + calico_etcd: quay.io/coreos/etcd:v3.5.12 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 @@ -586,7 +586,7 @@ data: images: tags: - coredns: coredns/coredns:1.9.4 + coredns: coredns/coredns:1.11.1 test: quay.io/airshipit/promenade:master source: type: local @@ -643,7 +643,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 test: python:3.6 source: @@ -736,7 +736,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 secrets: service_account: public_key: placeholder @@ -813,7 +813,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 secrets: service_account: private_key: placeholder @@ -886,7 +886,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.4 source: type: local @@ -1082,7 +1082,7 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 @@ -1281,7 +1281,7 @@ data: ceph_config_helper: docker.io/port/ceph-config-helper:v1.7.5 ceph_daemon: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04 ceph_rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton @@ -1332,7 +1332,7 @@ data: values: images: tags: - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal mariadb: docker.io/mariadb:10.1.23 labels: server: @@ -1366,7 +1366,7 @@ data: values: images: tags: - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal memcached: docker.io/memcached:1.5.5 labels: server: @@ -1424,7 +1424,7 @@ data: keystone_credential_rotate: docker.io/openstackhelm/keystone:newton keystone_api: docker.io/openstackhelm/keystone:newton keystone_domain_manage: docker.io/openstackhelm/keystone:newton - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal pod: replicas: api: 1 @@ -1468,7 +1468,7 @@ data: node_selector_value: enabled images: tags: - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal postgresql: docker.io/postgres:9.5 source: type: git @@ -1509,7 +1509,7 @@ data: bootstrap: sthussey/maas-region-controller:2.3_patchv4 db_init: docker.io/postgres:9.5 db_sync: sthussey/maas-region-controller:2.3_patchv4 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal export_api_key: sthussey/maas-region-controller:2.3_patchv4 maas_rack: sthussey/maas-rack-controller:2.3 maas_region: sthussey/maas-region-controller:2.3_patchv4 @@ -1576,7 +1576,7 @@ data: prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0 prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:newton rabbitmq: docker.io/rabbitmq:3.7.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal pod: replicas: server: 1 @@ -1620,7 +1620,7 @@ data: images: tags: bootstrap: docker.io/openstackhelm/heat:newton - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal scripted_test: docker.io/openstackhelm/heat:newton db_init: docker.io/openstackhelm/heat:newton barbican_db_sync: docker.io/openstackhelm/barbican:newton @@ -1662,11 +1662,11 @@ data: node_selector_value: enabled images: tags: - entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + entrypoint: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal # https://github.com/kubernetes/ingress-nginx/blob/09524cd3363693463da5bf4a9bb3900da435ad05/Changelog.md#090 ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 error_pages: registry.k8s.io/defaultbackend:1.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal source: type: git location: https://github.com/openstack/openstack-helm @@ -1697,7 +1697,7 @@ data: images: tags: deckhand: quay.io/airshipit/deckhand:latest-ubuntu_focal - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal db_init: docker.io/postgres:9.5 db_sync: docker.io/postgres:9.5 ks_endpoints: docker.io/openstackhelm/heat:newton @@ -1737,7 +1737,7 @@ data: values: images: tags: - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal drydock: quay.io/airshipit/drydock:master drydock_db_init: docker.io/postgres:9.5 drydock_db_sync: quay.io/airshipit/drydock:master @@ -1830,7 +1830,7 @@ data: tags: api: quay.io/airshipit/armada:latest-ubuntu_focal operator: quay.io/airshipit/armada-operator:latest - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton @@ -1879,7 +1879,7 @@ data: tags: airflow: quay.io/airshipit/airflow:master shipyard: quay.io/airshipit/shipyard:master - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal shipyard_db_init: docker.io/postgres:9.5 shipyard_db_sync: quay.io/airshipit/shipyard:master airflow_db_init: docker.io/postgres:9.5 diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index 7666ea75..848241e9 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -47,11 +47,11 @@ data: armada: quay.io/airshipit/armada:latest-ubuntu_focal armada-operator: quay.io/airshipit/armada-operator:latest kubernetes: - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 - controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 - etcd: quay.io/coreos/etcd:v3.5.11 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.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 cb9386e8..04e94c30 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.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.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.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service @@ -83,9 +83,9 @@ data: endpoint = ["http://registry:5000"] images: monitoring_image: &busybox busybox:1.28.3 - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 helm: - helm: lachlanevenson/k8s-helm:v3.13.2 + helm: lachlanevenson/k8s-helm:v3.14.4 packages: common: additional: diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 5aa7adeb..9d3a014c 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: registry.k8s.io/kube-proxy-amd64:v1.29.2 + proxy: registry.k8s.io/kube-proxy-amd64:v1.29.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -276,7 +276,7 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 @@ -413,13 +413,13 @@ data: images: tags: - calico_etcd: quay.io/coreos/etcd:v3.5.11 + calico_etcd: quay.io/coreos/etcd:v3.5.12 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 calico_kube_controllers: quay.io/calico/kube-controllers:v3.4.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal manifests: daemonset_calico_etcd: false @@ -462,7 +462,7 @@ data: images: tags: - coredns: coredns/coredns:1.9.4 + coredns: coredns/coredns:1.11.1 test: quay.io/airshipit/promenade:master source: type: local @@ -524,7 +524,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 test: python:3.6 source: @@ -633,7 +633,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -699,7 +699,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 secrets: service_account: private_key: placeholder @@ -773,7 +773,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.4 source: type: local @@ -883,7 +883,7 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index 7666ea75..848241e9 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -47,11 +47,11 @@ data: armada: quay.io/airshipit/armada:latest-ubuntu_focal armada-operator: quay.io/airshipit/armada-operator:latest kubernetes: - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 - controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 - etcd: quay.io/coreos/etcd:v3.5.11 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.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 7b06b394..b928c0f8 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.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.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.29.2/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service @@ -83,9 +83,9 @@ data: endpoint = ["http://registry:5000"] images: monitoring_image: &busybox busybox:1.28.3 - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 helm: - helm: lachlanevenson/k8s-helm:v3.13.2 + helm: lachlanevenson/k8s-helm:v3.14.4 packages: common: repositories: diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index fc99da58..e4fa83e6 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -159,7 +159,7 @@ data: values: images: tags: - proxy: registry.k8s.io/kube-proxy-amd64:v1.29.2 + proxy: registry.k8s.io/kube-proxy-amd64:v1.29.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -282,7 +282,7 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 @@ -419,13 +419,13 @@ data: images: tags: - calico_etcd: quay.io/coreos/etcd:v3.5.11 + calico_etcd: quay.io/coreos/etcd:v3.5.12 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 calico_kube_controllers: quay.io/calico/kube-controllers:v3.4.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 + dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal manifests: daemonset_calico_etcd: false @@ -468,7 +468,7 @@ data: images: tags: - coredns: coredns/coredns:1.9.4 + coredns: coredns/coredns:1.11.1 test: quay.io/airshipit/promenade:master source: type: local @@ -530,7 +530,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 test: python:3.6 source: @@ -639,7 +639,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -705,7 +705,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 secrets: service_account: private_key: placeholder @@ -779,7 +779,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.4 source: type: local @@ -889,7 +889,7 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 diff --git a/promenade/schemas/Genesis.yaml b/promenade/schemas/Genesis.yaml index ecd0de28..8df1f9d4 100644 --- a/promenade/schemas/Genesis.yaml +++ b/promenade/schemas/Genesis.yaml @@ -111,6 +111,16 @@ data: # before the auxiliary members will self-terminate auxiliary_threshold: type: integer + heartbeat_interval: + type: integer + election_timeout: + type: integer + snapshot_count: + type: integer + cipher_suites: + type: string + gomaxprocs: + type: integer additionalProperties: false files: diff --git a/promenade/templates/include/genesis-etcd/server-container.yaml b/promenade/templates/include/genesis-etcd/server-container.yaml index d8d2fbbb..a8d64078 100644 --- a/promenade/templates/include/genesis-etcd/server-container.yaml +++ b/promenade/templates/include/genesis-etcd/server-container.yaml @@ -53,6 +53,26 @@ value: $(ETCD_CERT_FILE) - name: ETCDCTL_KEY value: $(ETCD_KEY_FILE) +{%- if config['Genesis:etcd.heartbeat_interval'] is defined %} + - name: ETCD_HEARTBEAT_INTERVAL + value: {{ config['Genesis:etcd.heartbeat_interval'] }} +{%- endif %} +{%- if config['Genesis:etcd.election_timeout'] is defined %} + - name: ETCD_ELECTION_TIMEOUT + value: {{ config['Genesis:etcd.election_timeout'] }} +{%- endif %} +{%- if config['Genesis:etcd.snapshot_count'] is defined %} + - name: ETCD_SNAPSHOT_COUNT + value: {{ config['Genesis:etcd.snapshot_count'] }} +{%- endif %} +{%- if config['Genesis:etcd.cipher_suites'] is defined %} + - name: ETCD_CIPHER_SUITES + value: {{ config['Genesis:etcd.cipher_suites'] }} +{%- endif %} +{%- if config['Genesis:etcd.gomaxprocs'] is defined %} + - name: GOMAXPROCS + value: {{ config['Genesis:etcd.gomaxprocs'] }} +{%- endif %} ports: - name: client containerPort: {{ client_port }} diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 67e42521..ba74905c 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -104,11 +104,11 @@ VALID_DOCS = [ 'armada-operator': 'quay.io/airshipit/armada-operator:latest', 'kubernetes': { 'apiserver': - 'registry.k8s.io/kube-apiserver-amd64:v1.29.2', + 'registry.k8s.io/kube-apiserver-amd64:v1.29.4', 'controller-manager': - 'registry.k8s.io/kube-controller-manager-amd64:v1.29.2', - 'etcd': 'quay.io/coreos/etcd:v3.5.11', - 'scheduler': 'registry.k8s.io/kube-scheduler-amd64:v1.29.2' + 'registry.k8s.io/kube-controller-manager-amd64:v1.29.4', + 'etcd': 'quay.io/coreos/etcd:v3.5.12', + 'scheduler': 'registry.k8s.io/kube-scheduler-amd64:v1.29.4' } }, 'ip': @@ -143,7 +143,7 @@ VALID_DOCS = [ 'tar_path': 'kubernetes/node/bin/kubelet', 'tar_url': - 'https://dl.k8s.io/v1.29.2/kubernetes-node-linux-amd64.tar.gz' + 'https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz' }, { 'content': '/var/lib/docker/containers/*/*-json.log\n{\n compress\n copytruncate\n create 0644 root root\n daily\n dateext\n dateformat -%Y%m%d-%s\n maxsize 10M\n missingok\n notifempty\n su root root\n rotate 1\n}', @@ -151,9 +151,9 @@ VALID_DOCS = [ 'path': '/etc/logrotate.d/json-logrotate' }], 'images': { - 'haproxy': 'haproxy:1.8.3', + 'haproxy': 'haproxy:2.4', 'helm': { - 'helm': 'lachlanevenson/k8s-helm:v3.13.2' + 'helm': 'lachlanevenson/k8s-helm:v3.14.4' } }, 'packages': { diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index bbaffc1b..b053dde7 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -33,11 +33,11 @@ data: armada: quay.io/airshipit/armada:latest-ubuntu_focal armada-operator: quay.io/airshipit/armada-operator:latest kubernetes: - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 - controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 - etcd: quay.io/coreos/etcd:v3.5.11 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 + controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.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 f4a9ac11..e5f3a867 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.29.2/kubernetes-node-linux-amd64.tar.gz + # tar_url: https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz # tar_path: kubernetes/node/bin/kubelet # mode: 0555 - path: /etc/logrotate.d/json-logrotate @@ -36,9 +36,9 @@ data: } images: monitoring_image: &busybox busybox:1.28.3 - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 helm: - helm: lachlanevenson/k8s-helm:v3.13.2 + helm: lachlanevenson/k8s-helm:v3.14.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 a9b2ec07..a419101f 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: registry.k8s.io/kube-proxy-amd64:v1.29.2 + proxy: registry.k8s.io/kube-proxy-amd64:v1.29.4 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -303,7 +303,7 @@ data: filename: calico-etcd-bootstrap images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 @@ -475,7 +475,7 @@ data: images: tags: - coredns: coredns/coredns:1.9.4 + coredns: coredns/coredns:1.11.1 test: quay.io/airshipit/promenade:master source: type: local @@ -536,7 +536,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - haproxy: haproxy:1.8.3 + haproxy: haproxy:2.4 test: python:3.6 source: @@ -635,7 +635,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.2 + apiserver: registry.k8s.io/kube-apiserver-amd64:v1.29.4 secrets: service_account: public_key: placeholder @@ -712,7 +712,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.2 + controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.29.4 secrets: service_account: private_key: placeholder @@ -785,7 +785,7 @@ data: images: tags: anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal - scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.2 + scheduler: registry.k8s.io/kube-scheduler-amd64:v1.29.4 source: type: local @@ -923,7 +923,7 @@ data: host_etc_path: /etc/etcd/kubernetes images: tags: - etcd: quay.io/coreos/etcd:v3.5.11 + etcd: quay.io/coreos/etcd:v3.5.12 etcdctl: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal nodes: - name: n0 diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 756f16ff..351ac071 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -4,15 +4,15 @@ 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.9.4 -IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 -IMAGE_ETCD=quay.io/coreos/etcd:v3.5.11 +IMAGE_COREDNS=coredns/coredns:1.11.1 +IMAGE_DEP_CHECK=quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal +IMAGE_ETCD=quay.io/coreos/etcd:v3.5.12 IMAGE_ETCDCTL=quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal -IMAGE_HAPROXY=haproxy:1.8.3 -IMAGE_HELM=lachlanevenson/k8s-helm:v3.13.2 -IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.29.2 -IMAGE_CONTROLLER_MANAGER=registry.k8s.io/kube-controller-manager-amd64:v1.29.2 -IMAGE_SCHEDULER=registry.k8s.io/kube-scheduler-amd64:v1.29.2 -IMAGE_PROXY=registry.k8s.io/kube-proxy-amd64:v1.29.2 +IMAGE_HAPROXY=haproxy:2.4 +IMAGE_HELM=lachlanevenson/k8s-helm:v3.14.4 +IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.29.4 +IMAGE_CONTROLLER_MANAGER=registry.k8s.io/kube-controller-manager-amd64:v1.29.4 +IMAGE_SCHEDULER=registry.k8s.io/kube-scheduler-amd64:v1.29.4 +IMAGE_PROXY=registry.k8s.io/kube-proxy-amd64:v1.29.4 IMAGE_ANCHOR=quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal -KUBELET_URL=https://dl.k8s.io/v1.29.2/kubernetes-node-linux-amd64.tar.gz +KUBELET_URL=https://dl.k8s.io/v1.29.4/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/helm_install.sh b/tools/helm_install.sh index ef54aa15..708cd570 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.13.2-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.14.4-linux-amd64.tar.gz"} function install_helm_binary { diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index 85aab78e..f16577a3 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -1,16 +1,16 @@ # source_name, tag, cache_name -coredns/coredns,1.9.4,coredns +coredns/coredns,1.11.1,coredns quay.io/airshipit/porthole-compute-utility,latest-ubuntu_focal,kubectl quay.io/airshipit/porthole-etcdctl-utility,latest-ubuntu_focal -registry.k8s.io/kube-apiserver-amd64,v1.29.2,apiserver -registry.k8s.io/kube-controller-manager-amd64,v1.29.2,controller-manager -registry.k8s.io/kube-scheduler-amd64,v1.29.2,scheduler -registry.k8s.io/kube-proxy-amd64,v1.29.2,proxy -lachlanevenson/k8s-helm,v3.13.2,helm +registry.k8s.io/kube-apiserver-amd64,v1.29.4,apiserver +registry.k8s.io/kube-controller-manager-amd64,v1.29.4,controller-manager +registry.k8s.io/kube-scheduler-amd64,v1.29.4,scheduler +registry.k8s.io/kube-proxy-amd64,v1.29.4,proxy +lachlanevenson/k8s-helm,v3.14.4,helm quay.io/airshipit/armada,master,armada quay.io/airshipit/armada-operator,latest,armada-operator 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.11,etcd +quay.io/coreos/etcd,v3.5.12,etcd