diff --git a/charts/metabase/Chart.yaml b/charts/metabase/Chart.yaml index 77dbc61..cb01492 100644 --- a/charts/metabase/Chart.yaml +++ b/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 diff --git a/charts/metabase/templates/networkpolicy-ingress.yaml b/charts/metabase/templates/networkpolicy-ingress.yaml index b1edae9..3003d2d 100644 --- a/charts/metabase/templates/networkpolicy-ingress.yaml +++ b/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 }} \ No newline at end of file +{{ include "library-chart.networkPolicyIngress" . }} \ No newline at end of file diff --git a/charts/metabase/templates/networkpolicy.yaml b/charts/metabase/templates/networkpolicy.yaml index a7bfb13..0fd137c 100644 --- a/charts/metabase/templates/networkpolicy.yaml +++ b/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 }} \ No newline at end of file +{{ include "library-chart.networkPolicy" . }} \ No newline at end of file diff --git a/charts/metabase/templates/serviceaccount.yaml b/charts/metabase/templates/serviceaccount.yaml index c49b104..f9d4032 100644 --- a/charts/metabase/templates/serviceaccount.yaml +++ b/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" . }} \ No newline at end of file diff --git a/charts/metabase/values.yaml b/charts/metabase/values.yaml index 84c55ec..a26da8b 100644 --- a/charts/metabase/values.yaml +++ b/charts/metabase/values.yaml @@ -75,7 +75,9 @@ ingress: # - secretName: chart-example-tls # hosts: # - chart-example.local - + useCertManager: false + certManagerClusterIssuer: "" + route: enabled: false annotations: []