change some stuff

gdoteof · Jun 11, 2023 · 56b520b · 56b520b
1 parent ce2a297
commit 56b520b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml b/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml
@@ -61,7 +61,7 @@ spec:
           className: nginx
           annotations:
             external-dns.alpha.kubernetes.io/target: "ingress.${SECRET_DOMAIN}"
-            external-dns.alpha.kubernetes.io/hostname: "hubble.monitoring.${SECRET_DOMAIN}"
+            cert-manager.io/cluster-issuer: letsencrypt-production
           hosts:
             - "hubble.monitoring.${SECRET_DOMAIN}"
           tls:

diff --git a/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml b/kubernetes/apps/monitoring/grafana/app/helmrelease.yaml
@@ -84,13 +84,12 @@ spec:
       ingressClassName: nginx
       annotations:
         external-dns.alpha.kubernetes.io/target: "ingress.${SECRET_DOMAIN}"
-        cert-manager.io/cluster-issuer: letsencrypt-production
       hosts:
         - &host "grafana.monitoring.${SECRET_DOMAIN}"
       tls:
         - hosts:
             - *host
-          secretName: vteng-io-production-tls
+          secretName: monitoring-vteng-io-production-tls
     persistence:
       enabled: true
       storageClassName: local-path

diff --git a/kubernetes/apps/networking/ingress-nginx/certificates/certificates.yaml b/kubernetes/apps/networking/ingress-nginx/certificates/certificates.yaml
@@ -13,7 +13,6 @@ spec:
   dnsNames:
     - "${SECRET_DOMAIN}"
     - "*.${SECRET_DOMAIN}"
-    - "*.monitoring.${SECRET_DOMAIN}"
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
@@ -29,4 +28,33 @@ spec:
   dnsNames:
     - "${SECRET_DOMAIN}"
     - "*.${SECRET_DOMAIN}"
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: "monitoring-${SECRET_DOMAIN/./-}-production"
+  namespace: monitoring
+spec:
+  secretName: "monitoring-${SECRET_DOMAIN/./-}-production-tls"
+  issuerRef:
+    name: letsencrypt-production
+    kind: ClusterIssuer
+  commonName: "${SECRET_DOMAIN}"
+  dnsNames:
+    - "monitoring.${SECRET_DOMAIN}"
+    - "*.monitoring.${SECRET_DOMAIN}"
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: "monitoring-${SECRET_DOMAIN/./-}-staging"
+  namespace: monitoring
+spec:
+  secretName: "monitoring-${SECRET_DOMAIN/./-}-staging-tls"
+  issuerRef:
+    name: letsencrypt-staging
+    kind: ClusterIssuer
+  commonName: "${SECRET_DOMAIN}"
+  dnsNames:
+    - "monitoring.${SECRET_DOMAIN}"
     - "*.monitoring.${SECRET_DOMAIN}"