diff --git a/charts/authentik/templates/deployment.yaml b/charts/authentik/templates/deployment.yaml index a3c5cc29..63c4c5f2 100644 --- a/charts/authentik/templates/deployment.yaml +++ b/charts/authentik/templates/deployment.yaml @@ -117,6 +117,7 @@ spec: {{- toYaml . | nindent 12 }} {{- end }} + {{- if eq $component "server" }} ports: - name: http containerPort: 9000 @@ -127,7 +128,6 @@ spec: - name: https containerPort: 9443 protocol: TCP - {{- with $.Values.livenessProbe }} {{- if .enabled }} livenessProbe: @@ -139,7 +139,9 @@ spec: readinessProbe: {{- toYaml . | nindent 12 }} {{- end }} - {{- end }} + {{- end }} + {{- end }}{{/* end server */}} + {{- with (get $.Values.resources $component) }} resources: {{- toYaml . | nindent 12 }} diff --git a/charts/authentik/templates/service-account.yaml b/charts/authentik/templates/service-account.yaml index 15eb4567..6b7a1b83 100644 --- a/charts/authentik/templates/service-account.yaml +++ b/charts/authentik/templates/service-account.yaml @@ -1,8 +1,4 @@ -{{- if .Values.serviceAccount.create }} - -{{ include "common.serviceAccount" . }} - -{{- if .Values.sidecar.blueprints.enabled }} +{{- if and .Values.serviceAccount.create .Values.sidecar.blueprints.enabled }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -25,5 +21,4 @@ subjects: - kind: ServiceAccount name: {{ include "common.names.fullname" . }} namespace: {{ .Release.Namespace }} -{{- end }} {{- end }} \ No newline at end of file