diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml index c2092df4..ee8f56e2 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -85,7 +85,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.12.2 + helm: lachlanevenson/k8s-helm:v3.13.2 packages: common: repositories: diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml index 87acf9b7..819bff1d 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -85,7 +85,7 @@ data: monitoring_image: busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.12.2 + helm: lachlanevenson/k8s-helm:v3.13.2 packages: common: repositories: diff --git a/examples/containerd/HostSystem.yaml b/examples/containerd/HostSystem.yaml index 4822732f..66a02900 100644 --- a/examples/containerd/HostSystem.yaml +++ b/examples/containerd/HostSystem.yaml @@ -85,7 +85,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.12.2 + helm: lachlanevenson/k8s-helm:v3.13.2 packages: common: additional: diff --git a/examples/gate/HostSystem.yaml b/examples/gate/HostSystem.yaml index 1d6efccf..17ff7eb9 100644 --- a/examples/gate/HostSystem.yaml +++ b/examples/gate/HostSystem.yaml @@ -85,7 +85,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.12.2 + helm: lachlanevenson/k8s-helm:v3.13.2 packages: common: repositories: diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 10a922c7..4a21005d 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -153,7 +153,7 @@ VALID_DOCS = [ 'images': { 'haproxy': 'haproxy:1.8.3', 'helm': { - 'helm': 'lachlanevenson/k8s-helm:v3.12.2' + 'helm': 'lachlanevenson/k8s-helm:v3.13.2' } }, 'packages': { diff --git a/tests/unit/builder_data/simple/HostSystem.yaml b/tests/unit/builder_data/simple/HostSystem.yaml index 1d400f2c..630d029f 100644 --- a/tests/unit/builder_data/simple/HostSystem.yaml +++ b/tests/unit/builder_data/simple/HostSystem.yaml @@ -38,7 +38,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v3.12.2 + helm: lachlanevenson/k8s-helm:v3.13.2 packages: common: repositories: diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index b6a38be5..c4f42cdc 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -8,7 +8,7 @@ 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.6 IMAGE_HAPROXY=haproxy:1.8.3 -IMAGE_HELM=lachlanevenson/k8s-helm:v3.12.2 +IMAGE_HELM=lachlanevenson/k8s-helm:v3.13.2 IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.28.4 IMAGE_CONTROLLER_MANAGER=registry.k8s.io/kube-controller-manager-amd64:v1.28.4 IMAGE_SCHEDULER=registry.k8s.io/kube-scheduler-amd64:v1.28.4 diff --git a/tools/helm_install.sh b/tools/helm_install.sh index 9c0dae59..ef54aa15 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.12.2-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.13.2-linux-amd64.tar.gz"} function install_helm_binary { diff --git a/tools/helm_tk.sh b/tools/helm_tk.sh index b90d5198..35bb53fd 100755 --- a/tools/helm_tk.sh +++ b/tools/helm_tk.sh @@ -17,7 +17,7 @@ set -eux HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"} -HTK_STABLE_COMMIT=${HTK_COMMIT:-"a7cd689280cdbc0acd04a7a1b745941260e8700b"} +HTK_STABLE_COMMIT=${HTK_COMMIT:-"13c1d8cd3866bb026cce6e5d80555edfd0afa845"} diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index cf130703..a3caa001 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -5,7 +5,7 @@ registry.k8s.io/kube-apiserver-amd64,v1.28.4,apiserver registry.k8s.io/kube-controller-manager-amd64,v1.28.4,controller-manager registry.k8s.io/kube-scheduler-amd64,v1.28.4,scheduler registry.k8s.io/kube-proxy-amd64,v1.28.4,proxy -lachlanevenson/k8s-helm,v3.12.2,helm +lachlanevenson/k8s-helm,v3.13.2,helm quay.io/airshipit/armada,master,armada quay.io/airshipit/armada-operator,latest,armada-operator quay.io/calico/cni,v3.4.0,calico-cni