Skip to content

Commit 2bcde4c

Browse files
BorisPolonskyBorisPolonsky
committed
Update indentation for lists in template
1 parent 1057701 commit 2bcde4c

10 files changed

+386
-386
lines changed

‎charts/dify/templates/api-deployment.yaml‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -67,67 +67,67 @@ spec:
6767
securityContext: {{- omit .Values.api.podSecurityContext "enabled" | toYaml | nindent 8 }}
6868
{{- end }}
6969
containers:
70-
- image: "{{ .Values.image.api.repository }}:{{ default .Chart.AppVersion .Values.image.api.tag }}"
71-
imagePullPolicy: "{{ .Values.image.api.pullPolicy }}"
72-
name: api
73-
{{- if .Values.api.customLivenessProbe }}
74-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.api.customLivenessProbe "context" $) | nindent 10 }}
75-
{{- else if .Values.api.livenessProbe.enabled }}
76-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.api.livenessProbe "enabled") "context" $) | nindent 10 }}
77-
httpGet:
78-
path: /health
79-
port: api
80-
{{- end }}
81-
{{- if .Values.api.customReadinessProbe }}
82-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.api.customReadinessProbe "context" $) | nindent 10 }}
83-
{{- else if .Values.api.readinessProbe.enabled }}
84-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.api.readinessProbe "enabled") "context" $) | nindent 10 }}
85-
httpGet:
86-
path: /health
87-
port: api
88-
{{- end }}
89-
{{- if .Values.api.customStartupProbe }}
90-
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.api.customStartupProbe "context" $) | nindent 10 }}
91-
{{- else if .Values.api.startupProbe.enabled }}
92-
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.api.startupProbe "enabled") "context" $) | nindent 10 }}
93-
tcpSocket:
94-
port: api
95-
{{- end }}
96-
# We don't require a privileged container in this case
97-
{{- if .Values.api.containerSecurityContext.enabled }}
98-
securityContext: {{- omit .Values.api.containerSecurityContext "enabled" | toYaml | nindent 10 }}
99-
{{- end }}
100-
env:
101-
{{- if .Values.sandbox.enabled }}
102-
- name: CODE_EXECUTION_API_KEY
103-
valueFrom:
104-
secretKeyRef:
105-
name: {{ template "dify.sandbox.fullname" . }}
106-
key: "API_KEY"
107-
{{- end }}
108-
{{- if .Values.api.extraEnv }}
109-
{{- toYaml .Values.api.extraEnv | nindent 8 }}
110-
{{- end }}
111-
envFrom:
112-
- configMapRef:
113-
name: {{ template "dify.api.fullname" . }}
114-
- secretRef:
115-
name: {{ template "dify.api.fullname" . }}
116-
ports:
117-
- name: api
118-
containerPort: 5001
119-
protocol: TCP
120-
resources:
121-
{{- toYaml .Values.api.resources | nindent 12 }}
122-
volumeMounts:
123-
{{- if $usePvc }}
124-
- name: app-data
125-
mountPath: {{ .Values.api.persistence.mountPath | quote }}
126-
subPath: {{ .Values.api.persistence.persistentVolumeClaim.subPath | default "" }}
70+
- image: "{{ .Values.image.api.repository }}:{{ default .Chart.AppVersion .Values.image.api.tag }}"
71+
imagePullPolicy: "{{ .Values.image.api.pullPolicy }}"
72+
name: api
73+
{{- if .Values.api.customLivenessProbe }}
74+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.api.customLivenessProbe "context" $) | nindent 12 }}
75+
{{- else if .Values.api.livenessProbe.enabled }}
76+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.api.livenessProbe "enabled") "context" $) | nindent 12 }}
77+
httpGet:
78+
path: /health
79+
port: api
80+
{{- end }}
81+
{{- if .Values.api.customReadinessProbe }}
82+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.api.customReadinessProbe "context" $) | nindent 12 }}
83+
{{- else if .Values.api.readinessProbe.enabled }}
84+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.api.readinessProbe "enabled") "context" $) | nindent 12 }}
85+
httpGet:
86+
path: /health
87+
port: api
88+
{{- end }}
89+
{{- if .Values.api.customStartupProbe }}
90+
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.api.customStartupProbe "context" $) | nindent 12 }}
91+
{{- else if .Values.api.startupProbe.enabled }}
92+
startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.api.startupProbe "enabled") "context" $) | nindent 12 }}
93+
tcpSocket:
94+
port: api
12795
{{- end }}
128-
{{- if .Values.api.extraVolumeMounts }}
129-
{{- include "common.tplvalues.render" (dict "value" .Values.api.extraVolumeMounts "context" $) | nindent 10 }}
96+
# We don't require a privileged container in this case
97+
{{- if .Values.api.containerSecurityContext.enabled }}
98+
securityContext: {{- omit .Values.api.containerSecurityContext "enabled" | toYaml | nindent 12 }}
13099
{{- end }}
100+
env:
101+
{{- if .Values.sandbox.enabled }}
102+
- name: CODE_EXECUTION_API_KEY
103+
valueFrom:
104+
secretKeyRef:
105+
name: {{ template "dify.sandbox.fullname" . }}
106+
key: "API_KEY"
107+
{{- end }}
108+
{{- if .Values.api.extraEnv }}
109+
{{- toYaml .Values.api.extraEnv | nindent 12 }}
110+
{{- end }}
111+
envFrom:
112+
- configMapRef:
113+
name: {{ template "dify.api.fullname" . }}
114+
- secretRef:
115+
name: {{ template "dify.api.fullname" . }}
116+
ports:
117+
- name: api
118+
containerPort: 5001
119+
protocol: TCP
120+
resources:
121+
{{- toYaml .Values.api.resources | nindent 14 }}
122+
volumeMounts:
123+
{{- if $usePvc }}
124+
- name: app-data
125+
mountPath: {{ .Values.api.persistence.mountPath | quote }}
126+
subPath: {{ .Values.api.persistence.persistentVolumeClaim.subPath | default "" }}
127+
{{- end }}
128+
{{- if .Values.api.extraVolumeMounts }}
129+
{{- include "common.tplvalues.render" (dict "value" .Values.api.extraVolumeMounts "context" $) | nindent 12 }}
130+
{{- end }}
131131
{{- if and (.Values.nodeSelector) (not .Values.api.nodeSelector) }}
132132
nodeSelector:
133133
{{- toYaml .Values.nodeSelector | nindent 8 }}

