From 9da066ff0c1a2feabc59d20215a6f158ebbaa932 Mon Sep 17 00:00:00 2001 From: titver968 Date: Tue, 4 Mar 2025 14:54:56 +0100 Subject: [PATCH] neuer versuch --- index.yaml | 6 +- tatort-0.1.0.tgz | Bin 4701 -> 4123 bytes tatort/templates/deployment.bak | 68 ---------------- tatort/templates/deployment.yaml | 131 ++++++++++--------------------- tatort/templates/ingress.yaml | 2 +- tatort/values.yaml | 7 +- 6 files changed, 53 insertions(+), 161 deletions(-) delete mode 100644 tatort/templates/deployment.bak diff --git a/index.yaml b/index.yaml index 44b2076..051e696 100644 --- a/index.yaml +++ b/index.yaml @@ -3,12 +3,12 @@ entries: tatort: - apiVersion: v2 appVersion: 0.0.1 - created: "2025-03-04T14:34:31.211482+01:00" + created: "2025-03-04T14:54:24.417769+01:00" description: A Helm chart for Kubernetes - digest: 1bc5c86d60922dbc18b20df68085c850305cbbb1d679dfd084e847ca8f4a1e68 + digest: 8752cecdb8a2ef3a33fb858125a066f24ab57d92937a05f0d38fdada2d0e8767 name: tatort type: application urls: - https://gitea.innohub.local:3000/innohub/charts/raw/branch/main/tatort-0.1.0.tgz version: 0.1.0 -generated: "2025-03-04T14:34:31.211095+01:00" +generated: "2025-03-04T14:54:24.417374+01:00" diff --git a/tatort-0.1.0.tgz b/tatort-0.1.0.tgz index cb0e57cd739092762bfa12b326189e0b79917b57..51f146b2558ea3dc0385aab4f546bd06e1a1ecba 100644 GIT binary patch delta 4102 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 P00960Iuvuz0CE5TlE*K+ diff --git a/tatort/templates/deployment.bak b/tatort/templates/deployment.bak deleted file mode 100644 index b995db1..0000000 --- a/tatort/templates/deployment.bak +++ /dev/null @@ -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 }} diff --git a/tatort/templates/deployment.yaml b/tatort/templates/deployment.yaml index 1fa60f7..17a23a1 100644 --- a/tatort/templates/deployment.yaml +++ b/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 }} diff --git a/tatort/templates/ingress.yaml b/tatort/templates/ingress.yaml index 74a1c43..006b7db 100644 --- a/tatort/templates/ingress.yaml +++ b/tatort/templates/ingress.yaml @@ -38,7 +38,7 @@ spec: {{- end }} rules: {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} + - host: {{ .host }} http: paths: {{- range .paths }} diff --git a/tatort/values.yaml b/tatort/values.yaml index 5f0c883..643eabb 100644 --- a/tatort/values.yaml +++ b/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: