does it bang?

gdoteof · Jun 11, 2023 · 9735d91 · 9735d91
1 parent 2f18941
commit 9735d91
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 61 deletions.
diff --git a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml
@@ -90,6 +90,7 @@ spec:
       tls:
         - hosts:
             - *host
+            - "grafana.monitoring.${SECRET_DOMAIN}"
           secretName: vteng-io-production-tls
     persistence:
       enabled: true

diff --git a/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml b/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml
@@ -35,40 +35,3 @@ spec:
       annotations:
         metallb.universe.tf/loadBalancerIPs: "${METALLB_K8S_GATEWAY_ADDR}"
       externalTrafficPolicy: Local
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: k8s-gateway-monitoring
-  namespace: networking
-spec:
-  interval: 15m
-  chart:
-    spec:
-      chart: k8s-gateway
-      version: 2.0.4
-      sourceRef:
-        kind: HelmRepository
-        name: k8s-gateway
-        namespace: flux-system
-  maxHistory: 2
-  install:
-    createNamespace: true
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      retries: 3
-  uninstall:
-    keepHistory: false
-  values:
-    fullnameOverride: k8s-gateway-monitoring
-    domain: "monitoring.${SECRET_DOMAIN}"
-    ttl: 1
-    service:
-      type: LoadBalancer
-      port: 53
-      annotations:
-        metallb.universe.tf/loadBalancerIPs: "10.10.1.250"
-      externalTrafficPolicy: Local
diff --git a/kubernetes/flux/vars/cluster-secrets.sops.yaml b/kubernetes/flux/vars/cluster-secrets.sops.yaml
@@ -1,29 +1,30 @@
+---
 apiVersion: v1
 kind: Secret
 metadata:
-    name: cluster-secrets
-    namespace: flux-system
+  name: cluster-secrets
+  namespace: flux-system
 stringData:
-    SECRET_DOMAIN: ENC[AES256_GCM,data:gB8zDZ7s6rM=,iv:p05QYp6mt5AZuzgdIErXbou+P7Wlm4Mzn4VmvokGE9M=,tag:EaoWlEypUZuGDp988p2Ggg==,type:str]
-    SECRET_CLOUDFLARE_EMAIL: ENC[AES256_GCM,data:nsogrCsHPiV9EOO10h2gCwqG4yhrwdrQtxq0,iv:BiiUGXOtxuXWG5bau2ZTx34mSFhYSpHwxdWI1c7Tk3k=,tag:CCqQjcFQeKOvJwn83lUguw==,type:str]
-    SECRET_CLOUDFLARE_TUNNEL_ID: ENC[AES256_GCM,data:1t5eJuwCyjnYDqosMjVeVj9EcS9iBckbNnuV35VwMqjGIp5/,iv:AnqGOgjjbrzSN3tPG7CU7RAuDJ1WGTwxcw98z4VaOS4=,tag:YND2Ykk+xoNVwh4hrsL9oQ==,type:str]
+  SECRET_DOMAIN: ENC[AES256_GCM,data:gB8zDZ7s6rM=,iv:p05QYp6mt5AZuzgdIErXbou+P7Wlm4Mzn4VmvokGE9M=,tag:EaoWlEypUZuGDp988p2Ggg==,type:str]
+  SECRET_CLOUDFLARE_EMAIL: ENC[AES256_GCM,data:nsogrCsHPiV9EOO10h2gCwqG4yhrwdrQtxq0,iv:BiiUGXOtxuXWG5bau2ZTx34mSFhYSpHwxdWI1c7Tk3k=,tag:CCqQjcFQeKOvJwn83lUguw==,type:str]
+  SECRET_CLOUDFLARE_TUNNEL_ID: ENC[AES256_GCM,data:1t5eJuwCyjnYDqosMjVeVj9EcS9iBckbNnuV35VwMqjGIp5/,iv:AnqGOgjjbrzSN3tPG7CU7RAuDJ1WGTwxcw98z4VaOS4=,tag:YND2Ykk+xoNVwh4hrsL9oQ==,type:str]
 sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1hna22e7vukyxq8fru4xkeuq9c7lammpydmduhws2qg4ck47knglsl5760g
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzakFFY3IrVFkzTHRPVTB2
-            aUgweCttY2FSVUhNbWp6aGpVNEdjTHVvQnpRCkI4bHN6Rk5qQUc2TXdOakdzSld5
-            QXpZR01hR0pQd1QxN2tvVitCeFYvc0UKLS0tIDZmYUU2QVdiTmpOeTcrcnlkZXpR
-            K2lRRFQvRzA0UVkzczhXKzdJUTBBQkUKgcoPfHctDxJAVdPlY4N4KlNtANclu1jV
-            GoSYFgd1mk4Sb95DJ+I5LaCqSVXLzeYRQUcnIRkhqHxd82cLlT/tPA==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-06-08T22:38:56Z"
-    mac: ENC[AES256_GCM,data:NBhIoV3lN56vgKSYSo9Y5XpKb//JAG+6xpsFaaT3BTUaVFYu58BFBsQuLXMdnv7nsHuqRdxUE9OWhoWlEMtqDaNY46dSxCTSSdhVDsErT1J9e59QAJ8A8ZDcHqXkHZH5+69hWh/ymz9RqRjqB3LHTkfAU05i7JkyCzo4gQZ/emM=,iv:KyQJXohDhmfdjlfwhRYJSWE1wO+BjqpOzH07v8O30IA=,tag:oUZ9iXnW4svJexW5kjvuHw==,type:str]
-    pgp: []
-    encrypted_regex: ^(data|stringData)$
-    version: 3.7.3
+  kms: []
+  gcp_kms: []
+  azure_kv: []
+  hc_vault: []
+  age:
+    - recipient: age1hna22e7vukyxq8fru4xkeuq9c7lammpydmduhws2qg4ck47knglsl5760g
+      enc: |
+        -----BEGIN AGE ENCRYPTED FILE-----
+        YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzakFFY3IrVFkzTHRPVTB2
+        aUgweCttY2FSVUhNbWp6aGpVNEdjTHVvQnpRCkI4bHN6Rk5qQUc2TXdOakdzSld5
+        QXpZR01hR0pQd1QxN2tvVitCeFYvc0UKLS0tIDZmYUU2QVdiTmpOeTcrcnlkZXpR
+        K2lRRFQvRzA0UVkzczhXKzdJUTBBQkUKgcoPfHctDxJAVdPlY4N4KlNtANclu1jV
+        GoSYFgd1mk4Sb95DJ+I5LaCqSVXLzeYRQUcnIRkhqHxd82cLlT/tPA==
+        -----END AGE ENCRYPTED FILE-----
+  lastmodified: "2023-06-08T22:38:56Z"
+  mac: ENC[AES256_GCM,data:NBhIoV3lN56vgKSYSo9Y5XpKb//JAG+6xpsFaaT3BTUaVFYu58BFBsQuLXMdnv7nsHuqRdxUE9OWhoWlEMtqDaNY46dSxCTSSdhVDsErT1J9e59QAJ8A8ZDcHqXkHZH5+69hWh/ymz9RqRjqB3LHTkfAU05i7JkyCzo4gQZ/emM=,iv:KyQJXohDhmfdjlfwhRYJSWE1wO+BjqpOzH07v8O30IA=,tag:oUZ9iXnW4svJexW5kjvuHw==,type:str]
+  pgp: []
+  encrypted_regex: ^(data|stringData)$
+  version: 3.7.3