File tree Expand file tree Collapse file tree 5 files changed +22
-17
lines changed Expand file tree Collapse file tree 5 files changed +22
-17
lines changed Original file line number Diff line number Diff line change 22apiVersion : v1
33kind : ConfigMap
44metadata :
5- - name : " scoop-config "
6- - namespace : {{ $.Values.scoopnamespace | default .Release.Namespace }}
5+ name : {{ $.Values.ConfigMap.name }}
6+ namespace : {{ $.Values.scoopnamespace | default .Release.Namespace }}
77{{- if $.Values.ConfigMap.data }}
88data :
99{{ toYaml $.Values.ConfigMap.data | indent 2 }}
Original file line number Diff line number Diff line change 2727 {{ toYaml $.Values.labels | indent 4 }}
2828 {{- end }}
2929 spec :
30- serviceAccount : sa- scoop
31- serviceAccountName : sa- scoop
30+ # serviceAccount: scoop-sa
31+ serviceAccountName : scoop-sa
3232 terminationGracePeriodSeconds : 30
3333 imagePullSecrets :
3434 - name : {{ $.Values.imagePullSecrets }}
@@ -48,12 +48,16 @@ spec:
4848
4949 {{- if or $.Values.ConfigMap.data $.Values.secrets.data }}
5050 envFrom :
51- {{- if $.Values.ConfigMap.data }}
52- - configMapRef :
53- name : " scoop-config"
54- data :
55- {{ toYaml $.Values.ConfigMap.data | indent 16 }}
56- {{- end }}
51+ {{- if $.Values.ConfigMap.enabled }}
52+ - configMapRef :
53+ name : {{ $.Values.ConfigMap.name }}
54+ {{- end }}
55+
56+ {{- if $.Values.secrets.data }}
57+ - SecretRef :
58+ name : {{ $.Values.secrets.name }}
59+ {{- end }}
60+
5761 {{- end}}
5862
5963 {{- if $.Values.resources }}
6670{{ toYaml $.Values.volumeMounts | indent 12 }}
6771 {{- end }}
6872 revisionHistoryLimit : 3
69- strategy : {}
73+ # strategy: {}
7074
Original file line number Diff line number Diff line change 22apiVersion : v1
33kind : Secret
44metadata :
5- name : " scoop-secret"
6- namespace : {{ $.Values.scoopNamespace | default .Release.Namespace }}
5+ name : scoop-secret
6+ namespace : {{ $.Values.scoopnamespace | default .Release.Namespace }}
77type : Opaque
88{{- if $.Values.secrets.data }}
99data :
Original file line number Diff line number Diff line change 22apiVersion : v1
33kind : ServiceAccount
44metadata :
5- name : scoop-sa
5+ name : scoop-sa
66 # namespace: monitoring
77 namespace : {{ $.Values.scoopnamespace | default .Release.Namespace }}
88
Original file line number Diff line number Diff line change 3434 value : " 10080"
3535
3636ConfigMap :
37- name : " scoop-config"
37+ name : scoop-config
3838 enabled : true
3939 data :
4040 key1 : " key1value-1"
41+ key2 : " keyvalue2"
4142
4243secrets :
43- name : " scoop-secret"
44+ name : scoop-secret
4445 enabled : true
4546 data : []
4647
@@ -54,5 +55,5 @@ resources:
5455 cpu : " 0.3"
5556 memory : 2Gi
5657
57- strategy : {}
58+ # strategy: {}
5859
You can’t perform that action at this time.
0 commit comments