Spark thrift server use library-charts tpl & add useCertManager (#64)

charts/spark-thrift-server/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: 0.4.4
+version: 0.4.5
 
 # 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,5 +31,5 @@ appVersion: "1"
 
 dependencies:
   - name: library-chart
-    version: 1.5.17
+    version: 1.5.18
     repository: https://inseefrlab.github.io/helm-charts-interactive-services

charts/spark-thrift-server/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/spark-thrift-server/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/spark-thrift-server/templates/role-binding.yaml

@@ -1,18 +1 @@
-{{- if .Values.serviceAccount.create -}}
-{{- if .Values.kubernetes.enable -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "library-chart.serviceAccountName" . }}
-  labels:
-    {{- include "library-chart.labels" . | nindent 4 }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ .Values.kubernetes.role}}
-subjects:
-- kind: ServiceAccount
-  name: {{ include "library-chart.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
-{{- end }}
-{{- end }}
+{{ include "library-chart.roleBinding" . }}

charts/spark-thrift-server/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/spark-thrift-server/values.yaml

@@ -83,7 +83,7 @@ serviceAccount:
   name: ""
 
 kubernetes:
-  enable: true
+  enabled: true
   role: "edit"
 
 readiness:
@@ -138,6 +138,8 @@ ingress:
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
+  useCertManager: false
+  certManagerClusterIssuer: ""
 
 route:
   enabled: false