‎charts/dify/templates/beat-deployment.yaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -57,38 +57,38 @@ spec:
5757
securityContext: {{- omit .Values.beat.podSecurityContext "enabled" | toYaml | nindent 8 }}
5858
{{- end }}
5959
containers:
60-
- image: "{{ .Values.image.api.repository }}:{{ default .Chart.AppVersion .Values.image.api.tag }}"
61-
imagePullPolicy: "{{ .Values.image.api.pullPolicy }}"
62-
name: beat
63-
{{- if .Values.beat.customLivenessProbe }}
64-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.beat.customLivenessProbe "context" $) | nindent 10 }}
65-
{{- end }}
66-
{{- if .Values.beat.customReadinessProbe }}
67-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.beat.customReadinessProbe "context" $) | nindent 10 }}
68-
{{- end }}
69-
{{- if .Values.beat.customStartupProbe }}
70-
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.beat.customStartupProbe "context" $) | nindent 10 }}
71-
{{- end }}
72-
# We don't require a privileged container in this case
73-
{{- if .Values.beat.containerSecurityContext.enabled }}
74-
securityContext: {{- omit .Values.beat.containerSecurityContext "enabled" | toYaml | nindent 10 }}
75-
{{- end }}
76-
env:
77-
- name: MODE
78-
value: "beat"
79-
# The log level for the application. Supported values are `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`
80-
- name: LOG_LEVEL
81-
value: {{ .Values.beat.logLevel | quote }}
82-
{{- if .Values.beat.extraEnv }}
83-
{{- toYaml .Values.beat.extraEnv | nindent 8 }}
84-
{{- end }}
85-
envFrom:
86-
- configMapRef:
87-
name: {{ template "dify.worker.fullname" . }}
88-
- secretRef:
89-
name: {{ template "dify.worker.fullname" . }}
90-
resources:
91-
{{- toYaml .Values.beat.resources | nindent 12 }}
60+
- image: "{{ .Values.image.api.repository }}:{{ default .Chart.AppVersion .Values.image.api.tag }}"
61+
imagePullPolicy: "{{ .Values.image.api.pullPolicy }}"
62+
name: beat
63+
{{- if .Values.beat.customLivenessProbe }}
64+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.beat.customLivenessProbe "context" $) | nindent 12 }}
65+
{{- end }}
66+
{{- if .Values.beat.customReadinessProbe }}
67+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.beat.customReadinessProbe "context" $) | nindent 12 }}
68+
{{- end }}
69+
{{- if .Values.beat.customStartupProbe }}
70+
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.beat.customStartupProbe "context" $) | nindent 12 }}
71+
{{- end }}
72+
# We don't require a privileged container in this case
73+
{{- if .Values.beat.containerSecurityContext.enabled }}
74+
securityContext: {{- omit .Values.beat.containerSecurityContext "enabled" | toYaml | nindent 12 }}
75+
{{- end }}
76+
env:
77+
- name: MODE
78+
value: "beat"
79+
# The log level for the application. Supported values are `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`
80+
- name: LOG_LEVEL
81+
value: {{ .Values.beat.logLevel | quote }}
82+
{{- if .Values.beat.extraEnv }}
83+
{{- toYaml .Values.beat.extraEnv | nindent 12 }}
84+
{{- end }}
85+
envFrom:
86+
- configMapRef:
87+
name: {{ template "dify.worker.fullname" . }}
88+
- secretRef:
89+
name: {{ template "dify.worker.fullname" . }}
90+
resources:
91+
{{- toYaml .Values.beat.resources | nindent 14 }}
9292
{{- if .Values.beat.extraVolumeMounts }}
9393
volumeMounts:
9494
{{- include "common.tplvalues.render" (dict "value" .Values.beat.extraVolumeMounts "context" $) | nindent 10 }}

