d2643671 by Adam Heath

WIP: Attempt to plumb variables for backup-secrets.

1 parent fc643fa9
......@@ -20,22 +20,19 @@ spec:
- name: config
configMap:
name: backup-secrets-config
- name: auth
secret:
secretName: backup-secrets-auth
- name: scripts
configMap:
name: backup-secrets-scripts
defaultMode: 0755
- name: aws-config
configMap:
name: backup-secrets-config
name: backup-secrets-aws-config
items:
- key: config
path: config
- name: aws-credentials
secret:
secretName: backup-secrets-auth
secretName: backup-secrets-aws-credentials
items:
- key: credentials
path: credentials
......
......@@ -20,22 +20,19 @@ spec:
- name: config
configMap:
name: backup-secrets-config
- name: auth
secret:
secretName: backup-secrets-auth
- name: scripts
configMap:
name: backup-secrets-scripts
defaultMode: 0755
- name: aws-config
configMap:
name: backup-secrets-config
name: backup-secrets-aws-config
items:
- key: config
path: config
- name: aws-credentials
secret:
secretName: backup-secrets-auth
secretName: backup-secrets-aws-auth
items:
- key: credentials
path: credentials
......@@ -49,8 +46,6 @@ spec:
mountPath: /work-space
- name: config
mountPath: /config
- name: auth
mountPath: /auth
- name: scripts
mountPath: /scripts
......@@ -94,8 +89,6 @@ spec:
mountPath: /work-space
- name: config
mountPath: /config
- name: auth
mountPath: /auth
- name: scripts
mountPath: /scripts
......
......@@ -39,6 +39,12 @@ data:
S3_PREFIX: "um-adam/secret-backup"
KEEP_COUNT: "30"
SECRETS_TARBALL: ""
---
apiVersion: v1
kind: ConfigMap
metadata:
name: backup-secrets-aws-config
data:
config: ""
---
apiVersion: v1
......@@ -49,7 +55,7 @@ metadata:
apiVersion: v1
kind: Secret
metadata:
name: backup-secrets-auth
name: backup-secrets-aws-credentials
stringData:
credentials: ""
......
......@@ -36,8 +36,6 @@ spec:
name: work-space
- mountPath: /config
name: config
- mountPath: /auth
name: auth
- mountPath: /scripts
name: scripts
......@@ -57,8 +55,6 @@ spec:
name: work-space
- mountPath: /config
name: config
- mountPath: /auth
name: auth
- mountPath: /scripts
name: scripts
- name: copy-from-s3
......@@ -70,8 +66,6 @@ spec:
name: work-space
- mountPath: /config
name: config
- mountPath: /auth
name: auth
- mountPath: /scripts
name: scripts
......@@ -95,22 +89,19 @@ spec:
emptyDir: {}
- name: aws-config
configMap:
name: backup-secrets-config
name: backup-secrets-aws-config
items:
- key: config
path: config
- name: aws-credentials
secret:
secretName: backup-secrets-auth
secretName: backup-secrets-aws-credentials
items:
- key: credentials
path: credentials
- name: config
configMap:
name: backup-secrets-config
- name: auth
secret:
secretName: backup-secrets-auth
- name: scripts
configMap:
defaultMode: 0755
......
name: test
namespace: default
config:
APP_NAME: test
AWS_PROFILE: "default"
S3_ENABLED: "true"
S3_BUCKET: "xxx"
S3_PREFIX: "xxx"
KEEP_COUNT: "30"
SECRETS_TARBALL: ""
aws:
config: |-
[default]
......
......@@ -15,14 +15,19 @@ releases:
metadata:
namespace: {{ .Values.namespace }}
name: {{ .Values.name }}-backup-secrets-config
data: {{ .Values.config | toYaml | nindent 10 }}
- apiVersion: v1
kind: ConfigMap
metadata:
namespace: {{ .Values.namespace }}
name: {{ .Values.name }}-backup-secrets-aws-config
data:
APP_NAME: {{ .Values.name }}-gateway
config: {{ .Values.aws.config | quote }}
- apiVersion: v1
kind: Secret
metadata:
namespace: {{ .Values.namespace }}
name: {{ .Values.name }}-backup-secrets-auth
name: {{ .Values.name }}-backup-secrets-aws-credentials
stringData:
credentials: {{ .Values.aws.credentials | quote }}
......@@ -48,10 +53,10 @@ releases:
volumes:
- name: aws-config
configMap:
name: {{ .Values.name }}-backup-secrets-config
name: {{ .Values.name }}-backup-secrets-aws-config
- name: aws-credentials
secret:
secretName: {{ .Values.name }}-backup-secrets-auth
secretName: {{ .Values.name }}-backup-secrets-aws-credentials
- name: config
configMap:
name: {{ .Values.name }}-backup-secrets-config
......