Browse Source

Merge "Use kube_master_ip for monitoring when no floating ip is used"

changes/50/769450/8
Zuul 6 months ago
committed by Gerrit Code Review
parent
commit
518ac5ef3c
  1. 2
      magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml

2
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

Loading…
Cancel
Save