Merge pull request #2365 from lsst-sqre/tickets/DM-40204

tickets/DM-40204: get ingress happy with lsst.cloud
lsst-sqre · Jul 31, 2023 · e0f8ee8 · e0f8ee8
2 parents b9e0c96 + 08017bb
commit e0f8ee8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/applications/gafaelfawr/values-roundtable-dev.yaml b/applications/gafaelfawr/values-roundtable-dev.yaml
@@ -47,3 +47,4 @@ ingress:
   additionalHosts:
     - "git-lfs-dev.lsst.cloud"
     - "git-lfs-dev-rw.lsst.cloud"
+    - "monitoring-dev.lsst.cloud"
diff --git a/applications/giftless/templates/ingress.yaml b/applications/giftless/templates/ingress.yaml
@@ -4,17 +4,17 @@ metadata:
   name: {{ include "giftless.fullname" . }}
   labels:
     {{- include "giftless.labels" . | nindent 4 }}
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-dns"
-    {{- with .Values.ingress.annotations }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
 config:
   baseUrl: "https://{{ .Values.ingress.hostname.readonly }}"
   scopes:
     anonymous: true
 template:
   metadata:
+    annotations:
+      cert-manager.io/cluster-issuer: "letsencrypt-dns"
+      {{- with .Values.ingress.annotations }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
     name: {{ include "giftless.fullname" . }}
   spec:
     tls:
@@ -36,15 +36,9 @@ template:
 apiVersion: gafaelfawr.lsst.io/v1alpha1
 kind: GafaelfawrIngress
 metadata:
-  name: "giftless-rw"
   name: {{ template "giftless.fullname" . }}-rw
   labels:
-    {{- include "giftless-rw.labels" . | nindent 4 }}
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-dns"
-    {{- with .Values.ingress.annotations }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- include "giftless.labels" . | nindent 4 }}
 config:
   baseUrl: "https://{{ .Values.ingress.hostname.readwrite }}"
   scopes:
@@ -53,6 +47,11 @@ config:
 template:
   metadata:
     name: {{ template "giftless.fullname" . }}-rw
+    annotations:
+      cert-manager.io/cluster-issuer: "letsencrypt-dns"
+      {{- with .Values.ingress.annotations }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
   spec:
     tls:
       - hosts:

diff --git a/applications/monitoring/templates/ingress.yaml b/applications/monitoring/templates/ingress.yaml
@@ -4,31 +4,31 @@ metadata:
   name: "chronograf"
   labels:
     {{- include "monitoring.labels" . | nindent 4 }}
-  annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-dns"
-    {{- with .Values.ingress.chronograf.annotations }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
 config:
   baseUrl: "https://{{ .Values.ingress.chronograf.hostname }}"
   scopes:
     anonymous: true  # We will use Chronograf auth for now.
 template:
   metadata:
     name: "chronograf"
-    spec:
-      tls:
-        - hosts:
-          - {{ .Values.ingress.chronograf.hostname | quote }}
-          secretName: tls
-      rules:
-        - host: {{ .Values.ingress.chronograf.hostname | quote }}
-          http:
-            paths:
-              - path: "/"
-                pathType: "Prefix"
-                backend:
-                  service:
+    annotations:
+      cert-manager.io/cluster-issuer: "letsencrypt-dns"
+      {{- with .Values.ingress.chronograf.annotations }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
+  spec:
+    tls:
+      - hosts:
+        - {{ .Values.ingress.chronograf.hostname | quote }}
+        secretName: tls
+    rules:
+      - host: {{ .Values.ingress.chronograf.hostname | quote }}
+        http:
+          paths:
+            - path: "/"
+              pathType: "Prefix"
+              backend:
+                service:
                   name: monitoring-chronograf
                   port:
                     number: 80
diff --git a/applications/monitoring/values-roundtable-dev.yaml b/applications/monitoring/values-roundtable-dev.yaml
@@ -3,6 +3,6 @@ chronograf:
     GH_CLIENT_ID: "e85fe410b0021a251180"
 cronjob:
   debug: true
-ingresses:
+ingress:
   chronograf:
     hostname: "monitoring-dev.lsst.cloud"