‎charts/dify/templates/plugin-daemon-deployment.yaml‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -73,49 +73,49 @@ spec:
7373
{{- toYaml .Values.pluginDaemon.podSecurityContext | nindent 8 }}
7474
{{- end }}
7575
containers:
76-
- image: "{{ .Values.image.pluginDaemon.repository }}:{{ default .Chart.AppVersion .Values.image.pluginDaemon.tag }}"
77-
imagePullPolicy: "{{ .Values.image.pluginDaemon.pullPolicy }}"
78-
name: plugin-daemon
79-
{{- if .Values.pluginDaemon.customLivenessProbe }}
80-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.pluginDaemon.customLivenessProbe "context" $) | nindent 10 }}
81-
{{- end }}
82-
{{- if .Values.pluginDaemon.customReadinessProbe }}
83-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.pluginDaemon.customReadinessProbe "context" $) | nindent 10 }}
84-
{{- end }}
85-
{{- if .Values.pluginDaemon.customStartupProbe }}
86-
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.pluginDaemon.customStartupProbe "context" $) | nindent 10 }}
87-
{{- end }}
88-
{{- if .Values.pluginDaemon.containerSecurityContext }}
89-
securityContext:
90-
{{- toYaml .Values.pluginDaemon.containerSecurityContext | nindent 10 }}
91-
{{- end }}
92-
env:
93-
{{- if .Values.pluginDaemon.extraEnv }}
94-
{{- toYaml .Values.pluginDaemon.extraEnv | nindent 8 }}
95-
{{- end }}
96-
envFrom:
97-
- configMapRef:
98-
name: {{ template "dify.pluginDaemon.fullname" . }}
99-
- secretRef:
100-
name: {{ template "dify.pluginDaemon.fullname" . }}
101-
ports:
102-
- name: daemon
103-
containerPort: 5002
104-
protocol: TCP
105-
- name: plugin-install
106-
containerPort: 5003
107-
protocol: TCP
108-
resources:
109-
{{- toYaml .Values.pluginDaemon.resources | nindent 12 }}
110-
volumeMounts:
111-
{{- if $usePvc }}
112-
- name: app-data
113-
mountPath: {{ .Values.pluginDaemon.persistence.mountPath | quote }}
114-
subPath: {{ .Values.pluginDaemon.persistence.persistentVolumeClaim.subPath | default "" }}
76+
- image: "{{ .Values.image.pluginDaemon.repository }}:{{ default .Chart.AppVersion .Values.image.pluginDaemon.tag }}"
77+
imagePullPolicy: "{{ .Values.image.pluginDaemon.pullPolicy }}"
78+
name: plugin-daemon
79+
{{- if .Values.pluginDaemon.customLivenessProbe }}
80+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.pluginDaemon.customLivenessProbe "context" $) | nindent 12 }}
81+
{{- end }}
82+
{{- if .Values.pluginDaemon.customReadinessProbe }}
83+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.pluginDaemon.customReadinessProbe "context" $) | nindent 12 }}
84+
{{- end }}
85+
{{- if .Values.pluginDaemon.customStartupProbe }}
86+
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.pluginDaemon.customStartupProbe "context" $) | nindent 12 }}
11587
{{- end }}
116-
{{- if .Values.pluginDaemon.extraVolumeMounts }}
117-
{{- include "common.tplvalues.render" (dict "value" .Values.pluginDaemon.extraVolumeMounts "context" $) | nindent 10 }}
88+
{{- if .Values.pluginDaemon.containerSecurityContext }}
89+
securityContext:
90+
{{- toYaml .Values.pluginDaemon.containerSecurityContext | nindent 12 }}
11891
{{- end }}
92+
env:
93+
{{- if .Values.pluginDaemon.extraEnv }}
94+
{{- toYaml .Values.pluginDaemon.extraEnv | nindent 12 }}
95+
{{- end }}
96+
envFrom:
97+
- configMapRef:
98+
name: {{ template "dify.pluginDaemon.fullname" . }}
99+
- secretRef:
100+
name: {{ template "dify.pluginDaemon.fullname" . }}
101+
ports:
102+
- name: daemon
103+
containerPort: 5002
104+
protocol: TCP
105+
- name: plugin-install
106+
containerPort: 5003
107+
protocol: TCP
108+
resources:
109+
{{- toYaml .Values.pluginDaemon.resources | nindent 14 }}
110+
volumeMounts:
111+
{{- if $usePvc }}
112+
- name: app-data
113+
mountPath: {{ .Values.pluginDaemon.persistence.mountPath | quote }}
114+
subPath: {{ .Values.pluginDaemon.persistence.persistentVolumeClaim.subPath | default "" }}
115+
{{- end }}
116+
{{- if .Values.pluginDaemon.extraVolumeMounts }}
117+
{{- include "common.tplvalues.render" (dict "value" .Values.pluginDaemon.extraVolumeMounts "context" $) | nindent 12 }}
118+
{{- end }}
119119
{{- if and (.Values.nodeSelector) (not .Values.pluginDaemon.nodeSelector) }}
120120
nodeSelector:
121121
{{- toYaml .Values.nodeSelector | nindent 8 }}

