From 0f590ab248c6df1d59ea6c9db57a91f0178c60d0 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 27 Jul 2023 14:17:58 -0700 Subject: [PATCH 1/7] Correct config key name --- applications/monitoring/values-roundtable-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/monitoring/values-roundtable-dev.yaml b/applications/monitoring/values-roundtable-dev.yaml index 031de91c55..ec948c5cce 100644 --- 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" From be24cf9bdcc641e0b2f17f1df4b2f8083f193e79 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 27 Jul 2023 14:20:12 -0700 Subject: [PATCH 2/7] Correct ingress definition --- applications/monitoring/templates/ingress.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/monitoring/templates/ingress.yaml b/applications/monitoring/templates/ingress.yaml index c50f8f15a2..6fbe0a7427 100644 --- a/applications/monitoring/templates/ingress.yaml +++ b/applications/monitoring/templates/ingress.yaml @@ -29,6 +29,6 @@ template: pathType: "Prefix" backend: service: - name: monitoring-chronograf - port: - number: 80 + name: monitoring-chronograf + port: + number: 80 From 15794d7ce48ce8214f2bbcb2249619d2b6d5c47f Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 27 Jul 2023 14:49:56 -0700 Subject: [PATCH 3/7] Correct ingress indentation --- .../monitoring/templates/ingress.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/applications/monitoring/templates/ingress.yaml b/applications/monitoring/templates/ingress.yaml index 6fbe0a7427..e8d7a66d19 100644 --- a/applications/monitoring/templates/ingress.yaml +++ b/applications/monitoring/templates/ingress.yaml @@ -16,17 +16,17 @@ config: 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" + 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 From 96842051c0f0b4aa466956b5f1c0db79f959c589 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 27 Jul 2023 14:51:31 -0700 Subject: [PATCH 4/7] Correct ingress indentation --- applications/monitoring/templates/ingress.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/monitoring/templates/ingress.yaml b/applications/monitoring/templates/ingress.yaml index e8d7a66d19..5c5b641f3c 100644 --- a/applications/monitoring/templates/ingress.yaml +++ b/applications/monitoring/templates/ingress.yaml @@ -27,8 +27,8 @@ template: paths: - path: "/" pathType: "Prefix" - backend: - service: - name: monitoring-chronograf - port: - number: 80 + backend: + service: + name: monitoring-chronograf + port: + number: 80 From 7ffee46475a1289fb844fa1050472cd96678197f Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 28 Jul 2023 10:26:38 -0700 Subject: [PATCH 5/7] Add monitoring-dev to GF for anonymous auth --- applications/gafaelfawr/values-roundtable-dev.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/gafaelfawr/values-roundtable-dev.yaml b/applications/gafaelfawr/values-roundtable-dev.yaml index 8af02989fb..98dc65924b 100644 --- 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" From a60ee560ea9f5fafca3060d9653107c8a2415e6b Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 31 Jul 2023 12:14:48 -0700 Subject: [PATCH 6/7] fix giftless annotations --- applications/giftless/templates/ingress.yaml | 23 ++++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/applications/giftless/templates/ingress.yaml b/applications/giftless/templates/ingress.yaml index 40e18393a5..b990ead3b7 100644 --- 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: From 08017bb01c7f286f2f377fa267f6a7a4c4064f36 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 31 Jul 2023 12:15:56 -0700 Subject: [PATCH 7/7] Fix monitoring ingress annotations --- applications/monitoring/templates/ingress.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/monitoring/templates/ingress.yaml b/applications/monitoring/templates/ingress.yaml index 5c5b641f3c..0cfac115df 100644 --- a/applications/monitoring/templates/ingress.yaml +++ b/applications/monitoring/templates/ingress.yaml @@ -4,11 +4,6 @@ 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: @@ -16,6 +11,11 @@ config: template: metadata: name: "chronograf" + annotations: + cert-manager.io/cluster-issuer: "letsencrypt-dns" + {{- with .Values.ingress.chronograf.annotations }} + {{- toYaml . | nindent 6 }} + {{- end }} spec: tls: - hosts: