Skip to content

Commit 4c7702d

Browse files
committed
fix(charts): statefulset style error
1 parent 6add8aa commit 4c7702d

1 file changed

Lines changed: 64 additions & 60 deletions

File tree

charts/storage/templates/storage-statefulset.yaml

Lines changed: 64 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -31,66 +31,64 @@ spec:
3131
serviceAccount: drycc-storage
3232
containers:
3333
- name: drycc-storage
34-
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/storage:{{.Values.imageTag}}
35-
imagePullPolicy: {{.Values.imagePullPolicy}}
36-
env:
37-
- name: MINIO_PROMETHEUS_AUTH_TYPE
38-
value: "public"
39-
- name: "MINIO_ROOT_USER"
40-
valueFrom:
41-
secretKeyRef:
42-
name: storage-creds
43-
key: accesskey
44-
- name: "MINIO_ROOT_PASSWORD"
45-
valueFrom:
46-
secretKeyRef:
47-
name: storage-creds
48-
key: secretkey
49-
ports:
50-
- name: api
51-
containerPort: 9000
52-
protocol: TCP
53-
- name: console
54-
containerPort: 9001
55-
protocol: TCP
56-
livenessProbe:
57-
httpGet:
58-
path: /minio/health/live
59-
port: 9000
60-
initialDelaySeconds: 90
61-
periodSeconds: 5
62-
timeoutSeconds: 1
63-
successThreshold: 1
64-
failureThreshold: 5
65-
readinessProbe:
66-
tcpSocket:
67-
port: 9000
68-
initialDelaySeconds: 5
69-
periodSeconds: 5
70-
timeoutSeconds: 1
71-
successThreshold: 1
72-
failureThreshold: 5
73-
args:
74-
- minio
75-
- server
76-
{{- $clusters := list }}
77-
{{- range $i := until $zoneCount }}
78-
{{- $factor := mul $i $replicaCount }}
79-
{{- $endIndex := sub (add $factor $replicaCount) 1 }}
80-
{{- $beginIndex := mul $i $replicaCount }}
81-
- {{(printf "http://drycc-storage-{%d...%d}.drycc-storage.%s.svc.%s:9000/data/{0...%d}" $beginIndex $endIndex $.Release.Namespace $.Values.global.clusterDomain (sub $driveCount 1) ) }}
82-
{{- end }}
83-
- --address
84-
- :9000
85-
- --console-address
86-
- :9001
87-
{{- if .Values.persistence.enabled }}
88-
volumeMounts:
89-
{{- range $diskId := until $driveCount }}
90-
- name: storage-data-{{$diskId}}
91-
mountPath: /data/{{$diskId}}
92-
{{- end }}
93-
{{- end }}
34+
image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/storage:{{.Values.imageTag}}
35+
imagePullPolicy: {{.Values.imagePullPolicy}}
36+
env:
37+
- name: MINIO_PROMETHEUS_AUTH_TYPE
38+
value: "public"
39+
- name: "MINIO_ROOT_USER"
40+
valueFrom:
41+
secretKeyRef:
42+
name: storage-creds
43+
key: accesskey
44+
- name: "MINIO_ROOT_PASSWORD"
45+
valueFrom:
46+
secretKeyRef:
47+
name: storage-creds
48+
key: secretkey
49+
ports:
50+
- name: api
51+
containerPort: 9000
52+
protocol: TCP
53+
- name: console
54+
containerPort: 9001
55+
protocol: TCP
56+
livenessProbe:
57+
httpGet:
58+
path: /minio/health/live
59+
port: 9000
60+
initialDelaySeconds: 90
61+
periodSeconds: 5
62+
timeoutSeconds: 1
63+
successThreshold: 1
64+
failureThreshold: 5
65+
readinessProbe:
66+
tcpSocket:
67+
port: 9000
68+
initialDelaySeconds: 5
69+
periodSeconds: 5
70+
timeoutSeconds: 1
71+
successThreshold: 1
72+
failureThreshold: 5
73+
args:
74+
- minio
75+
- server
76+
{{- $clusters := list }}
77+
{{- range $i := until $zoneCount }}
78+
{{- $factor := mul $i $replicaCount }}
79+
{{- $endIndex := sub (add $factor $replicaCount) 1 }}
80+
{{- $beginIndex := mul $i $replicaCount }}
81+
- {{(printf "http://drycc-storage-{%d...%d}.drycc-storage.%s.svc.%s:9000/data/{0...%d}" $beginIndex $endIndex $.Release.Namespace $.Values.global.clusterDomain (sub $driveCount 1) ) }}
82+
{{- end }}
83+
- --address
84+
- :9000
85+
- --console-address
86+
- :9001
87+
volumeMounts:
88+
{{- range $diskId := until $driveCount }}
89+
- name: storage-data-{{$diskId}}
90+
mountPath: /data/{{$diskId}}
91+
{{- end }}
9492
securityContext:
9593
fsGroup: 1001
9694
runAsGroup: 1001
@@ -113,5 +111,11 @@ spec:
113111
requests:
114112
storage: {{ $.Values.persistence.size | quote }}
115113
{{- end }}
114+
{{- else }}
115+
volumes:
116+
{{- range $diskId := until $driveCount }}
117+
- name: storage-data-{{$diskId}}
118+
emptyDir: {}
119+
{{- end }}
116120
{{- end }}
117121
{{- end }}

0 commit comments

Comments
 (0)