‎charts/dify/templates/proxy-deployment.yaml‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -58,55 +58,55 @@ spec:
5858
securityContext: {{- omit .Values.proxy.podSecurityContext "enabled" | toYaml | nindent 8 }}
5959
{{- end }}
6060
containers:
61-
- image: "{{ .Values.image.proxy.repository }}:{{ .Values.image.proxy.tag }}"
62-
imagePullPolicy: "{{ .Values.image.proxy.pullPolicy }}"
63-
name: nginx
64-
{{- if .Values.proxy.customLivenessProbe }}
65-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customLivenessProbe "context" $) | nindent 10 }}
66-
{{- end }}
67-
{{- if .Values.proxy.customReadinessProbe }}
68-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customReadinessProbe "context" $) | nindent 10 }}
69-
{{- end }}
70-
{{- if .Values.proxy.customStartupProbe }}
71-
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customStartupProbe "context" $) | nindent 10 }}
72-
{{- end }}
73-
{{- if .Values.proxy.containerSecurityContext.enabled }}
74-
securityContext: {{- omit .Values.proxy.containerSecurityContext "enabled" | toYaml | nindent 10 }}
75-
{{- end }}
76-
env:
77-
{{- if .Values.proxy.extraEnv }}
78-
{{- toYaml .Values.proxy.extraEnv | nindent 8 }}
79-
{{- end }}
80-
ports:
81-
- name: dify
82-
containerPort: 8080
83-
protocol: TCP
84-
resources:
85-
{{- toYaml .Values.proxy.resources | nindent 12 }}
86-
volumeMounts:
87-
- name: nginx
88-
mountPath: /etc/nginx/nginx.conf
89-
readOnly: true
90-
subPath: nginx.conf
91-
- name: nginx
92-
mountPath: /etc/nginx/proxy.conf
93-
readOnly: true
94-
subPath: proxy.conf
95-
- name: nginx
96-
mountPath: /etc/nginx/conf.d/default.conf
97-
readOnly: true
98-
subPath: default.conf
99-
{{- if .Values.proxy.log.persistence.enabled }}
100-
- name: nginx-logs-disk
101-
mountPath: {{ .Values.proxy.log.persistence.mountPath | quote }}
102-
subPath: {{ .Values.proxy.log.persistence.persistentVolumeClaim.subPath | default "" }}
61+
- image: "{{ .Values.image.proxy.repository }}:{{ .Values.image.proxy.tag }}"
62+
imagePullPolicy: "{{ .Values.image.proxy.pullPolicy }}"
63+
name: nginx
64+
{{- if .Values.proxy.customLivenessProbe }}
65+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customLivenessProbe "context" $) | nindent 12 }}
66+
{{- end }}
67+
{{- if .Values.proxy.customReadinessProbe }}
68+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customReadinessProbe "context" $) | nindent 12 }}
69+
{{- end }}
70+
{{- if .Values.proxy.customStartupProbe }}
71+
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.proxy.customStartupProbe "context" $) | nindent 12 }}
10372
{{- end }}
104-
{{- if and .Values.proxy.containerSecurityContext.enabled (ne (int (default 0 .Values.proxy.containerSecurityContext.runAsUser)) 0) }}
105-
- name: nginx-cache
106-
mountPath: /var/cache/nginx
107-
- name: nginx-run
108-
mountPath: /var/run/nginx
73+
{{- if .Values.proxy.containerSecurityContext.enabled }}
74+
securityContext: {{- omit .Values.proxy.containerSecurityContext "enabled" | toYaml | nindent 12 }}
10975
{{- end }}
76+
env:
77+
{{- if .Values.proxy.extraEnv }}
78+
{{- toYaml .Values.proxy.extraEnv | nindent 12 }}
79+
{{- end }}
80+
ports:
81+
- name: dify
82+
containerPort: 8080
83+
protocol: TCP
84+
resources:
85+
{{- toYaml .Values.proxy.resources | nindent 14 }}
86+
volumeMounts:
87+
- name: nginx
88+
mountPath: /etc/nginx/nginx.conf
89+
readOnly: true
90+
subPath: nginx.conf
91+
- name: nginx
92+
mountPath: /etc/nginx/proxy.conf
93+
readOnly: true
94+
subPath: proxy.conf
95+
- name: nginx
96+
mountPath: /etc/nginx/conf.d/default.conf
97+
readOnly: true
98+
subPath: default.conf
99+
{{- if .Values.proxy.log.persistence.enabled }}
100+
- name: nginx-logs-disk
101+
mountPath: {{ .Values.proxy.log.persistence.mountPath | quote }}
102+
subPath: {{ .Values.proxy.log.persistence.persistentVolumeClaim.subPath | default "" }}
103+
{{- end }}
104+
{{- if and .Values.proxy.containerSecurityContext.enabled (ne (int (default 0 .Values.proxy.containerSecurityContext.runAsUser)) 0) }}
105+
- name: nginx-cache
106+
mountPath: /var/cache/nginx
107+
- name: nginx-run
108+
mountPath: /var/run/nginx
109+
{{- end }}
110110
{{- if .Values.proxy.extraVolumeMounts }}
111111
{{- include "common.tplvalues.render" (dict "value" .Values.proxy.extraVolumeMounts "context" $) | nindent 10 }}
112112
{{- end }}

0 commit comments

Comments
 (0)