elastic use library-charts tpl & add useCertManager (#60)

charts/elastic/Chart.yaml

@@ -23,7 +23,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: 0.2.1
+version: 0.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
@@ -37,5 +37,5 @@ dependencies:
     version: 7.17.3
     repository: https://helm.elastic.co
   - name: library-chart
-    version: 1.5.16
+    version: 1.5.18
     repository: https://inseefrlab.github.io/helm-charts-interactive-services

charts/elastic/templates/ingress.yaml

@@ -16,6 +16,9 @@ spec:
   tls:
     - hosts:
         - {{ .Values.ingress.hostname | quote }}
+    {{- if .Values.ingress.useCertManager }}
+      secretName: tls-cert-{{ include "library-chart.fullname" . }}
+    {{- end }}
 {{- end }}
   rules:
     - host: {{ .Values.ingress.hostname | quote }}

charts/elastic/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:
-      release: {{ .Release.Name | quote }}
-  ingress:
-  - from:
-    {{- toYaml .Values.security.networkPolicy.from | nindent 4 }}
-  policyTypes:
-  - Ingress
-{{- end }}
-{{- end }} 
+{{ include "library-chart.networkPolicyIngress" . }}

charts/elastic/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:
-      release: {{ .Release.Name | quote }}
-  ingress:
-  - from:
-    - podSelector: {}
-  policyTypes:
-  - Ingress
-{{- end }} 
+{{ include "library-chart.networkPolicy" . }}

charts/elastic/templates/route.yaml

@@ -1,34 +1 @@
-{{- if .Values.route.enabled -}}
-{{- $svcPort := .Values.kibana.service.port -}}
-apiVersion: route.openshift.io/v1
-kind: Route
-metadata:
-  name: {{ .Release.Name }}-kibana
-  labels:
-    {{- include "library-chart.labels" . | nindent 4 }}
-  annotations:
-    {{- include "library-chart.route.annotations" . | nindent 4 }}
-spec:
-  host: {{ .Values.route.hostname | quote }}
-  path: /
-  to:
-    kind: Service
-    name: {{ .Release.Name }}-kibana
-  port: 
-    targetPort: {{ $svcPort }}
-  tls:
-    termination: {{ .Values.route.tls.termination }}
-    {{- if .Values.route.tls.key }}
-    key: {{- .Values.route.tls.key }}
-    {{- end }}
-    {{- if .Values.route.tls.certificate }}
-    certificate: {{- .Values.route.tls.certificate }}
-    {{- end }}
-    {{- if .Values.route.tls.caCertificate }}
-    caCertificate: {{- .Values.route.tls.caCertificate }}
-    {{- end }}
-    {{- if .Values.route.tls.destinationCACertificate }}
-    destinationCACertificate: {{- .Values.route.tls.destinationCACertificate }}
-    {{- end }}
-  wildcardPolicy: {{ .Values.route.wildcardPolicy }}
-{{- end }}
+{{ include "library-chart.route" . }}

charts/elastic/values.yaml

@@ -30,6 +30,8 @@ ingress:
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
+  useCertManager: false
+  certManagerClusterIssuer: ""
 
 route:
   enabled: false