Skip to content

Commit 875f841

Browse files
duanhongyiduanhongyi
committed
fixup(seaweedfs): labels error
1 parent 8b14e6c commit 875f841

11 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎addons/minio/2023/chart/minio/templates/distributed/statefulset.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ spec:
127127
args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }}
128128
{{- end }}
129129
env:
130-
- name: BITNAMI_DEBUG
130+
- name: DRYCC_DEBUG
131131
value: {{ ternary "true" "false" .Values.image.debug | quote }}
132132
- name: MINIO_DISTRIBUTED_MODE_ENABLED
133133
value: "yes"

‎addons/minio/2023/chart/minio/templates/standalone/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ spec:
104104
args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }}
105105
{{- end }}
106106
env:
107-
- name: BITNAMI_DEBUG
107+
- name: DRYCC_DEBUG
108108
value: {{ ternary "true" "false" .Values.image.debug | quote }}
109109
- name: MINIO_SCHEME
110110
value: {{ ternary "https" "http" .Values.tls.enabled | quote }}

‎addons/seaweedfs/3/chart/seaweedfs/templates/filer/statefulset.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ spec:
2020
podManagementPolicy: OrderedReady
2121
selector:
2222
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
23-
component: {{ include "seaweedfs.fullname" . }}
24-
app: {{ include "seaweedfs.filer.fullname" . }}
23+
app: {{ include "seaweedfs.fullname" . }}
24+
app.kubernetes.io/component: filer
2525
template:
2626
metadata:
2727
labels: {{- include "common.labels.standard" . | nindent 8 }}
28-
component: {{ include "seaweedfs.fullname" . }}
29-
app: {{ include "seaweedfs.filer.fullname" . }}
28+
app: {{ include "seaweedfs.fullname" . }}
29+
app.kubernetes.io/component: filer
3030
spec:
3131
{{- if .Values.filer.affinity }}
3232
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.filer.affinity "context" $) | nindent 8 }}
3333
{{- else }}
3434
affinity:
35-
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.filer.podAffinityPreset "component" "read" "context" $) | nindent 10 }}
36-
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.filer.podAntiAffinityPreset "component" "read" "context" $) | nindent 10 }}
35+
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.filer.podAffinityPreset "component" "filer" "context" $) | nindent 10 }}
36+
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.filer.podAntiAffinityPreset "component" "filer" "context" $) | nindent 10 }}
3737
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.filer.nodeAffinityPreset.type "key" .Values.filer.nodeAffinityPreset.key "values" .Values.filer.nodeAffinityPreset.values) | nindent 10 }}
3838
{{- end }}
3939
serviceAccount: {{ include "seaweedfs.fullname" . }}

‎addons/seaweedfs/3/chart/seaweedfs/templates/filer/svc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ spec:
3030
{{- end }}
3131
publishNotReadyAddresses: true
3232
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
33-
component: {{ include "seaweedfs.fullname" . }}
34-
app: {{ include "seaweedfs.filer.fullname" . }}
33+
app: {{ include "seaweedfs.fullname" . }}
34+
app.kubernetes.io/component: filer
3535
ports:
3636
- name: s3
3737
port: {{ .Values.filer.ports.s3 }}

‎addons/seaweedfs/3/chart/seaweedfs/templates/master/statefulset.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ spec:
2020
podManagementPolicy: OrderedReady
2121
selector:
2222
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
23-
component: {{ include "seaweedfs.fullname" . }}
24-
app: {{ include "seaweedfs.master.fullname" . }}
23+
app: {{ include "seaweedfs.fullname" . }}
24+
app.kubernetes.io/component: master
2525
template:
2626
metadata:
2727
labels: {{- include "common.labels.standard" . | nindent 8 }}
28-
component: {{ include "seaweedfs.fullname" . }}
29-
app: {{ include "seaweedfs.master.fullname" . }}
28+
app: {{ include "seaweedfs.fullname" . }}
29+
app.kubernetes.io/component: master
3030
spec:
3131
{{- if .Values.master.affinity }}
3232
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.master.affinity "context" $) | nindent 8 }}
3333
{{- else }}
3434
affinity:
35-
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAffinityPreset "component" "read" "context" $) | nindent 10 }}
36-
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAntiAffinityPreset "component" "read" "context" $) | nindent 10 }}
35+
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAffinityPreset "component" "master" "context" $) | nindent 10 }}
36+
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.master.podAntiAffinityPreset "component" "master" "context" $) | nindent 10 }}
3737
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.master.nodeAffinityPreset.type "key" .Values.master.nodeAffinityPreset.key "values" .Values.master.nodeAffinityPreset.values) | nindent 10 }}
3838
{{- end }}
3939
serviceAccount: {{ include "seaweedfs.fullname" . }}

