From 34f65582eb3cb8fee91838e9f02e5310bd12ada0 Mon Sep 17 00:00:00 2001 From: guilhermesteinmuller Date: Tue, 24 Nov 2020 17:58:14 -0300 Subject: [PATCH] Use kube_master_ip for monitoring when no floating ip is used This patch aims to fix clusters that uses only private network and monitoring_enabled. It was observed that: - no floating ip, so the kube_master_external_ip is null - because of that, the value that gets sent to the shell for KUBE_MASTERS_PRIVATE is actually [null] - this happens when deploying prometheus-operator ( label monitoring_enable=true ) Those topics above results in a cluster taking around 30 minutes to be completed until monitoring gives up configuring endpoints. Change-Id: I0fb4b2604f38bd3a325f82b1364b78ff17792c65 --- magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index 16dfc9cc3e..b75dd0cea4 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -1340,7 +1340,7 @@ resources: template: {get_file: ../../common/templates/kubernetes/helm/prometheus-operator.sh} params: "${GRAFANA_ADMIN_PASSWD}": {get_param: grafana_admin_passwd} - "${KUBE_MASTERS_PRIVATE}": {get_attr: [kube_masters, kube_master_external_ip]} + "${KUBE_MASTERS_PRIVATE}": {get_attr: [kube_masters, kube_master_ip]} - get_file: ../../common/templates/kubernetes/helm/prometheus-adapter.sh - get_file: ../../common/templates/kubernetes/helm/ingress-nginx.sh - get_file: ../../common/templates/kubernetes/fragments/install-helm-modules.sh