Merge pull request #15 from InseeFrLab/metabase-clean-and-add-cert-ma…

…nager

metabase - clean and add use of certmanager

charts/metabase/Chart.yaml

@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.2.1
+version: 1.2.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -31,7 +31,7 @@ appVersion: 1.0.1
 
 dependencies:
   - name: library-chart
-    version: 1.5.17
+    version: 1.5.19
     repository: https://inseefrlab.github.io/helm-charts-interactive-services
   - name: postgresql
     version: 11.6.15

charts/metabase/templates/networkpolicy-ingress.yaml

@@ -1,17 +1 @@
-{{- if .Values.security.networkPolicy.enabled -}}
-{{- if .Values.ingress.enabled -}}
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "library-chart.fullname" . }}-2
-spec:
-  podSelector:
-    matchLabels:
-      {{- include "library-chart.selectorLabels" . | nindent 6 }}
-  ingress:
-  - from:
-    {{- toYaml .Values.security.networkPolicy.from | nindent 4 }}
-  policyTypes:
-  - Ingress
-{{- end }}
-{{- end }} 
+{{ include "library-chart.networkPolicyIngress" . }}

charts/metabase/templates/networkpolicy.yaml

@@ -1,15 +1 @@
-{{- if .Values.security.networkPolicy.enabled -}}
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ include "library-chart.fullname" . }}
-spec:
-  podSelector:
-    matchLabels:
-      {{- include "library-chart.selectorLabels" . | nindent 6 }}
-  ingress:
-  - from:
-    - podSelector: {}
-  policyTypes:
-  - Ingress
-{{- end }} 
+{{ include "library-chart.networkPolicy" . }}

charts/metabase/templates/serviceaccount.yaml

@@ -1,12 +1 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "library-chart.serviceAccountName" . }}
-  labels:
-    {{- include "library-chart.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}
+{{ include "library-chart.serviceAccount" . }}

charts/metabase/values.yaml

@@ -75,7 +75,9 @@ ingress:
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
-
+  useCertManager: false
+  certManagerClusterIssuer: ""
+
 route:
   enabled: false
   annotations: []