‎addons/seaweedfs/3/chart/seaweedfs/templates/master/svc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ spec:
2929
{{- end }}
3030
publishNotReadyAddresses: true
3131
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
32-
component: {{ include "seaweedfs.fullname" . }}
33-
app: {{ include "seaweedfs.master.fullname" . }}
32+
app: {{ include "seaweedfs.fullname" . }}
33+
app.kubernetes.io/component: master
3434
ports:
3535
- name: http
3636
port: {{ .Values.master.ports.http }}

‎addons/seaweedfs/3/chart/seaweedfs/templates/volume/statefulset.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ spec:
2020
podManagementPolicy: OrderedReady
2121
selector:
2222
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
23-
component: {{ include "seaweedfs.fullname" . }}
24-
app: {{ include "seaweedfs.volume.fullname" . }}
23+
app: {{ include "seaweedfs.fullname" . }}
24+
app.kubernetes.io/component: volume
2525
template:
2626
metadata:
2727
labels: {{- include "common.labels.standard" . | nindent 8 }}
28-
component: {{ include "seaweedfs.fullname" . }}
29-
app: {{ include "seaweedfs.volume.fullname" . }}
28+
app: {{ include "seaweedfs.fullname" . }}
29+
app.kubernetes.io/component: volume
3030
spec:
3131
{{- if .Values.volume.affinity }}
3232
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.volume.affinity "context" $) | nindent 8 }}
3333
{{- else }}
3434
affinity:
35-
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.volume.podAffinityPreset "component" "read" "context" $) | nindent 10 }}
36-
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.volume.podAntiAffinityPreset "component" "read" "context" $) | nindent 10 }}
35+
podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.volume.podAffinityPreset "component" "volume" "context" $) | nindent 10 }}
36+
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.volume.podAntiAffinityPreset "component" "volume" "context" $) | nindent 10 }}
3737
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.volume.nodeAffinityPreset.type "key" .Values.volume.nodeAffinityPreset.key "values" .Values.volume.nodeAffinityPreset.values) | nindent 10 }}
3838
{{- end }}
3939
serviceAccount: {{ include "seaweedfs.fullname" . }}

‎addons/seaweedfs/3/chart/seaweedfs/templates/volume/svc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ spec:
2929
{{- end }}
3030
publishNotReadyAddresses: true
3131
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
32-
component: {{ include "seaweedfs.fullname" . }}
33-
app: {{ include "seaweedfs.volume.fullname" . }}
32+
app: {{ include "seaweedfs.fullname" . }}
33+
app.kubernetes.io/component: volume
3434
ports:
3535
- name: http
3636
port: {{ .Values.volume.ports.http }}

‎template/CHART_NAME/templates/daemonset.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ spec:
9898
args: {{- include "common.tplvalues.render" (dict "value" .Values.%%MAIN_OBJECT_BLOCK%%.args "context" $) | nindent 12 }}
9999
{{- end }}
100100
env:
101-
- name: BITNAMI_DEBUG
101+
- name: DRYCC_DEBUG
102102
value: {{ ternary "true" "false" (or .Values.image.debug .Values.diagnosticMode.enabled) | quote }}
103103
- name: foo
104104
value: bar

‎template/CHART_NAME/templates/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ spec:
106106
args: {{- include "common.tplvalues.render" (dict "value" .Values.%%MAIN_OBJECT_BLOCK%%.args "context" $) | nindent 12 }}
107107
{{- end }}
108108
env:
109-
- name: BITNAMI_DEBUG
109+
- name: DRYCC_DEBUG
110110
value: {{ ternary "true" "false" (or .Values.%%MAIN_OBJECT_BLOCK%%.image.debug .Values.diagnosticMode.enabled) | quote }}
111111
- name: foo
112112
value: bar

0 commit comments

Comments
 (0)