Skip to content

Commit 2d29864

Browse files
Adding scoop chartt
1 parent 0ac1976 commit 2d29864

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

charts/scoop/templates/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: v1
33
kind: ConfigMap
44
metadata:
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 }}
88
data:
99
{{ toYaml $.Values.ConfigMap.data | indent 2 }}

charts/scoop/templates/deployment.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ spec:
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 }}
@@ -66,5 +70,5 @@ spec:
6670
{{ toYaml $.Values.volumeMounts | indent 12 }}
6771
{{- end }}
6872
revisionHistoryLimit: 3
69-
strategy: {}
73+
#strategy: {}
7074

charts/scoop/templates/secret.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: v1
33
kind: Secret
44
metadata:
5-
name: "scoop-secret"
6-
namespace: {{ $.Values.scoopNamespace | default .Release.Namespace }}
5+
name: scoop-secret
6+
namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
77
type: Opaque
88
{{- if $.Values.secrets.data }}
99
data:

charts/scoop/templates/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: ServiceAccount
44
metadata:
5-
name: scoop-sa
5+
name: scoop-sa
66
#namespace: monitoring
77
namespace: {{ $.Values.scoopnamespace | default .Release.Namespace }}
88

charts/scoop/values.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ env:
3434
value: "10080"
3535

3636
ConfigMap:
37-
name: "scoop-config"
37+
name: scoop-config
3838
enabled: true
3939
data:
4040
key1: "key1value-1"
41+
key2: "keyvalue2"
4142

4243
secrets:
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

0 commit comments

Comments
 (0)