From 215f0bb96ade46b27499a84974ed3755c8f19877 Mon Sep 17 00:00:00 2001
From: Luke Repko <luke.repko@rackspace.com>
Date: Fri, 15 Nov 2024 12:51:43 -0600
Subject: [PATCH] fix: correct miscellaneous typos (#569)

* fix: True up grafana installation

While re-deploying one of our environments, these small changes were
identified and are being backported to upstream for the grafana install.

* fix: update heat image urls for octavia
---
 .../octavia/octavia-helm-overrides.yaml       | 14 +++++------
 .../grafana/base/azure-client-secret.yaml     |  6 ++---
 base-kustomize/grafana/base/datasources.yaml  |  4 ++--
 .../grafana/base/grafana-values.yaml          | 24 ++++++++++---------
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/base-helm-configs/octavia/octavia-helm-overrides.yaml b/base-helm-configs/octavia/octavia-helm-overrides.yaml
index e1051892..8bb31db0 100644
--- a/base-helm-configs/octavia/octavia-helm-overrides.yaml
+++ b/base-helm-configs/octavia/octavia-helm-overrides.yaml
@@ -21,13 +21,13 @@ labels:
 images:
   tags:
     test: "quay.io/rackspace/rackerlabs-xrally-openstack:2.0.0"
-    bootstrap: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
-    db_init: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
-    db_drop: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
+    bootstrap: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    db_drop: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
     rabbit_init: "quay.io/rackspace/rackerlabs-rabbitmq:3.13-management"
-    ks_user: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
-    ks_service: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
-    ks_endpoints: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_user: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_service: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
+    ks_endpoints: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
     dep_check: "quay.io/rackspace/rackerlabs-kubernetes-entrypoint:v1.0.0"
     image_repo_sync: "quay.io/rackspace/rackerlabs-docker:17.07.0"
     octavia_db_sync: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
@@ -35,7 +35,7 @@ images:
     octavia_worker: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
     octavia_housekeeping: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
     octavia_health_manager: "quay.io/rackspace/rackerlabs-octavia-ovn:master-ubuntu_jammy"
-    octavia_health_manager_init: "quay.rackspace.com/rackerlabs-heat:2024.1-ubuntu_jammy"
+    octavia_health_manager_init: "quay.io/rackspace/rackerlabs-heat:2024.1-ubuntu_jammy"
     openvswitch_vswitchd: docker.io/kolla/centos-source-openvswitch-vswitchd:rocky
   pull_policy: "IfNotPresent"
   local_registry:
diff --git a/base-kustomize/grafana/base/azure-client-secret.yaml b/base-kustomize/grafana/base/azure-client-secret.yaml
index e707a00c..a8bc2900 100644
--- a/base-kustomize/grafana/base/azure-client-secret.yaml
+++ b/base-kustomize/grafana/base/azure-client-secret.yaml
@@ -1,9 +1,9 @@
-apiversion: v1
+apiVersion: v1
 data:
   client_id: base64_encoded_client_id
   client_secret: base64_encoded_client_secret
-kind: secret
+kind: Secret
 metadata:
   name: azure-client
   namespace: grafana
-type: opaque
+type: Opaque
diff --git a/base-kustomize/grafana/base/datasources.yaml b/base-kustomize/grafana/base/datasources.yaml
index 6ae7e3a3..372ae87f 100644
--- a/base-kustomize/grafana/base/datasources.yaml
+++ b/base-kustomize/grafana/base/datasources.yaml
@@ -2,12 +2,12 @@ datasources:
   datasources.yaml:
     apiversion: 1
     datasources:
-    - name: prometheus
+    - name: Prometheus
       type: prometheus
       access: proxy
       url: http://kube-prometheus-stack-prometheus.prometheus.svc.cluster.local:9090
       isdefault: true
-    - name: loki
+    - name: Loki
       type: loki
       access: proxy
       url: http://loki-gateway.{{ $.Release.Namespace }}.svc.cluster.local:80
diff --git a/base-kustomize/grafana/base/grafana-values.yaml b/base-kustomize/grafana/base/grafana-values.yaml
index e78b6a74..53ff7621 100644
--- a/base-kustomize/grafana/base/grafana-values.yaml
+++ b/base-kustomize/grafana/base/grafana-values.yaml
@@ -5,18 +5,9 @@ tenant_id: 122333 # TODO: update this value to use your Azure Tenant ID
 
 ingress:
   enabled: false
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /
-  path: /
-  pathType: ImplementationSpecific
-
-  hosts:
-    - "{{ .Values.custom_host }}"  # Ref: custom_host variable above
-  tls:
-  - hosts:
-    - "{{ .Values.custom_host }}"  # Ref: custom_host variable above
-    secretName: grafana-tls-public
 
+image:
+  tag: "10.3.3"
 
 extraSecretMounts:
   - name: azure-client-secret-mount
@@ -24,6 +15,11 @@ extraSecretMounts:
     defaultMode: 0440
     mountPath: /etc/secrets/azure-client
     readOnly: true
+  - name: grafana-db-secret-mount
+    secretName: grafana-db
+    defaultMode: 0440
+    mountPath: /etc/secrets/grafana-db
+    readOnly: true
 nodeSelector:
   openstack-control-plane: enabled
 grafana.ini:
@@ -56,3 +52,9 @@ grafana.ini:
     allow_assign_grafana_admin: false
     skip_org_role_sync: false
     use_pkce: true
+  database:
+    type: mysql
+    host: mariadb-cluster-primary.openstack.svc:3306
+    user: $__file{/etc/secrets/grafana-db/username}
+    password:  $__file{/etc/secrets/grafana-db/password}
+    name: grafana