From 9f3794d4f514bf7574879545561ff56a5b1b5c8e Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 11 Aug 2021 17:37:52 +0200
Subject: [PATCH] rename oas-prometheus-basic-auth secret to conform naming
convention
---
.gitlab-ci.yml | 2 +-
flux2/apps/monitoring/kube-prometheus-stack-release.yaml | 2 +-
install/install-openappstack.sh | 2 +-
...asic-auth.yaml => oas-kube-prometheus-stack-basic-auth.yaml} | 2 +-
openappstack/cluster.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename install/templates/{oas-prometheus-basic-auth.yaml => oas-kube-prometheus-stack-basic-auth.yaml} (84%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb243c290..5f2c1a908 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -844,7 +844,7 @@ kube-prometheus-stack-alerts:
allow_failure: true
script:
- *debug_information
- - export BASIC_AUTH_PW=$(python3 -m openappstack $HOSTNAME secrets | grep oas-prometheus-basic-auth | cut -d'=' -f2)
+ - export BASIC_AUTH_PW=$(python3 -m openappstack $HOSTNAME secrets | grep oas-kube-prometheus-stack-basic-auth | cut -d'=' -f2)
- cd test/
- pytest -s -m 'prometheus' --connection=ansible --ansible-inventory=${CLUSTER_DIR}/inventory.yml --hosts='ansible://*'
extends:
diff --git a/flux2/apps/monitoring/kube-prometheus-stack-release.yaml b/flux2/apps/monitoring/kube-prometheus-stack-release.yaml
index 7c252f302..a982303d8 100644
--- a/flux2/apps/monitoring/kube-prometheus-stack-release.yaml
+++ b/flux2/apps/monitoring/kube-prometheus-stack-release.yaml
@@ -135,7 +135,7 @@ spec:
enabled: true
annotations:
nginx.ingress.kubernetes.io/auth-type: basic
- nginx.ingress.kubernetes.io/auth-secret: oas-prometheus-basic-auth
+ nginx.ingress.kubernetes.io/auth-secret: oas-kube-prometheus-stack-basic-auth
nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required'
kubernetes.io/tls-acme: "true"
pathType: ImplementationSpecific
diff --git a/install/install-openappstack.sh b/install/install-openappstack.sh
index 0c7f12b33..2056236ee 100755
--- a/install/install-openappstack.sh
+++ b/install/install-openappstack.sh
@@ -24,7 +24,7 @@ python "$(dirname "$0")/generate_secrets.py" single-sign-on
python "$(dirname "$0")/generate_secrets.py" oauth
# Generate secrets for monitoring
-python "$(dirname "$0")/generate_secrets.py" prometheus
+python "$(dirname "$0")/generate_secrets.py" kube-prometheus-stack
python "$(dirname "$0")/generate_secrets.py" alertmanager
flux create source git openappstack \
diff --git a/install/templates/oas-prometheus-basic-auth.yaml b/install/templates/oas-kube-prometheus-stack-basic-auth.yaml
similarity index 84%
rename from install/templates/oas-prometheus-basic-auth.yaml
rename to install/templates/oas-kube-prometheus-stack-basic-auth.yaml
index d4d2d3552..cb4f6fe32 100644
--- a/install/templates/oas-prometheus-basic-auth.yaml
+++ b/install/templates/oas-kube-prometheus-stack-basic-auth.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
kind: Secret
metadata:
namespace: "oas"
- name: "oas-prometheus-basic-auth"
+ name: "oas-kube-prometheus-stack-basic-auth"
data:
# Readable version of the password for humans who want to log in
pass: "{{ pass | b64encode }}"
diff --git a/openappstack/cluster.py b/openappstack/cluster.py
index 7a36b0380..5680e15d6 100644
--- a/openappstack/cluster.py
+++ b/openappstack/cluster.py
@@ -224,7 +224,7 @@ KUBECONFIG={cluster_dir}/kube_config_cluster.yml
},
'oas': {
'oas-alertmanager-basic-auth': ['pass'],
- 'oas-prometheus-basic-auth': ['pass']
+ 'oas-kube-prometheus-stack-basic-auth': ['pass']
}
}
--
GitLab