From 4d8dc993d4172c5119e6abbe1f609966f474aae1 Mon Sep 17 00:00:00 2001 From: Brice MICHALSKI Date: Fri, 7 Jun 2024 15:49:05 +0200 Subject: [PATCH 1/2] fix error page --- kubernetes/envs/commons.yml | 2 ++ kubernetes/helmfile.yaml | 8 ++++++++ kubernetes/modules/error-pages.gotmpl | 17 ++++++++++------- kubernetes/modules/keycloak.gotmpl | 2 +- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/kubernetes/envs/commons.yml b/kubernetes/envs/commons.yml index 7cb25a5..c2a2673 100644 --- a/kubernetes/envs/commons.yml +++ b/kubernetes/envs/commons.yml @@ -25,6 +25,7 @@ releases: # EXTRA-OPERATOR strimzi: 0.33.2 + mongodb: 0.9.0 installed: # STORAGE @@ -50,6 +51,7 @@ releases: # EXTRA-OPERATOR strimzi: true + mongodb: true apps: version: diff --git a/kubernetes/helmfile.yaml b/kubernetes/helmfile.yaml index da0119e..21f8f7f 100644 --- a/kubernetes/helmfile.yaml +++ b/kubernetes/helmfile.yaml @@ -58,6 +58,9 @@ repositories: - name: jetstack url: https://charts.jetstack.io + - name: mongodb + url: https://mongodb.github.io/helm-charts + releases: # Storage @@ -143,3 +146,8 @@ releases: namespace: extra-operator chart: strimzi/strimzi-kafka-operator <<: *default + + - name: mongodb + namespace: extra-operator + chart: mongodb/community-operator + <<: *default diff --git a/kubernetes/modules/error-pages.gotmpl b/kubernetes/modules/error-pages.gotmpl index 15f4680..fd305bd 100644 --- a/kubernetes/modules/error-pages.gotmpl +++ b/kubernetes/modules/error-pages.gotmpl @@ -1,22 +1,25 @@ --- image: - tag: {{ .Values.apps.version.errorPages}} + tag: {{ .Values.apps.version.errorPages }} + env: TEMPLATE_NAME: connection SHOW_DETAILS: "false" ingress: main: enabled: true + primary: true annotations: {{ toYaml .Values.helper.ingress.annotations.common | nindent 6 }} hosts: - - host: + - host: {{ .Values.dns.errorPages }} paths: - - path: "/" + - path: / pathType: Prefix - tls: - - hosts: - - {{ .Values.dns.errorPages}} - secretName: mbcaas.com-cert + tls: + - secretName: mbcaas.com-cert + hosts: + - {{ .Values.dns.errorPages }} + resources: {{ toYaml .Values.quotas.errorpages | nindent 2}} diff --git a/kubernetes/modules/keycloak.gotmpl b/kubernetes/modules/keycloak.gotmpl index 41b5f94..3bf47a3 100644 --- a/kubernetes/modules/keycloak.gotmpl +++ b/kubernetes/modules/keycloak.gotmpl @@ -15,7 +15,7 @@ ingress: enabled: true hostname: {{ .Values.dns.keycloak }} annotations: - {{ toYaml .Values.helper.ingress.annotations.common | nindent 6 }} + {{ toYaml .Values.helper.ingress.annotations.common | nindent }} postgresql: From a897385410b58a4e2f574d8c6c5bab18cd025faf Mon Sep 17 00:00:00 2001 From: Brice MICHALSKI Date: Fri, 7 Jun 2024 16:31:55 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Mongo=20op=C3=A9rator=20watch=20all=20names?= =?UTF-8?q?pace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubernetes/modules/mongodb.gotmpl | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 kubernetes/modules/mongodb.gotmpl diff --git a/kubernetes/modules/mongodb.gotmpl b/kubernetes/modules/mongodb.gotmpl new file mode 100644 index 0000000..fcf11c2 --- /dev/null +++ b/kubernetes/modules/mongodb.gotmpl @@ -0,0 +1,2 @@ +operator: + watchNamespace: "*"