From 6cf0c153f3d1a691c217fbdcfe2257488d9ed58a Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Apr 2022 10:33:54 -0300 Subject: [PATCH 1/2] [FIX] two annotations for two ingress --- charts/orb/templates/ingress.yaml | 8 ++++---- charts/orb/values.yaml | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/charts/orb/templates/ingress.yaml b/charts/orb/templates/ingress.yaml index 4c2d72f..0b4db85 100644 --- a/charts/orb/templates/ingress.yaml +++ b/charts/orb/templates/ingress.yaml @@ -4,9 +4,9 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: -{{- if .Values.ingress.annotations }} +{{- if .Values.ingress.annotations-nginx }} annotations: -{{ toYaml .Values.ingress.annotations | indent 4 }} +{{ toYaml .Values.ingress.annotations-nginx | indent 4 }} {{- end }} name: {{ .Release.Name }}-nginx-ingress spec: @@ -37,9 +37,9 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: -{{- if .Values.ingress.annotations }} +{{- if .Values.ingress.annotations-nginx-rewrite }} annotations: -{{ toYaml .Values.ingress.annotations | indent 4 }} +{{ toYaml .Values.ingress.annotations-nginx-rewrite | indent 4 }} {{- end }} name: {{ .Release.Name }}-nginx-rewrite-ingress spec: diff --git a/charts/orb/values.yaml b/charts/orb/values.yaml index ffc5b4f..e65cd50 100644 --- a/charts/orb/values.yaml +++ b/charts/orb/values.yaml @@ -26,7 +26,9 @@ smtp: ingress: ingressClassName: "nginx" - annotations: + annotations-nginx: + cert-manager.io/issuer: "letsencrypt-prod" + annotations-nginx-rewrite: cert-manager.io/issuer: "letsencrypt-prod" nginx.ingress.kubernetes.io/rewrite-target: /$1 hostname: "" From ab72ceba99f9d960fa9201f9917d1c78ea04bd95 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Apr 2022 11:02:17 -0300 Subject: [PATCH 2/2] [FIX] bump to release after tests --- charts/orb/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/orb/Chart.yaml b/charts/orb/Chart.yaml index 3088297..9e01c57 100644 --- a/charts/orb/Chart.yaml +++ b/charts/orb/Chart.yaml @@ -10,7 +10,7 @@ name: orb description: Orb Observability Platform icon: https://avatars1.githubusercontent.com/u/13207490 type: application -version: 1.0.15 +version: 1.0.16 appVersion: "0.14.0" home: https://getorb.io sources: