Further refactored and simplified helm chart for personal use, added resource limits.

gitea/templates/_helpers.tpl

@@ -1,4 +1,3 @@
-{{/* vim: set filetype=mustache: */}}
 {{/*
 Expand the name of the chart.
 */}}
@@ -91,14 +90,6 @@ app.kubernetes.io/name: {{ include "gitea.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
-{{- define "postgresql.dns" -}}
-{{- printf "%s-postgresql.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.postgresql.global.postgresql.servicePort -}}
-{{- end -}}
-
-{{- define "memcached.dns" -}}
-{{- printf "%s-memcached.%s.svc.%s:%g" .Release.Name .Release.Namespace .Values.clusterDomain .Values.memcached.service.port | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
 {{- define "gitea.default_domain" -}}
 {{- printf "%s-gitea.%s.svc.%s" (include "gitea.fullname" .) .Release.Namespace .Values.clusterDomain | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -215,7 +206,6 @@ https
 
 {{- define "gitea.inline_configuration.defaults" -}}
   {{- include "gitea.inline_configuration.defaults.server" . -}}
-  {{- include "gitea.inline_configuration.defaults.database" . -}}
 
   {{- if not .Values.gitea.config.repository.ROOT -}}
     {{- $_ := set .Values.gitea.config.repository "ROOT" "/data/git/gitea-repositories" -}}
@@ -226,13 +216,6 @@ https
   {{- if not (hasKey .Values.gitea.config.metrics "ENABLED") -}}
     {{- $_ := set .Values.gitea.config.metrics "ENABLED" .Values.gitea.metrics.enabled -}}
   {{- end -}}
-  {{- if .Values.memcached.enabled -}}
-    {{- $_ := set .Values.gitea.config.cache "ENABLED" "true" -}}
-    {{- $_ := set .Values.gitea.config.cache "ADAPTER" "memcache" -}}
-    {{- if not (.Values.gitea.config.cache.HOST) -}}
-      {{- $_ := set .Values.gitea.config.cache "HOST" (include "memcached.dns" .) -}}
-    {{- end -}}
-  {{- end -}}
 {{- end -}}
 
 {{- define "gitea.inline_configuration.defaults.server" -}}
@@ -278,31 +261,14 @@ https
   {{- end -}}
 {{- end -}}
 
-{{- define "gitea.inline_configuration.defaults.database" -}}
-  {{- if .Values.postgresql.enabled -}}
-    {{- $_ := set .Values.gitea.config.database "DB_TYPE"   "postgres" -}}
-    {{- if not (.Values.gitea.config.database.HOST) -}}
-      {{- $_ := set .Values.gitea.config.database "HOST"      (include "postgresql.dns" .) -}}
-    {{- end -}}
-    {{- $_ := set .Values.gitea.config.database "NAME"      .Values.postgresql.global.postgresql.postgresqlDatabase -}}
-    {{- $_ := set .Values.gitea.config.database "USER"      .Values.postgresql.global.postgresql.postgresqlUsername -}}
-    {{- $_ := set .Values.gitea.config.database "PASSWD"    .Values.postgresql.global.postgresql.postgresqlPassword -}}
-{{- end -}}
-
 {{- define "gitea.init-additional-mounts" -}}
-  {{- /* Honor the deprecated extraVolumeMounts variable when defined */ -}}
   {{- if gt (len .Values.extraInitVolumeMounts) 0 -}}
     {{- toYaml .Values.extraInitVolumeMounts -}}
-  {{- else if gt (len .Values.extraVolumeMounts) 0 -}}
-    {{- toYaml .Values.extraVolumeMounts -}}
   {{- end -}}
 {{- end -}}
 
 {{- define "gitea.container-additional-mounts" -}}
-  {{- /* Honor the deprecated extraVolumeMounts variable when defined */ -}}
   {{- if gt (len .Values.extraContainerVolumeMounts) 0 -}}
     {{- toYaml .Values.extraContainerVolumeMounts -}}
-  {{- else if gt (len .Values.extraVolumeMounts) 0 -}}
-    {{- toYaml .Values.extraVolumeMounts -}}
   {{- end -}}
 {{- end -}}

gitea/templates/gitea/deprecation.yaml

@@ -1,34 +0,0 @@
-{{- if .Values.checkDeprecation -}}
-  {{/* CUSTOM PROBES */}}
-  {{- if .Values.gitea.customLivenessProbe -}}
-    {{- fail "`gitea.customLivenessProbe` does no longer exist. Please refer to the changelog and configure `gitea.livenessProbe` instead." -}}
-  {{- end -}}
-  {{- if .Values.gitea.customReadinessProbe -}}
-    {{- fail "`gitea.customReadinessProbe` does no longer exist. Please refer to the changelog and configure `gitea.readinessProbe` instead." -}}
-  {{- end -}}
-  {{- if .Values.gitea.customStartupProbe -}}
-    {{- fail "`gitea.customStartupProbe` does no longer exist. Please refer to the changelog and configure `gitea.startupProbe` instead." -}}
-  {{- end -}}
-
-  {{/* LDAP SOURCES */}}
-  {{- if kindIs "map" .Values.gitea.ldap -}}
-    {{- fail "You can configure multiple LDAP sources. Please refer to the changelog and switch `gitea.ldap` from object to array notation." -}}
-  {{- end -}}
-  
-  {{/* OAUTH SOURCES */}}
-  {{- if kindIs "map" .Values.gitea.oauth -}}
-    {{- fail "You can configure multiple OAuth sources. Please refer to the changelog and switch `gitea.oauth` from object to array notation." -}}
-  {{- end -}}
-  
-  {{/* BUILTIN */}}
-  {{- if .Values.gitea.cache -}}
-    {{- if .Values.gitea.cache.builtIn -}}
-      {{- fail "`gitea.cache.builtIn` does no longer exist. Please use `memcached` at root level instead." -}}
-    {{- end -}}
-  {{- end -}}
-  {{- if .Values.gitea.database -}}
-    {{- if .Values.gitea.database.builtIn -}}
-      {{- fail "`gitea.database.builtIn` does no longer exist. Builtin databases can be configured inside the dependencies itself. Please refer to the changelog." -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}

gitea/templates/statefulset.yaml

@@ -20,7 +20,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/gitea/config.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
         {{- range $idx, $value := .Values.gitea.ldap }}
         checksum/ldap_{{ $idx }}: {{ include "gitea.ldap_settings" (list $idx $value) | sha256sum }}
         {{- end }}

gitea/templates/tests/test-http-connection.yaml

@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "gitea.fullname" . }}-test-connection"
-  labels:
-{{ include "gitea.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args:  ['{{ include "gitea.fullname" . }}-http:{{ .Values.service.http.port }}']
-  restartPolicy: Never