mirror of
https://github.com/coder/coder.git
synced 2026-06-03 13:08:25 +00:00
Rowan Smith
3c05cb6255
closes #20541 adds `coder.serviceAccount.labels` var to support custom labels being added to the SA. Current chart: ``` ➜ helm-service-account-labels git:(rowansmithau/feat/helm_service_account_labels) helm template coder coder-v2/coder --set coder.image.tag=latest --set coder.serviceAccount.labels.mux=isnice | egrep -A13 '^kind: ServiceAccount$' kind: ServiceAccount metadata: annotations: {} labels: app.kubernetes.io/instance: coder app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: coder app.kubernetes.io/part-of: coder app.kubernetes.io/version: 2.28.3 helm.sh/chart: coder-2.28.3 name: coder namespace: default --- # Source: coder/templates/rbac.yaml ``` With this PR: ``` ➜ helm-service-account-labels git:(rowansmithau/feat/helm_service_account_labels) helm template coder helm/coder --set coder.image.tag=latest --set coder.serviceAccount.labels.mux=isnice | egrep -A13 '^kind: ServiceAccount$' kind: ServiceAccount metadata: annotations: {} labels: app.kubernetes.io/instance: coder app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: coder app.kubernetes.io/part-of: coder app.kubernetes.io/version: 0.1.0 helm.sh/chart: coder-0.1.0 mux: isnice name: coder namespace: default --- ``` A test with `disableCreate=true` still correctly shows no SA created: ``` ➜ helm-service-account-labels git:(rowansmithau/feat/helm_service_account_labels) helm template coder helm/coder --set coder.image.tag=latest --set coder.serviceAccount.labels.mux=isnice --set coder.serviceAccount.disableCreate=true | egrep '^kind: ServiceAccount$' ```
111 lines
3.4 KiB
YAML
111 lines
3.4 KiB
YAML
{{- define "libcoder.deployment.tpl" -}}
|
|
apiVersion: apps/v1
|
|
kind: Deployment
|
|
metadata:
|
|
name: {{ include "coder.name" .}}
|
|
namespace: {{ .Release.Namespace }}
|
|
labels:
|
|
{{- include "coder.labels" . | nindent 4 }}
|
|
{{- with .Values.coder.labels }}
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
annotations: {{ toYaml .Values.coder.annotations | nindent 4}}
|
|
spec:
|
|
replicas: {{ .Values.coder.replicaCount }}
|
|
selector:
|
|
matchLabels:
|
|
{{- include "coder.selectorLabels" . | nindent 6 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{- include "coder.labels" . | nindent 8 }}
|
|
{{- with .Values.coder.podLabels }}
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
annotations:
|
|
{{- toYaml .Values.coder.podAnnotations | nindent 8 }}
|
|
spec:
|
|
serviceAccountName: {{ .Values.coder.serviceAccount.name | quote }}
|
|
{{- with .Values.coder.priorityClassName }}
|
|
priorityClassName: {{ . | quote }}
|
|
{{- end }}
|
|
{{- with .Values.coder.podSecurityContext }}
|
|
securityContext:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
restartPolicy: Always
|
|
{{- with .Values.coder.image.pullSecrets }}
|
|
imagePullSecrets:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
terminationGracePeriodSeconds: 60
|
|
{{- with .Values.coder.affinity }}
|
|
affinity:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.coder.tolerations }}
|
|
tolerations:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.coder.nodeSelector }}
|
|
nodeSelector:
|
|
{{ toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.coder.topologySpreadConstraints }}
|
|
topologySpreadConstraints:
|
|
{{- toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
{{- with .Values.coder.initContainers }}
|
|
initContainers:
|
|
{{ toYaml . | nindent 8 }}
|
|
{{- end }}
|
|
containers: []
|
|
{{- include "coder.volumes" . | nindent 6 }}
|
|
{{- end -}}
|
|
{{- define "libcoder.deployment" -}}
|
|
{{- include "libcoder.util.merge" (append . "libcoder.deployment.tpl") -}}
|
|
{{- end -}}
|
|
|
|
{{- define "libcoder.containerspec.tpl" -}}
|
|
name: coder
|
|
image: {{ include "coder.image" . | quote }}
|
|
imagePullPolicy: {{ .Values.coder.image.pullPolicy }}
|
|
command:
|
|
{{- toYaml .Values.coder.command | nindent 2 }}
|
|
resources:
|
|
{{- if and (hasKey .Values.coder "resources") (not (empty .Values.coder.resources)) }}
|
|
{{- toYaml .Values.coder.resources | nindent 2 }}
|
|
{{- else }}
|
|
limits:
|
|
cpu: 2000m
|
|
memory: 4096Mi
|
|
requests:
|
|
cpu: 2000m
|
|
memory: 4096Mi
|
|
{{- end }}
|
|
lifecycle:
|
|
{{- toYaml .Values.coder.lifecycle | nindent 2 }}
|
|
securityContext: {{ toYaml .Values.coder.securityContext | nindent 2 }}
|
|
{{ include "coder.volumeMounts" . }}
|
|
{{- end -}}
|
|
{{- define "libcoder.containerspec" -}}
|
|
{{- include "libcoder.util.merge" (append . "libcoder.containerspec.tpl") -}}
|
|
{{- end -}}
|
|
|
|
{{- define "libcoder.serviceaccount.tpl" -}}
|
|
apiVersion: v1
|
|
kind: ServiceAccount
|
|
metadata:
|
|
name: {{ .Values.coder.serviceAccount.name | quote }}
|
|
namespace: {{ .Release.Namespace }}
|
|
annotations: {{ toYaml .Values.coder.serviceAccount.annotations | nindent 4 }}
|
|
labels:
|
|
{{- include "coder.labels" . | nindent 4 }}
|
|
{{- with .Values.coder.serviceAccount.labels }}
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
{{- end -}}
|
|
{{- define "libcoder.serviceaccount" -}}
|
|
{{- include "libcoder.util.merge" (append . "libcoder.serviceaccount.tpl") -}}
|
|
{{- end -}}
|