neuer versuch

tatort/templates/deployment.bak

@@ -1,68 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "tatort.fullname" . }}
-  labels:
-    {{- include "tatort.labels" . | nindent 4 }}
-spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
-  selector:
-    matchLabels:
-      {{- include "tatort,selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "tatort,labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-    spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "tatort,serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          livenessProbe:
-            {{- toYaml .Values.livenessProbe | nindent 12 }}
-          readinessProbe:
-            {{- toYaml .Values.readinessProbe | nindent 12 }}
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
-          volumeMounts:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.volumes }}
-      volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}

tatort/templates/deployment.yaml

@@ -1,113 +1,68 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "tatort.fullname" . }}
+  name: {{ include "tatort.fullname" . }}
   labels:
-    app: {{ template "tatort.name" . }}
-    chart: {{ template "tatort.chart" . }}
-    component: tatort
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-    {{- if .Values.deploymentLabels }}
-    {{- toYaml .Values.deploymentLabels | nindent 4 }}
-    {{- end }}
+    {{- include "tatort.labels" . | nindent 4 }}
 spec:
-  strategy:
-  {{ toYaml .Values.updateStrategy | nindent 4 }}
+  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
-      app: {{ template "tatort.name" . }}
-      component: tatort
-      release: {{ .Release.Name }}
+      {{- include "tatort.selectorLabels" . | nindent 6 }}
   template:
     metadata:
+      {{- with .Values.podAnnotations }}
       annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
-        app: {{ template "tatort.name" . }}
-        component: tatort
-        release: {{ .Release.Name }}
-        {{- if .Values.podLabels }}
-        {{- toYaml .Values.podLabels | nindent 8 }}
+        {{- include "tatort.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "tatort.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      serviceAccountName: {{ template "tatort.serviceAccountName" . }}
-      automountServiceAccountToken: {{ .Values.serviceAccounts.automount }}
-      {{- if ne .Values.platform "openshift" }}
-      initContainers:
-        - name: volume-permissions
-          image: "{{ .Values.init.image.repository }}:{{ .Values.init.image.tag }}"
-          imagePullPolicy: {{ .Values.init.image.pullPolicy }}
-          command: ['sh', '-c', 'chown -R 999:999 /data']
-          volumeMounts:
-            - name: shared-data-volume
-              mountPath: /data
-          resources:
-            {{- toYaml .Values.init.resources | nindent 12 }}
-          securityContext:
-            {{- toYaml .Values.init.podSecurityContext | nindent 12 }}
-      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          terminationMessagePolicy: FallbackToLogsOnError
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}
-          env:
-          {{- if .value }}
-            - name: {{ .name }}
-              value: {{ .value | quote }}
-          {{- end }}
-          {{- range $key := .Values.secretEnv }}
-            - name: {{ .name }}
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "tatort.fullname" $ }}-secret
-                  key: {{ .name }}
-          {{- end }}
-          envFrom:
-            {{- with .Values.extraEnvFrom }}
-            {{- tpl . $ | nindent 10 }}
-            {{- end }}
-          readinessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.service.port }}
-            initialDelaySeconds: 20
+              protocol: TCP
           livenessProbe:
-            httpGet:
-              path: /
-              port: {{ .Values.service.port }}
-            initialDelaySeconds: 60
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          {{ if .Values.sharedDataFolder.enabled }}
-          volumeMounts:
-            - name: shared-data-volume
-              mountPath: /data
-          {{ end }}
+            {{- toYaml .Values.livenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.readinessProbe | nindent 12 }}
           resources:
-{{ toYaml .Values.resources | indent 12 }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-{{- if .Values.affinity }}
-      affinity:
-{{ toYaml .Values.affinity | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-      {{ if .Values.sharedDataFolder.enabled }}
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.volumes }}
       volumes:
-      - name: shared-data-volume
-        persistentVolumeClaim:
-          claimName: {{ template "tatort.fullname" . }}-shared-data
-      {{ end }}
-
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

tatort/templates/ingress.yaml

@@ -38,7 +38,7 @@ spec:
   {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
+    - host: {{ .host }}
       http:
         paths:
           {{- range .paths }}

tatort/values.yaml

@@ -27,7 +27,12 @@ ingress:
     # kubernetes.io/tls-acme: "true"
   path: /
   pathtype: ImplementationSpecific
-  hosts: [ tatort.local ]
+  hosts:
+    - host: tatort.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+
   tls: []
 
 route: