volker.raschekandCopilot
0a237ba2c1
The previous notation mixed two concerns in a single flat dict: `create`/`name` decided whether the chart manages the
ServiceAccount or only references an externally provided one, while the remaining keys only ever applied to a
chart-managed ServiceAccount. That made `name` ambiguous, because it either renamed the generated object or pointed to a
foreign one, and it forced the deployment to guard the reference with `or .Values.serviceAccount.create
.Values.serviceAccount.name`.
The values are now grouped the same way as `persistence`, which was restructured in dfe087c. `serviceAccount.enabled`
controls whether the pod uses a ServiceAccount at all, `serviceAccount.existingServiceAccount` references an externally
managed object and `serviceAccount.new` holds the properties of the object created by the chart. The templates follow
the established helper layout in `templates/gitea/_serviceAccounts.tpl`.
Two latent bugs are fixed along the way. The annotation helper was defined as `gitea.secret.admin.annotations`, so the
`gitea.serviceAccount.annotations` include in the template never resolved. And the duplicated name helper
`gitea.serviceAccountName` in `templates/_helpers.tpl` is removed in favour of `gitea.serviceAccount.name`.
BREAKING CHANGE:
- `serviceAccount.create` does no longer exist. Use `serviceAccount.enabled` instead. The default changed from `false`
to `true`, so a ServiceAccount is now created unless it is explicitly disabled.
- `serviceAccount.name` does no longer exist. Use `serviceAccount.existingServiceAccount.enabled` together with
`serviceAccount.existingServiceAccount.existingServiceAccountName` to reference an externally managed ServiceAccount.
- `serviceAccount.annotations`, `serviceAccount.labels`, `serviceAccount.automountServiceAccountToken` and
`serviceAccount.imagePullSecrets` moved below `serviceAccount.new`.
Co-authored-by: Copilot <copilot@github.com>
222 lines
8.3 KiB
YAML
222 lines
8.3 KiB
YAML
{{- if .Values.deployment.enabled -}}
|
|
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
{{- with (include "gitea.deployment.annotations" . | fromYaml) }}
|
|
annotations:
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
{{- with (include "gitea.deployment.labels" . | fromYaml) }}
|
|
labels:
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
name: {{ include "gitea.fullname" . }}
|
|
namespace: {{ .Values.namespace | default .Release.Namespace }}
|
|
spec:
|
|
replicas: {{ .Values.deployment.replicas }}
|
|
strategy:
|
|
type: {{ .Values.deployment.strategy.type }}
|
|
{{- if eq .Values.deployment.strategy.type "RollingUpdate" }}
|
|
rollingUpdate:
|
|
maxUnavailable: {{ .Values.deployment.strategy.rollingUpdate.maxUnavailable }}
|
|
maxSurge: {{ .Values.deployment.strategy.rollingUpdate.maxSurge }}
|
|
{{- end }}
|
|
selector:
|
|
matchLabels:
|
|
{{- include "gitea.selectorLabels" . | nindent 6 }}
|
|
template:
|
|
metadata:
|
|
{{- with (include "gitea.pod.annotations" . | fromYaml) }}
|
|
annotations:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
labels:
|
|
{{- include "gitea.labels" . | nindent 8 }}
|
|
{{- if .Values.deployment.labels }}
|
|
{{- toYaml .Values.deployment.labels | nindent 8 }}
|
|
{{- end }}
|
|
spec:
|
|
{{- $hostUsers := include "gitea.hostUsers" . | trim }}
|
|
{{- $securityContext := include "gitea.deployment.securityContext" . | trim }}
|
|
{{- $containerSecurityContext := include "gitea.containerSecurityContext" (list . (deepCopy .Values.deployment.gitea.securityContext)) | trim }}
|
|
{{- if .Values.deployment.schedulerName }}
|
|
schedulerName: "{{ .Values.deployment.schedulerName }}"
|
|
{{- end }}
|
|
{{- if .Values.serviceAccount.enabled }}
|
|
serviceAccountName: {{ include "gitea.serviceAccount.name" . }}
|
|
{{- end }}
|
|
{{- if .Values.deployment.priorityClassName }}
|
|
priorityClassName: "{{ .Values.deployment.priorityClassName }}"
|
|
{{- end }}
|
|
{{- if $hostUsers }}
|
|
hostUsers: {{ $hostUsers }}
|
|
{{- end }}
|
|
{{- include "gitea.images.pullSecrets" . | nindent 6 }}
|
|
{{- if $securityContext }}
|
|
securityContext:
|
|
{{- $securityContext | nindent 8 }}
|
|
{{- end }}
|
|
initContainers:
|
|
{{- include "gitea.deployment.initContainers" . | trim | nindent 8 }}
|
|
terminationGracePeriodSeconds: {{ .Values.deployment.terminationGracePeriodSeconds }}
|
|
containers:
|
|
- name: {{ .Chart.Name }}
|
|
image: "{{ include "gitea.image" . }}"
|
|
imagePullPolicy: {{ .Values.deployment.gitea.image.pullPolicy }}
|
|
env:
|
|
# SSH Port values have to be set here as well for openssh configuration
|
|
- name: SSH_LISTEN_PORT
|
|
value: {{ .Values.gitea.config.server.SSH_LISTEN_PORT | quote }}
|
|
- name: SSH_PORT
|
|
value: {{ .Values.gitea.config.server.SSH_PORT | quote }}
|
|
{{- if not .Values.deployment.gitea.image.rootless }}
|
|
- name: SSH_LOG_LEVEL
|
|
value: {{ .Values.gitea.ssh.logLevel | quote }}
|
|
{{- end }}
|
|
- name: GITEA_APP_INI
|
|
value: /data/gitea/conf/app.ini
|
|
- name: GITEA_CUSTOM
|
|
value: /data/gitea
|
|
- name: GITEA_WORK_DIR
|
|
value: /data
|
|
- name: GITEA_TEMP
|
|
value: /tmp/gitea
|
|
{{- with .Values.deployment.gitea.resources }}
|
|
{{- if and (hasKey . "limits") (hasKey (.limits | default dict) "cpu") }}
|
|
- name: GOMAXPROCS
|
|
valueFrom:
|
|
resourceFieldRef:
|
|
divisor: "1"
|
|
resource: limits.cpu
|
|
{{- end }}
|
|
{{- end }}
|
|
- name: TMPDIR
|
|
value: /tmp/gitea
|
|
{{- if .Values.deployment.gitea.image.rootless }}
|
|
- name: HOME
|
|
value: /data/gitea/git
|
|
{{- end }}
|
|
{{- if .Values.secrets.gpg.enabled }}
|
|
- name: GNUPGHOME
|
|
valueFrom:
|
|
secretKeyRef:
|
|
name: {{ include "gitea.secret.gpg.name" . }}
|
|
key: {{ include "gitea.secret.gpg.gpgHomeKey" . }}
|
|
{{- end }}
|
|
{{- if .Values.deployment.gitea.env }}
|
|
{{- toYaml .Values.deployment.gitea.env | nindent 12 }}
|
|
{{- end }}
|
|
{{- with .Values.deployment.gitea.envFrom }}
|
|
envFrom:
|
|
{{- toYaml . | nindent 12 }}
|
|
{{- end }}
|
|
ports:
|
|
- name: ssh
|
|
containerPort: {{ .Values.gitea.config.server.SSH_LISTEN_PORT }}
|
|
{{- if .Values.service.ssh.hostPort }}
|
|
hostPort: {{ .Values.service.ssh.hostPort }}
|
|
{{- end }}
|
|
- name: http
|
|
containerPort: {{ .Values.gitea.config.server.HTTP_PORT }}
|
|
{{- if .Values.gitea.config.server.ENABLE_PPROF }}
|
|
- name: profiler
|
|
containerPort: 6060
|
|
{{- end }}
|
|
{{- if .Values.gitea.livenessProbe.enabled }}
|
|
livenessProbe:
|
|
{{- include "gitea.deployment.probe" .Values.gitea.livenessProbe | nindent 12 }}
|
|
{{- end }}
|
|
{{- if .Values.gitea.readinessProbe.enabled }}
|
|
readinessProbe:
|
|
{{- include "gitea.deployment.probe" .Values.gitea.readinessProbe | nindent 12 }}
|
|
{{- end }}
|
|
{{- if .Values.gitea.startupProbe.enabled }}
|
|
startupProbe:
|
|
{{- include "gitea.deployment.probe" .Values.gitea.startupProbe | nindent 12 }}
|
|
{{- end }}
|
|
resources:
|
|
{{- toYaml (.Values.deployment.gitea.resources | default dict) | nindent 12 }}
|
|
{{- if $containerSecurityContext }}
|
|
securityContext:
|
|
{{- $containerSecurityContext | nindent 12 }}
|
|
{{- end }}
|
|
volumeMounts:
|
|
- name: temp
|
|
mountPath: /tmp
|
|
- name: data
|
|
mountPath: /data
|
|
{{- if .Values.persistence.new.subPath }}
|
|
subPath: {{ .Values.persistence.new.subPath }}
|
|
{{- end }}
|
|
{{- include "gitea.container-additional-mounts" . | nindent 12 }}
|
|
{{- if .Values.extraContainers }}
|
|
{{- toYaml .Values.extraContainers | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.global.hostAliases }}
|
|
hostAliases:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.deployment.nodeSelector }}
|
|
nodeSelector:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.deployment.affinity }}
|
|
affinity:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.deployment.topologySpreadConstraints }}
|
|
topologySpreadConstraints:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.deployment.tolerations }}
|
|
tolerations:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- if .Values.deployment.dnsConfig }}
|
|
dnsConfig:
|
|
{{- toYaml .Values.deployment.dnsConfig | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.deployment.resources }}
|
|
resources:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
volumes:
|
|
- name: init
|
|
secret:
|
|
secretName: {{ include "gitea.secret.init.name" . }}
|
|
defaultMode: 110
|
|
- name: config
|
|
secret:
|
|
secretName: {{ include "gitea.secret.config.name" . }}
|
|
defaultMode: 110
|
|
{{- if gt (len .Values.deployment.volumes) 0 }}
|
|
{{- toYaml .Values.deployment.volumes | nindent 8 }}
|
|
{{- end }}
|
|
- name: inline-config-sources
|
|
secret:
|
|
secretName: {{ include "gitea.secret.inlineConfig.name" . }}
|
|
{{- range $idx, $value := .Values.gitea.additionalConfigSources }}
|
|
- name: additional-config-sources-{{ $idx }}
|
|
{{- toYaml $value | nindent 10 }}
|
|
{{- end }}
|
|
- name: temp
|
|
emptyDir: {}
|
|
{{- if .Values.secrets.gpg.enabled }}
|
|
- name: gpg-private-key
|
|
secret:
|
|
secretName: {{ include "gitea.secret.gpg.name" . }}
|
|
items:
|
|
- key: {{ include "gitea.secret.gpg.privateKeyKey" . }}
|
|
path: private.asc
|
|
defaultMode: 0100
|
|
{{- end }}
|
|
{{- if .Values.persistence.enabled }}
|
|
- name: data
|
|
persistentVolumeClaim:
|
|
claimName: {{ include "gitea.persistentVolumeClaim.name" . }}
|
|
{{- else }}
|
|
- name: data
|
|
emptyDir: {}
|
|
{{- end }}
|
|
{{- end }}
|