From 1017536b9f28f942860ea1c3fdc3bb6d2164ad2c Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Mon, 26 Jul 2021 13:13:59 -0500 Subject: [PATCH] Move to helm 3 CLI in cluster Signed-off-by: Sean Eagan Change-Id: I3c385547d30796aecb67aaa6482da34765052c47 --- doc/source/configuration/host-system.rst | 4 ++-- examples/basic/HostSystem.yaml | 2 +- examples/complete/HostSystem.yaml | 2 +- examples/containerd/HostSystem.yaml | 2 +- examples/gate/HostSystem.yaml | 2 +- .../roles/common/usr/local/bin/debug-report.sh | 10 ++++++---- tests/unit/api/test_validatedesign.py | 2 +- tests/unit/builder_data/simple/HostSystem.yaml | 2 +- tools/gate/default-config-env | 2 +- tools/registry/IMAGES | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/doc/source/configuration/host-system.rst b/doc/source/configuration/host-system.rst index 8a2026e0..5570a8b8 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -22,7 +22,7 @@ Sample Document to run containers in Docker runtime images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.14.0 + helm: lachlanevenson/k8s-helm:v3.6.2 monitoring_image: busybox:1.28.3 packages: repositories: @@ -121,7 +121,7 @@ Sample Document to run containers in Containerd runtime images: haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.14.0 + helm: lachlanevenson/k8s-helm:v3.6.2 monitoring_image: busybox:1.28.3 packages: additional: diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml index 20e68ad5..f6d44633 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -77,7 +77,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.14.0 + helm: lachlanevenson/k8s-helm:v3.6.2 packages: common: repositories: diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml index f0e18e94..af1f887b 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -42,7 +42,7 @@ data: monitoring_image: busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.14.0 + helm: lachlanevenson/k8s-helm:v3.6.2 packages: common: repositories: diff --git a/examples/containerd/HostSystem.yaml b/examples/containerd/HostSystem.yaml index 843aa1d2..e5c3a397 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:v2.14.0 + helm: lachlanevenson/k8s-helm:v3.6.2 packages: common: additional: diff --git a/examples/gate/HostSystem.yaml b/examples/gate/HostSystem.yaml index 0793b46d..d050ad8d 100644 --- a/examples/gate/HostSystem.yaml +++ b/examples/gate/HostSystem.yaml @@ -77,7 +77,7 @@ data: monitoring_image: &busybox busybox:1.28.3 haproxy: haproxy:1.8.3 helm: - helm: lachlanevenson/k8s-helm:v2.14.0 + helm: lachlanevenson/k8s-helm:v3.6.2 packages: common: repositories: diff --git a/promenade/templates/roles/common/usr/local/bin/debug-report.sh b/promenade/templates/roles/common/usr/local/bin/debug-report.sh index 84e30ec9..7b4e4b19 100755 --- a/promenade/templates/roles/common/usr/local/bin/debug-report.sh +++ b/promenade/templates/roles/common/usr/local/bin/debug-report.sh @@ -92,20 +92,22 @@ function get_objects () { export -f get_objects function get_releases () { - helm list --all --short + helm list --all-namespaces --all | awk 'NR>1 { print $1, $2 }' } function get_release () { input=($1) RELEASE=${input[0]} - helm status "${RELEASE}" > "${HELM_DIR}/${RELEASE}.txt" - + NAMESPACE=${input[1]} + NAMESPACE_DIR="${HELM_DIR}/${NAMESPACE}" + mkdir -p "${NAMESPACE_DIR}" + helm status -n "${NAMESPACE}" "${RELEASE}" > "${NAMESPACE_DIR}/${RELEASE}.txt" } export -f get_release if which helm; then mkdir -p "${HELM_DIR}" - helm list --all > "${HELM_DIR}/list" & + helm list --all-namespaces --all > "${HELM_DIR}/list" & get_releases | \ xargs -r -n 1 -P "${PARALLELISM_FACTOR}" -I {} bash -c 'get_release "$@"' _ {} fi diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index c6cb331d..3e401025 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -162,7 +162,7 @@ VALID_DOCS = [ 'images': { 'haproxy': 'haproxy:1.8.3', 'helm': { - 'helm': 'lachlanevenson/k8s-helm:v2.14.0' + 'helm': 'lachlanevenson/k8s-helm:v3.6.2' } }, 'packages': { diff --git a/tests/unit/builder_data/simple/HostSystem.yaml b/tests/unit/builder_data/simple/HostSystem.yaml index b8e4cdb8..f3fbe1e7 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:v2.14.0 + helm: lachlanevenson/k8s-helm:v3.6.2 packages: common: repositories: diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index 976c35a6..22cce037 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -7,7 +7,7 @@ IMAGE_COREDNS=coredns/coredns:1.7.0 IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.4.13 IMAGE_HAPROXY=haproxy:1.8.3 -IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0 +IMAGE_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 diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index 68d9986e..b35fd611 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -9,7 +9,7 @@ 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 gcr.io/kubernetes-helm/tiller,v2.14.0,tiller -lachlanevenson/k8s-helm,v2.14.0,helm +lachlanevenson/k8s-helm,v3.6.3,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