Skip to content

brainfood / k8s-helmfiles

Go to a project
Toggle navigation
Toggle navigation pinning
55d9ad77 by Adam Heath
Options

Merge branch 'master' of gitlab.brainfood.com:brainfood/k8s-helmfiles

2 parents d892403d 09418184
Inline Side-by-side
Showing 7 changed files with 55 additions and 30 deletions
1 apiVersion: kustomize.config.k8s.io/v1beta1
2 kind: Kustomization
3
4 resources:
5 - root-ca.yaml
1 apiVersion: v1
2 kind: Secret
3 metadata:
4 name: root-ca
5 namespace: cert-manager
6 data:
7 ---
...@@ -10,5 +10,4 @@ clusterIssuer: ...@@ -10,5 +10,4 @@ clusterIssuer:
10 root-ca: 10 root-ca:
11 crt: null 11 crt: null
12 key: null 12 key: null
13 version: 13 version: {}
14 raw: 1.1.0
......
...@@ -4,22 +4,13 @@ bases: ...@@ -4,22 +4,13 @@ bases:
4 repositories: 4 repositories:
5 - name: jetstack 5 - name: jetstack
6 url: https://charts.jetstack.io 6 url: https://charts.jetstack.io
7 - name: bedag
8 url: https://bedag.github.io/helm-charts/
9 7
10 --- 8 ---
11 releases: 9 releases:
12 - name: cert-manager 10 - name: root-ca
13 chart: jetstack/cert-manager 11 chart: charts/root-ca
14 namespace: cert-manager 12 namespace: cert-manager
15 dependencies: 13 strategicMergePatches:
16 - chart: bedag/raw
17 alias: root-ca
18 version: {{ $.Values.version.raw }}
19 values:
20 - installCRDs: true
21 - root-ca:
22 resources:
23 - apiVersion: v1 14 - apiVersion: v1
24 kind: Secret 15 kind: Secret
25 metadata: 16 metadata:
...@@ -31,6 +22,12 @@ releases: ...@@ -31,6 +22,12 @@ releases:
31 ca.crt: {{ .Values | get "root-ca.crt" }} 22 ca.crt: {{ .Values | get "root-ca.crt" }}
32 ca.key: {{ .Values | get "root-ca.key" }} 23 ca.key: {{ .Values | get "root-ca.key" }}
33 24
25 - name: cert-manager
26 chart: jetstack/cert-manager
27 namespace: cert-manager
28 values:
29 - installCRDs: true
30
34 - name: cluster-issuer 31 - name: cluster-issuer
35 chart: charts/cluster-issuer 32 chart: charts/cluster-issuer
36 disableValidationOnInstall: true 33 disableValidationOnInstall: true
......
...@@ -21,7 +21,7 @@ releases: ...@@ -21,7 +21,7 @@ releases:
21 path: /spec/template/spec/containers/0/env/- 21 path: /spec/template/spec/containers/0/env/-
22 value: 22 value:
23 name: QUARKUS_OPERATOR_SDK_NAMESPACES 23 name: QUARKUS_OPERATOR_SDK_NAMESPACES
24 value: {{ .Values.watchNamespaces }} 24 value: {{ .Values.watchNamespaces | quote }}
25 - target: 25 - target:
26 kind: Role 26 kind: Role
27 name: keycloak-operator-role 27 name: keycloak-operator-role
......
1 namespace: postgres-operator 1 namespace: postgres-operator
2 backup: 2 backup:
3 logical:
3 provider: s3 4 provider: s3
5 sse: "AES256"
6 s3:
7 endpoint: ""
8 schedule: "00 12 * * *"
9 num_to_retain: "5"
4 s3: 10 s3:
5 access_key_id: "" 11 access_key_id: ""
6 secret_access_key: "" 12 secret_access_key: ""
13 force_path_style: false
7 bucket: "" 14 bucket: ""
8 region: "" 15 region: ""
9 endpoint: "" 16 endpoint: ""
10 sse: "AES256" 17 walg:
11 wale: 18 disable_sse: false
12 endpoint: ""
13 storage_class: STANDARD
14
......
...@@ -18,12 +18,25 @@ releases: ...@@ -18,12 +18,25 @@ releases:
18 name: postgres-extra-config 18 name: postgres-extra-config
19 namespace: {{ .Values.namespace }} 19 namespace: {{ .Values.namespace }}
20 data: 20 data:
21 BACKUP_SCHEDULE: {{ .Values.backup.schedule | quote }}
22 BACKUP_NUM_TO_RETAIN: {{ .Values.backup.num_to_retain | quote }}
23
24 AWS_ENDPOINT: {{ .Values.backup.s3.endpoint }}
21 AWS_ACCESS_KEY_ID: {{ .Values.backup.s3.access_key_id }} 25 AWS_ACCESS_KEY_ID: {{ .Values.backup.s3.access_key_id }}
22 AWS_SECRET_ACCESS_KEY: {{ .Values.backup.s3.secret_access_key }} 26 AWS_SECRET_ACCESS_KEY: {{ .Values.backup.s3.secret_access_key }}
23 AWS_REGION: {{ .Values.backup.s3.region }} 27 AWS_REGION: {{ .Values.backup.s3.region }}
24 USE_WALE_BACKUP: "true" 28 AWS_S3_FORCE_PATH_STYLE: {{ .Values.backup.s3.force_path_style | quote }}
25 WALE_S3_ENDPOINT: {{ .Values.backup.s3.wale.endpoint }} 29
26 WALE_S3_STORAGE_CLASS: {{ .Values.backup.s3.wale.storage_class }} 30 USE_WALG_BACKUP: "true"
31 USE_WALG_RESTORE: "true"
32 WAL_S3_BUCKET: {{ .Values.backup.s3.bucket }}
33 WALG_DISABLE_S3_SSE: {{ .Values.backup.walg.disable_sse | quote }}
34
35 CLONE_METHOD: CLONE_WITH_WALG
36 CLONE_AWS_REGION: {{ .Values.backup.s3.region }}
37 CLONE_AWS_ACCESS_KEY_ID: {{ .Values.backup.s3.access_key_id }}
38 CLONE_AWS_SECRET_ACCESS_KEY: {{ .Values.backup.s3.secret_access_key }}
39 CLONE_AWS_S3_FORCE_PATH_STYLE: {{ .Values.backup.s3.force_path_style | quote }}
27 40
28 - name: postgres-operator 41 - name: postgres-operator
29 namespace: {{ .Values.namespace }} 42 namespace: {{ .Values.namespace }}
...@@ -31,13 +44,13 @@ releases: ...@@ -31,13 +44,13 @@ releases:
31 disableValidation: true 44 disableValidation: true
32 values: 45 values:
33 - configLogicalBackup: 46 - configLogicalBackup:
34 logical_backup_provider: {{ .Values.backup.provider }} 47 logical_backup_provider: {{ .Values.backup.logical.provider }}
35 logical_backup_s3_access_key_id: {{ .Values.backup.s3.access_key_id }} 48 logical_backup_s3_endpoint: {{ .Values.backup | get "logical.s3.endpoint" ( .Values.backup | get "s3.endpoint" "" ) }}
36 logical_backup_s3_bucket: {{ .Values.backup.s3.bucket }} 49 logical_backup_s3_access_key_id: {{ .Values.backup | get "logical.s3.access_key_id" .Values.backup.s3.access_key_id }}
37 logical_backup_s3_region: {{ .Values.backup.s3.region }} 50 logical_backup_s3_secret_access_key: {{ .Values.backup | get "logical.s3.secret_access_key" .Values.backup.s3.secret_access_key }}
38 logical_backup_s3_endpoint: {{ .Values.backup.s3.endpoint }} 51 logical_backup_s3_bucket: {{ .Values.backup | get "logical.s3.bucket" .Values.backup.s3.bucket }}
39 logical_backup_s3_secret_access_key: {{ .Values.backup.s3.secret_access_key }} 52 logical_backup_s3_region: {{ .Values.backup | get "logical.s3.region" ( .Values.backup | get "s3.region" "" ) }}
40 logical_backup_s3_sse: {{ .Values.backup.s3.sse }} 53 logical_backup_s3_sse: {{ .Values.backup | get "logical.s3.sse" ( .Values.backup | get "s3.sse" "" ) }}
41 configAwsOrGcp: 54 configAwsOrGcp:
42 wal_s3_bucket: {{ .Values.backup.s3.bucket }} 55 wal_s3_bucket: {{ .Values.backup.s3.bucket }}
43 configKubernetes: 56 configKubernetes:
......