rename oas-prometheus-basic-auth secret to conform naming convention

.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:

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

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 \

install/templates/oas-prometheus-basic-auth.yaml → 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 }}"

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']
             }
         }