diff --git a/kubernetes/envs/commons.yml b/kubernetes/envs/commons.yml index 840bc17..913c4e2 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 # TOOLS nexus-pg: 16.1.2 @@ -54,6 +55,7 @@ releases: # EXTRA-OPERATOR strimzi: true + mongodb: true # TOOLS nexus-pg: true diff --git a/kubernetes/helmfile.yaml b/kubernetes/helmfile.yaml index 308b82f..812df68 100644 --- a/kubernetes/helmfile.yaml +++ b/kubernetes/helmfile.yaml @@ -58,9 +58,13 @@ repositories: - name: jetstack url: https://charts.jetstack.io + - name: mongodb + url: https://mongodb.github.io/helm-charts + - name: sonatype url: https://sonatype.github.io/helm3-charts/ + releases: # Storage - name: storage-snapshot-controller @@ -146,7 +150,10 @@ releases: chart: strimzi/strimzi-kafka-operator <<: *default - # Tools + - name: mongodb + namespace: extra-operator + chart: mongodb/community-operator + - name: nexus-pg namespace: mbcaas-tools chart: bitnami/postgresql 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: 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: "*"