loki fix and cleanup

mojaloop · May 21, 2023 · 992ce41 · 992ce41
1 parent f58e49d
commit 992ce41
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 256 deletions.
diff --git a/argocd/foundation/app-yamls/certmanager-app.yaml b/argocd/foundation/app-yamls/certmanager-app.yaml
diff --git a/argocd/foundation/app-yamls/consul-app.yaml b/argocd/foundation/app-yamls/consul-app.yaml
diff --git a/argocd/foundation/app-yamls/external-dns-app.yaml b/argocd/foundation/app-yamls/external-dns-app.yaml
diff --git a/argocd/foundation/app-yamls/ingress-app.yaml b/argocd/foundation/app-yamls/ingress-app.yaml
diff --git a/argocd/foundation/app-yamls/stateful-services-app.yaml b/argocd/foundation/app-yamls/stateful-services-app.yaml
diff --git a/argocd/foundation/app-yamls/storage-app.yaml b/argocd/foundation/app-yamls/storage-app.yaml
diff --git a/argocd/foundation/app-yamls/vault-app.yaml b/argocd/foundation/app-yamls/vault-app.yaml
diff --git a/terraform/foundation-install/generate-files/templates/loki/chart/Chart.yaml.tpl b/terraform/foundation-install/generate-files/templates/loki/chart/Chart.yaml.tpl
@@ -2,6 +2,6 @@ apiVersion: v2
 version: 1.0.0
 name: loki
 dependencies:
-- name: loki
+- name: loki-chart
   version: ${loki_chart_version}
   repository: ${loki_chart_repo}
diff --git a/terraform/foundation-install/generate-files/templates/loki/chart/values.yaml.tpl b/terraform/foundation-install/generate-files/templates/loki/chart/values.yaml.tpl
@@ -1,4 +1,4 @@
-loki:
+loki-chart:
   grafana:
     enabled: true
     admin:
@@ -18,9 +18,9 @@ loki:
         enabled: ${enable_oidc}
         allow_sign_up: true
         scopes: read_api
-        auth_url: https://${gitlab_server_url}/oauth/authorize
-        token_url: https://${gitlab_server_url}/oauth/token
-        api_url: https://${gitlab_server_url}/api/v4
+        auth_url: ${gitlab_server_url}/oauth/authorize
+        token_url: ${gitlab_server_url}/oauth/token
+        api_url: ${gitlab_server_url}/api/v4
         allowed_groups: ${groups}
         client_id: ${client_id}
         client_secret: ${client_secret}
@@ -43,7 +43,7 @@ loki:
       enabled: true
       ingressClassName: ${ingress_class}
       hosts:
-        - host: grafana.${public_subdomain}
+        - grafana.${public_subdomain}
       tls:
         - hosts:
           - "*.${public_subdomain}"
@@ -66,11 +66,4 @@ loki:
     config:
       table_manager:
         retention_deletes_enabled: true
-        retention_period: 72h     
-
-  promtail:
-    image:
-      registry: docker.io
-      repository: grafana/promtail
-      tag: 2.4.2
-      pullPolicy: IfNotPresent
+        retention_period: 72h
diff --git a/.../foundation-install/generate-files/templates/loki/custom-resources/random-secret.yaml.tpl b/.../foundation-install/generate-files/templates/loki/custom-resources/random-secret.yaml.tpl
@@ -9,7 +9,7 @@ spec:
     serviceAccount:
       name: default
   isKVSecretsEngineV2: false
-  path: "grafana/admin"
+  path: /secret/grafana/
   secretKey: password
   secretFormat:
     passwordPolicyName: "grafana-admin"

diff --git a/...m/foundation-install/generate-files/templates/loki/custom-resources/vault-secret.yaml.tpl b/...m/foundation-install/generate-files/templates/loki/custom-resources/vault-secret.yaml.tpl
@@ -1,7 +1,7 @@
 apiVersion: redhatcop.redhat.io/v1alpha1
 kind: VaultSecret
 metadata:
-  name: ${admin_secret}
+  name: grafana-admin-secret
 spec:
   refreshPeriod: 1m0s
   vaultSecretDefinitions:
@@ -10,11 +10,11 @@ spec:
         role: policy-admin
         serviceAccount:
             name: default
-      name: grafanapw
-      path: grafana/admin
+      name: grafanaadmin
+      path: /secret/grafana/grafana-admin
   output:
-    name: ${admin_secret}
+    name: grafana-admin-secret
     stringData:
-      ${admin_secret_user_key}: ${admin_user_name}
-      ${admin_secret_pw_key}: '{{ .grafanapw.password }}'
+      admin-user: grafana-admin
+      admin-pw: '{{ .grafanaadmin.password }}'
     type: Opaque