Skip to content

Commit bc2f57f

Browse files
hhhhsc701hhhhsc701
authored
feature: 修改缩进 (#109)
1 parent bc26cfb commit bc2f57f

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

‎deployment/helm/datamate/values.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ backend:
9696
mountPath: /operators
9797

9898
frontend:
99+
service:
100+
type: NodePort
101+
nodePort: 30000
99102
volumes:
100103
- *logVolume
101104
- name: datamate-nginx-conf

‎deployment/helm/milvus/charts/etcd/templates/deployment.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ spec:
3838
spec:
3939
{{- include "etcd.imagePullSecrets" . | nindent 6 }}
4040
{{- if .Values.hostAliases }}
41-
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
41+
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 10 }}
4242
{{- end }}
4343
{{- if .Values.affinity }}
44-
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 8 }}
44+
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 10 }}
4545
{{- else }}
4646
affinity:
47-
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset "context" $) | nindent 10 }}
48-
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "context" $) | nindent 10 }}
49-
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }}
47+
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset "context" $) | nindent 12 }}
48+
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "context" $) | nindent 12 }}
49+
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 12 }}
5050
{{- end }}
5151
{{- if .Values.nodeSelector }}
52-
nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
52+
nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 10 }}
5353
{{- end }}
5454
{{- if .Values.tolerations }}
55-
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 8 }}
55+
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" $) | nindent 10 }}
5656
{{- end }}
5757
{{- if .Values.terminationGracePeriodSeconds }}
5858
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
@@ -61,7 +61,7 @@ spec:
6161
schedulerName: {{ .Values.schedulerName }}
6262
{{- end }}
6363
{{- if .Values.topologySpreadConstraints }}
64-
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" .) | nindent 8 }}
64+
topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" .) | nindent 10 }}
6565
{{- end }}
6666
{{- if .Values.priorityClassName }}
6767
priorityClassName: {{ .Values.priorityClassName }}
@@ -70,7 +70,7 @@ spec:
7070
runtimeClassName: {{ .Values.runtimeClassName }}
7171
{{- end }}
7272
{{- if .Values.podSecurityContext.enabled }}
73-
securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
73+
securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 10 }}
7474
{{- end }}
7575
{{- if .Values.shareProcessNamespace }}
7676
shareProcessNamespace: {{ .Values.shareProcessNamespace }}
@@ -79,7 +79,7 @@ spec:
7979
{{- if or .Values.initContainers (and .Values.volumePermissions.enabled .Values.persistence.enabled) }}
8080
initContainers:
8181
{{- if .Values.initContainers }}
82-
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
82+
{{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 10 }}
8383
{{- end }}
8484
{{- if and .Values.volumePermissions.enabled .Values.persistence.enabled }}
8585
- name: volume-permissions
@@ -93,7 +93,7 @@ spec:
9393
securityContext:
9494
runAsUser: 0
9595
{{- if .Values.volumePermissions.resources }}
96-
resources: {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.resources "context" $) | nindent 12 }}
96+
resources: {{- include "common.tplvalues.render" (dict "value" .Values.volumePermissions.resources "context" $) | nindent 14 }}
9797
{{- end }}
9898
volumeMounts:
9999
- name: data
@@ -116,14 +116,14 @@ spec:
116116
securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
117117
{{- end }}
118118
{{- if .Values.diagnosticMode.enabled }}
119-
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
119+
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 14 }}
120120
{{- else if .Values.command }}
121-
command: {{- include "common.tplvalues.render" (dict "value" .Values.command "context" $) | nindent 12 }}
121+
command: {{- include "common.tplvalues.render" (dict "value" .Values.command "context" $) | nindent 14 }}
122122
{{- end }}
123123
{{- if .Values.diagnosticMode.enabled }}
124-
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
124+
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 14 }}
125125
{{- else if .Values.args }}
126-
args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }}
126+
args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 14 }}
127127
{{- end }}
128128
env:
129129
- name: BITNAMI_DEBUG
@@ -248,7 +248,7 @@ spec:
248248
value: {{ ternary "/snapshots" "/init-snapshot" (and .Values.disasterRecovery.enabled (not .Values.disasterRecovery.pvc.existingClaim)) | quote }}
249249
{{- end }}
250250
{{- if .Values.extraEnvVars }}
251-
{{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
251+
{{- include "common.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 14 }}
252252
{{- end }}
253253
envFrom:
254254
{{- if .Values.extraEnvVarsCM }}
@@ -268,7 +268,7 @@ spec:
268268
protocol: TCP
269269
{{- if not .Values.diagnosticMode.enabled }}
270270
{{- if .Values.customLivenessProbe }}
271-
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
271+
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 14 }}
272272
{{- else if .Values.livenessProbe.enabled }}
273273
livenessProbe:
274274
exec:
@@ -281,7 +281,7 @@ spec:
281281
failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
282282
{{- end }}
283283
{{- if .Values.customReadinessProbe }}
284-
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
284+
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 14 }}
285285
{{- else if .Values.readinessProbe.enabled }}
286286
readinessProbe:
287287
exec:
@@ -294,7 +294,7 @@ spec:
294294
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
295295
{{- end }}
296296
{{- if .Values.customStartupProbe }}
297-
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }}
297+
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 14 }}
298298
{{- else if .Values.startupProbe.enabled }}
299299
startupProbe:
300300
exec:
@@ -307,7 +307,7 @@ spec:
307307
failureThreshold: {{ .Values.startupProbe.failureThreshold }}
308308
{{- end }}
309309
{{- if .Values.lifecycleHooks }}
310-
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleHooks "context" $) | nindent 12 }}
310+
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleHooks "context" $) | nindent 14 }}
311311
{{- else if and (gt $replicaCount 1) .Values.removeMemberOnContainerTermination }}
312312
lifecycle:
313313
preStop:
@@ -317,7 +317,7 @@ spec:
317317
{{- end }}
318318
{{- end }}
319319
{{- if .Values.resources }}
320-
resources: {{- include "common.tplvalues.render" (dict "value" .Values.resources "context" $) | nindent 12 }}
320+
resources: {{- include "common.tplvalues.render" (dict "value" .Values.resources "context" $) | nindent 14 }}
321321
{{- end }}
322322
volumeMounts:
323323
- name: data

‎deployment/helm/milvus/templates/pvc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
apiVersion: v1
2121
kind: PersistentVolumeClaim
2222
name: {{ printf "%s" (include "milvus.fullname" . | trunc 58)}}
23-
namespace: {{ .Values.global.namespace | default "datamate" }}
23+
namespace: {{ .Release.Namespace | default "datamate" }}
2424
nodeAffinity:
2525
required:
2626
nodeSelectorTerms:

0 commit comments

Comments
 (0)