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 cb0e57c..51f146b 100644 Binary files a/tatort-0.1.0.tgz and b/tatort-0.1.0.tgz differ 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: