Skip to content

brainfood / k8s-helmfiles

Go to a project
Toggle navigation
Toggle navigation pinning
d2643671 by Adam Heath
Options

WIP: Attempt to plumb variables for backup-secrets.

1 parent fc643fa9
Inline Side-by-side
Showing 6 changed files with 31 additions and 30 deletions
...@@ -20,22 +20,19 @@ spec: ...@@ -20,22 +20,19 @@ spec:
20 - name: config 20 - name: config
21 configMap: 21 configMap:
22 name: backup-secrets-config 22 name: backup-secrets-config
23 - name: auth
24 secret:
25 secretName: backup-secrets-auth
26 - name: scripts 23 - name: scripts
27 configMap: 24 configMap:
28 name: backup-secrets-scripts 25 name: backup-secrets-scripts
29 defaultMode: 0755 26 defaultMode: 0755
30 - name: aws-config 27 - name: aws-config
31 configMap: 28 configMap:
32 name: backup-secrets-config 29 name: backup-secrets-aws-config
33 items: 30 items:
34 - key: config 31 - key: config
35 path: config 32 path: config
36 - name: aws-credentials 33 - name: aws-credentials
37 secret: 34 secret:
38 secretName: backup-secrets-auth 35 secretName: backup-secrets-aws-credentials
39 items: 36 items:
40 - key: credentials 37 - key: credentials
41 path: credentials 38 path: credentials
......
...@@ -20,22 +20,19 @@ spec: ...@@ -20,22 +20,19 @@ spec:
20 - name: config 20 - name: config
21 configMap: 21 configMap:
22 name: backup-secrets-config 22 name: backup-secrets-config
23 - name: auth
24 secret:
25 secretName: backup-secrets-auth
26 - name: scripts 23 - name: scripts
27 configMap: 24 configMap:
28 name: backup-secrets-scripts 25 name: backup-secrets-scripts
29 defaultMode: 0755 26 defaultMode: 0755
30 - name: aws-config 27 - name: aws-config
31 configMap: 28 configMap:
32 name: backup-secrets-config 29 name: backup-secrets-aws-config
33 items: 30 items:
34 - key: config 31 - key: config
35 path: config 32 path: config
36 - name: aws-credentials 33 - name: aws-credentials
37 secret: 34 secret:
38 secretName: backup-secrets-auth 35 secretName: backup-secrets-aws-auth
39 items: 36 items:
40 - key: credentials 37 - key: credentials
41 path: credentials 38 path: credentials
...@@ -49,8 +46,6 @@ spec: ...@@ -49,8 +46,6 @@ spec:
49 mountPath: /work-space 46 mountPath: /work-space
50 - name: config 47 - name: config
51 mountPath: /config 48 mountPath: /config
52 - name: auth
53 mountPath: /auth
54 - name: scripts 49 - name: scripts
55 mountPath: /scripts 50 mountPath: /scripts
56 51
...@@ -94,8 +89,6 @@ spec: ...@@ -94,8 +89,6 @@ spec:
94 mountPath: /work-space 89 mountPath: /work-space
95 - name: config 90 - name: config
96 mountPath: /config 91 mountPath: /config
97 - name: auth
98 mountPath: /auth
99 - name: scripts 92 - name: scripts
100 mountPath: /scripts 93 mountPath: /scripts
101 94
......
...@@ -39,6 +39,12 @@ data: ...@@ -39,6 +39,12 @@ data:
39 S3_PREFIX: "um-adam/secret-backup" 39 S3_PREFIX: "um-adam/secret-backup"
40 KEEP_COUNT: "30" 40 KEEP_COUNT: "30"
41 SECRETS_TARBALL: "" 41 SECRETS_TARBALL: ""
42 ---
43 apiVersion: v1
44 kind: ConfigMap
45 metadata:
46 name: backup-secrets-aws-config
47 data:
42 config: "" 48 config: ""
43 --- 49 ---
44 apiVersion: v1 50 apiVersion: v1
...@@ -49,7 +55,7 @@ metadata: ...@@ -49,7 +55,7 @@ metadata:
49 apiVersion: v1 55 apiVersion: v1
50 kind: Secret 56 kind: Secret
51 metadata: 57 metadata:
52 name: backup-secrets-auth 58 name: backup-secrets-aws-credentials
53 stringData: 59 stringData:
54 credentials: "" 60 credentials: ""
55 61
......
...@@ -36,8 +36,6 @@ spec: ...@@ -36,8 +36,6 @@ spec:
36 name: work-space 36 name: work-space
37 - mountPath: /config 37 - mountPath: /config
38 name: config 38 name: config
39 - mountPath: /auth
40 name: auth
41 - mountPath: /scripts 39 - mountPath: /scripts
42 name: scripts 40 name: scripts
43 41
...@@ -57,8 +55,6 @@ spec: ...@@ -57,8 +55,6 @@ spec:
57 name: work-space 55 name: work-space
58 - mountPath: /config 56 - mountPath: /config
59 name: config 57 name: config
60 - mountPath: /auth
61 name: auth
62 - mountPath: /scripts 58 - mountPath: /scripts
63 name: scripts 59 name: scripts
64 - name: copy-from-s3 60 - name: copy-from-s3
...@@ -70,8 +66,6 @@ spec: ...@@ -70,8 +66,6 @@ spec:
70 name: work-space 66 name: work-space
71 - mountPath: /config 67 - mountPath: /config
72 name: config 68 name: config
73 - mountPath: /auth
74 name: auth
75 - mountPath: /scripts 69 - mountPath: /scripts
76 name: scripts 70 name: scripts
77 71
...@@ -95,22 +89,19 @@ spec: ...@@ -95,22 +89,19 @@ spec:
95 emptyDir: {} 89 emptyDir: {}
96 - name: aws-config 90 - name: aws-config
97 configMap: 91 configMap:
98 name: backup-secrets-config 92 name: backup-secrets-aws-config
99 items: 93 items:
100 - key: config 94 - key: config
101 path: config 95 path: config
102 - name: aws-credentials 96 - name: aws-credentials
103 secret: 97 secret:
104 secretName: backup-secrets-auth 98 secretName: backup-secrets-aws-credentials
105 items: 99 items:
106 - key: credentials 100 - key: credentials
107 path: credentials 101 path: credentials
108 - name: config 102 - name: config
109 configMap: 103 configMap:
110 name: backup-secrets-config 104 name: backup-secrets-config
111 - name: auth
112 secret:
113 secretName: backup-secrets-auth
114 - name: scripts 105 - name: scripts
115 configMap: 106 configMap:
116 defaultMode: 0755 107 defaultMode: 0755
......
1 name: test 1 name: test
2 namespace: default 2 namespace: default
3 3
4 config:
5 APP_NAME: test
6 AWS_PROFILE: "default"
7 S3_ENABLED: "true"
8 S3_BUCKET: "xxx"
9 S3_PREFIX: "xxx"
10 KEEP_COUNT: "30"
11 SECRETS_TARBALL: ""
12
4 aws: 13 aws:
5 config: |- 14 config: |-
6 [default] 15 [default]
......
...@@ -15,14 +15,19 @@ releases: ...@@ -15,14 +15,19 @@ releases:
15 metadata: 15 metadata:
16 namespace: {{ .Values.namespace }} 16 namespace: {{ .Values.namespace }}
17 name: {{ .Values.name }}-backup-secrets-config 17 name: {{ .Values.name }}-backup-secrets-config
18 data: {{ .Values.config | toYaml | nindent 10 }}
19 - apiVersion: v1
20 kind: ConfigMap
21 metadata:
22 namespace: {{ .Values.namespace }}
23 name: {{ .Values.name }}-backup-secrets-aws-config
18 data: 24 data:
19 APP_NAME: {{ .Values.name }}-gateway
20 config: {{ .Values.aws.config | quote }} 25 config: {{ .Values.aws.config | quote }}
21 - apiVersion: v1 26 - apiVersion: v1
22 kind: Secret 27 kind: Secret
23 metadata: 28 metadata:
24 namespace: {{ .Values.namespace }} 29 namespace: {{ .Values.namespace }}
25 name: {{ .Values.name }}-backup-secrets-auth 30 name: {{ .Values.name }}-backup-secrets-aws-credentials
26 stringData: 31 stringData:
27 credentials: {{ .Values.aws.credentials | quote }} 32 credentials: {{ .Values.aws.credentials | quote }}
28 33
...@@ -48,10 +53,10 @@ releases: ...@@ -48,10 +53,10 @@ releases:
48 volumes: 53 volumes:
49 - name: aws-config 54 - name: aws-config
50 configMap: 55 configMap:
51 name: {{ .Values.name }}-backup-secrets-config 56 name: {{ .Values.name }}-backup-secrets-aws-config
52 - name: aws-credentials 57 - name: aws-credentials
53 secret: 58 secret:
54 secretName: {{ .Values.name }}-backup-secrets-auth 59 secretName: {{ .Values.name }}-backup-secrets-aws-credentials
55 - name: config 60 - name: config
56 configMap: 61 configMap:
57 name: {{ .Values.name }}-backup-secrets-config 62 name: {{ .Values.name }}-backup-secrets-config
......