From 8c30a120dae7d24e9ea61b6634d53cbac3be660d Mon Sep 17 00:00:00 2001 From: Adam Petrovic Date: Thu, 15 Jun 2023 20:58:18 +1000 Subject: [PATCH] fix setup_prometheus_endpoints in configure (#790) The kubeControllerManager endpoints were being cleared on each iteration of the loop over control nodes leading to only the last control node being added. Instead the array has been cleared outside of the loop. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index f70c2ab0..8876155a 100755 --- a/configure +++ b/configure @@ -475,14 +475,14 @@ generate_ansible_hosts() { } setup_prometheus_endpoints() { + yq --inplace 'del(.spec.values.kubeControllerManager.endpoints[])' \ + "${PROJECT_DIR}/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml" for var in "${!BOOTSTRAP_ANSIBLE_HOST_ADDR_@}"; do node_id=$(echo "${var}" | awk -F"_" '{print $5}') node_control="BOOTSTRAP_ANSIBLE_CONTROL_NODE_${node_id}" if [[ "${!node_control}" == "true" ]]; then node_addr="BOOTSTRAP_ANSIBLE_HOST_ADDR_${node_id}" _log "INFO(${FUNCNAME[0]})" "Setting up Prometheus endpoint for '${!node_addr}'" - yq --inplace 'del(.spec.values.kubeControllerManager.endpoints[])' \ - "${PROJECT_DIR}/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml" yq --inplace ".spec.values.kubeControllerManager.endpoints += \"${!node_addr}\"" \ "${PROJECT_DIR}/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml" fi