Skip to content

Commit 8a674f5

Browse files
shreddedbaconshreddedbacon
authored
fix: use secretKeyRef in prebackuppods (#424)
1 parent abc4f64 commit 8a674f5

File tree

8 files changed

+60
-60
lines changed

8 files changed

+60
-60
lines changed

‎internal/templating/template_prebackuppod.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func GeneratePreBackupPod(
122122
prebackuppod.Spec.Pod.Spec.Containers[0].Env = append(prebackuppod.Spec.Pod.Spec.Containers[0].Env, v1.EnvVar{
123123
Name: "BACKUP_DB_READREPLICA_HOSTS",
124124
ValueFrom: &v1.EnvVarSource{
125-
ConfigMapKeyRef: &v1.ConfigMapKeySelector{
125+
SecretKeyRef: &v1.SecretKeySelector{
126126
Key: fmt.Sprintf("%s_READREPLICA_HOSTS", varFix(serviceValues.OverrideName)),
127127
LocalObjectReference: v1.LocalObjectReference{
128128
Name: "lagoon-env",
@@ -212,7 +212,7 @@ func GeneratePreBackupPod(
212212
prebackuppod.Spec.Pod.Spec.Containers[0].Env = append(prebackuppod.Spec.Pod.Spec.Containers[0].Env, v1.EnvVar{
213213
Name: "BACKUP_DB_READREPLICA_HOSTS",
214214
ValueFrom: &v1.EnvVarSource{
215-
ConfigMapKeyRef: &v1.ConfigMapKeySelector{
215+
SecretKeyRef: &v1.SecretKeySelector{
216216
Key: fmt.Sprintf("%s_READREPLICA_HOSTS", varFix(serviceValues.OverrideName)),
217217
LocalObjectReference: v1.LocalObjectReference{
218218
Name: "lagoon-env",
@@ -337,22 +337,22 @@ pod:
337337
env:
338338
- name: BACKUP_DB_HOST
339339
valueFrom:
340-
configMapKeyRef:
340+
secretKeyRef:
341341
key: {{ .Service.Name | VarFix }}_HOST
342342
name: lagoon-env
343343
- name: BACKUP_DB_USERNAME
344344
valueFrom:
345-
configMapKeyRef:
345+
secretKeyRef:
346346
key: {{ .Service.Name | VarFix }}_USERNAME
347347
name: lagoon-env
348348
- name: BACKUP_DB_PASSWORD
349349
valueFrom:
350-
configMapKeyRef:
350+
secretKeyRef:
351351
key: {{ .Service.Name | VarFix }}_PASSWORD
352352
name: lagoon-env
353353
- name: BACKUP_DB_DATABASE
354354
valueFrom:
355-
configMapKeyRef:
355+
secretKeyRef:
356356
key: {{ .Service.Name | VarFix }}_DATABASE
357357
name: lagoon-env
358358
image: uselagoon/database-tools:latest
@@ -377,22 +377,22 @@ pod:
377377
env:
378378
- name: BACKUP_DB_HOST
379379
valueFrom:
380-
configMapKeyRef:
380+
secretKeyRef:
381381
key: {{ .Service.Name | VarFix }}_HOST
382382
name: lagoon-env
383383
- name: BACKUP_DB_USERNAME
384384
valueFrom:
385-
configMapKeyRef:
385+
secretKeyRef:
386386
key: {{ .Service.Name | VarFix }}_USERNAME
387387
name: lagoon-env
388388
- name: BACKUP_DB_PASSWORD
389389
valueFrom:
390-
configMapKeyRef:
390+
secretKeyRef:
391391
key: {{ .Service.Name | VarFix }}_PASSWORD
392392
name: lagoon-env
393393
- name: BACKUP_DB_DATABASE
394394
valueFrom:
395-
configMapKeyRef:
395+
secretKeyRef:
396396
key: {{ .Service.Name | VarFix }}_DATABASE
397397
name: lagoon-env
398398
image: uselagoon/database-tools:latest
@@ -409,42 +409,42 @@ pod:
409409
env:
410410
- name: BACKUP_DB_HOST
411411
valueFrom:
412-
configMapKeyRef:
412+
secretKeyRef:
413413
key: {{ .Service.Name | VarFix }}_HOST
414414
name: lagoon-env
415415
- name: BACKUP_DB_USERNAME
416416
valueFrom:
417-
configMapKeyRef:
417+
secretKeyRef:
418418
key: {{ .Service.Name | VarFix }}_USERNAME
419419
name: lagoon-env
420420
- name: BACKUP_DB_PASSWORD
421421
valueFrom:
422-
configMapKeyRef:
422+
secretKeyRef:
423423
key: {{ .Service.Name | VarFix }}_PASSWORD
424424
name: lagoon-env
425425
- name: BACKUP_DB_DATABASE
426426
valueFrom:
427-
configMapKeyRef:
427+
secretKeyRef:
428428
key: {{ .Service.Name | VarFix }}_DATABASE
429429
name: lagoon-env
430430
- name: BACKUP_DB_PORT
431431
valueFrom:
432-
configMapKeyRef:
432+
secretKeyRef:
433433
key: {{ .Service.Name | VarFix }}_PORT
434434
name: lagoon-env
435435
- name: BACKUP_DB_AUTHSOURCE
436436
valueFrom:
437-
configMapKeyRef:
437+
secretKeyRef:
438438
key: {{ .Service.Name | VarFix }}_AUTHSOURCE
439439
name: lagoon-env
440440
- name: BACKUP_DB_AUTHMECHANISM
441441
valueFrom:
442-
configMapKeyRef:
442+
secretKeyRef:
443443
key: {{ .Service.Name | VarFix }}_AUTHMECHANISM
444444
name: lagoon-env
445445
- name: BACKUP_DB_AUTHTLS
446446
valueFrom:
447-
configMapKeyRef:
447+
secretKeyRef:
448448
key: {{ .Service.Name | VarFix }}_AUTHTLS
449449
name: lagoon-env
450450
image: uselagoon/database-tools:latest

‎internal/templating/test-resources/backups/result-prebackuppod1.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ spec:
3232
env:
3333
- name: BACKUP_DB_HOST
3434
valueFrom:
35-
configMapKeyRef:
35+
secretKeyRef:
3636
key: MARIADB_DATABASE_HOST
3737
name: lagoon-env
3838
- name: BACKUP_DB_USERNAME
3939
valueFrom:
40-
configMapKeyRef:
40+
secretKeyRef:
4141
key: MARIADB_DATABASE_USERNAME
4242
name: lagoon-env
4343
- name: BACKUP_DB_PASSWORD
4444
valueFrom:
45-
configMapKeyRef:
45+
secretKeyRef:
4646
key: MARIADB_DATABASE_PASSWORD
4747
name: lagoon-env
4848
- name: BACKUP_DB_DATABASE
4949
valueFrom:
50-
configMapKeyRef:
50+
secretKeyRef:
5151
key: MARIADB_DATABASE_DATABASE
5252
name: lagoon-env
5353
- name: BACKUP_DB_READREPLICA_HOSTS
5454
valueFrom:
55-
configMapKeyRef:
55+
secretKeyRef:
5656
key: MARIADB_DATABASE_READREPLICA_HOSTS
5757
name: lagoon-env
5858
image: uselagoon/database-tools:latest

‎internal/templating/test-resources/backups/result-prebackuppod2.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ spec:
3232
env:
3333
- name: BACKUP_DB_HOST
3434
valueFrom:
35-
configMapKeyRef:
35+
secretKeyRef:
3636
key: POSTGRES_DATABASE_HOST
3737
name: lagoon-env
3838
- name: BACKUP_DB_USERNAME
3939
valueFrom:
40-
configMapKeyRef:
40+
secretKeyRef:
4141
key: POSTGRES_DATABASE_USERNAME
4242
name: lagoon-env
4343
- name: BACKUP_DB_PASSWORD
4444
valueFrom:
45-
configMapKeyRef:
45+
secretKeyRef:
4646
key: POSTGRES_DATABASE_PASSWORD
4747
name: lagoon-env
4848
- name: BACKUP_DB_DATABASE
4949
valueFrom:
50-
configMapKeyRef:
50+
secretKeyRef:
5151
key: POSTGRES_DATABASE_DATABASE
5252
name: lagoon-env
5353
- name: BACKUP_DB_READREPLICA_HOSTS
5454
valueFrom:
55-
configMapKeyRef:
55+
secretKeyRef:
5656
key: POSTGRES_DATABASE_READREPLICA_HOSTS
5757
name: lagoon-env
5858
image: uselagoon/database-tools:latest

‎internal/templating/test-resources/backups/result-prebackuppod3.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,47 +34,47 @@ spec:
3434
env:
3535
- name: BACKUP_DB_HOST
3636
valueFrom:
37-
configMapKeyRef:
37+
secretKeyRef:
3838
key: MONGODB_DATABASE_HOST
3939
name: lagoon-env
4040
- name: BACKUP_DB_USERNAME
4141
valueFrom:
42-
configMapKeyRef:
42+
secretKeyRef:
4343
key: MONGODB_DATABASE_USERNAME
4444
name: lagoon-env
4545
- name: BACKUP_DB_PASSWORD
4646
valueFrom:
47-
configMapKeyRef:
47+
secretKeyRef:
4848
key: MONGODB_DATABASE_PASSWORD
4949
name: lagoon-env
5050
- name: BACKUP_DB_DATABASE
5151
valueFrom:
52-
configMapKeyRef:
52+
secretKeyRef:
5353
key: MONGODB_DATABASE_DATABASE
5454
name: lagoon-env
5555
- name: BACKUP_DB_PORT
5656
valueFrom:
57-
configMapKeyRef:
57+
secretKeyRef:
5858
key: MONGODB_DATABASE_PORT
5959
name: lagoon-env
6060
- name: BACKUP_DB_AUTHSOURCE
6161
valueFrom:
62-
configMapKeyRef:
62+
secretKeyRef:
6363
key: MONGODB_DATABASE_AUTHSOURCE
6464
name: lagoon-env
6565
- name: BACKUP_DB_AUTHMECHANISM
6666
valueFrom:
67-
configMapKeyRef:
67+
secretKeyRef:
6868
key: MONGODB_DATABASE_AUTHMECHANISM
6969
name: lagoon-env
7070
- name: BACKUP_DB_AUTHTLS
7171
valueFrom:
72-
configMapKeyRef:
72+
secretKeyRef:
7373
key: MONGODB_DATABASE_AUTHTLS
7474
name: lagoon-env
7575
- name: BACKUP_DB_READREPLICA_HOSTS
7676
valueFrom:
77-
configMapKeyRef:
77+
secretKeyRef:
7878
key: MONGODB_DATABASE_READREPLICA_HOSTS
7979
name: lagoon-env
8080
image: uselagoon/database-tools:latest

‎internal/templating/test-resources/backups/result-prebackuppod4.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ spec:
3232
env:
3333
- name: BACKUP_DB_HOST
3434
valueFrom:
35-
configMapKeyRef:
35+
secretKeyRef:
3636
key: MARIADB_DATABASE_HOST
3737
name: lagoon-env
3838
- name: BACKUP_DB_USERNAME
3939
valueFrom:
40-
configMapKeyRef:
40+
secretKeyRef:
4141
key: MARIADB_DATABASE_USERNAME
4242
name: lagoon-env
4343
- name: BACKUP_DB_PASSWORD
4444
valueFrom:
45-
configMapKeyRef:
45+
secretKeyRef:
4646
key: MARIADB_DATABASE_PASSWORD
4747
name: lagoon-env
4848
- name: BACKUP_DB_DATABASE
4949
valueFrom:
50-
configMapKeyRef:
50+
secretKeyRef:
5151
key: MARIADB_DATABASE_DATABASE
5252
name: lagoon-env
5353
- name: BACKUP_DB_READREPLICA_HOSTS
5454
valueFrom:
55-
configMapKeyRef:
55+
secretKeyRef:
5656
key: MARIADB_DATABASE_READREPLICA_HOSTS
5757
name: lagoon-env
5858
image: uselagoon/database-tools:latest

‎internal/templating/test-resources/backups/result-prebackuppod5.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ spec:
3232
env:
3333
- name: BACKUP_DB_HOST
3434
valueFrom:
35-
configMapKeyRef:
35+
secretKeyRef:
3636
key: MARIADB_DATABASE_HOST
3737
name: lagoon-env
3838
- name: BACKUP_DB_USERNAME
3939
valueFrom:
40-
configMapKeyRef:
40+
secretKeyRef:
4141
key: MARIADB_DATABASE_USERNAME
4242
name: lagoon-env
4343
- name: BACKUP_DB_PASSWORD
4444
valueFrom:
45-
configMapKeyRef:
45+
secretKeyRef:
4646
key: MARIADB_DATABASE_PASSWORD
4747
name: lagoon-env
4848
- name: BACKUP_DB_DATABASE
4949
valueFrom:
50-
configMapKeyRef:
50+
secretKeyRef:
5151
key: MARIADB_DATABASE_DATABASE
5252
name: lagoon-env
5353
- name: BACKUP_DB_READREPLICA_HOSTS
5454
valueFrom:
55-
configMapKeyRef:
55+
secretKeyRef:
5656
key: MARIADB_DATABASE_READREPLICA_HOSTS
5757
name: lagoon-env
5858
image: uselagoon/database-tools:latest
@@ -93,27 +93,27 @@ spec:
9393
env:
9494
- name: BACKUP_DB_HOST
9595
valueFrom:
96-
configMapKeyRef:
96+
secretKeyRef:
9797
key: MARIADB_HOST
9898
name: lagoon-env
9999
- name: BACKUP_DB_USERNAME
100100
valueFrom:
101-
configMapKeyRef:
101+
secretKeyRef:
102102
key: MARIADB_USERNAME
103103
name: lagoon-env
104104
- name: BACKUP_DB_PASSWORD
105105
valueFrom:
106-
configMapKeyRef:
106+
secretKeyRef:
107107
key: MARIADB_PASSWORD
108108
name: lagoon-env
109109
- name: BACKUP_DB_DATABASE
110110
valueFrom:
111-
configMapKeyRef:
111+
secretKeyRef:
112112
key: MARIADB_DATABASE
113113
name: lagoon-env
114114
- name: BACKUP_DB_READREPLICA_HOSTS
115115
valueFrom:
116-
configMapKeyRef:
116+
secretKeyRef:
117117
key: MARIADB_READREPLICA_HOSTS
118118
name: lagoon-env
119119
image: uselagoon/database-tools:latest

‎internal/testdata/complex/backup-templates/backup-1/prebackuppods.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ spec:
3232
env:
3333
- name: BACKUP_DB_HOST
3434
valueFrom:
35-
configMapKeyRef:
35+
secretKeyRef:
3636
key: MARIADB_HOST
3737
name: lagoon-env
3838
- name: BACKUP_DB_USERNAME
3939
valueFrom:
40-
configMapKeyRef:
40+
secretKeyRef:
4141
key: MARIADB_USERNAME
4242
name: lagoon-env
4343
- name: BACKUP_DB_PASSWORD
4444
valueFrom:
45-
configMapKeyRef:
45+
secretKeyRef:
4646
key: MARIADB_PASSWORD
4747
name: lagoon-env
4848
- name: BACKUP_DB_DATABASE
4949
valueFrom:
50-
configMapKeyRef:
50+
secretKeyRef:
5151
key: MARIADB_DATABASE
5252
name: lagoon-env
5353
image: imagecache.example.com/uselagoon/database-tools:latest

‎internal/testdata/complex/backup-templates/backup-2/prebackuppods.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ spec:
3232
env:
3333
- name: BACKUP_DB_HOST
3434
valueFrom:
35-
configMapKeyRef:
35+
secretKeyRef:
3636
key: MARIADB_HOST
3737
name: lagoon-env
3838
- name: BACKUP_DB_USERNAME
3939
valueFrom:
40-
configMapKeyRef:
40+
secretKeyRef:
4141
key: MARIADB_USERNAME
4242
name: lagoon-env
4343
- name: BACKUP_DB_PASSWORD
4444
valueFrom:
45-
configMapKeyRef:
45+
secretKeyRef:
4646
key: MARIADB_PASSWORD
4747
name: lagoon-env
4848
- name: BACKUP_DB_DATABASE
4949
valueFrom:
50-
configMapKeyRef:
50+
secretKeyRef:
5151
key: MARIADB_DATABASE
5252
name: lagoon-env
5353
image: imagecache.example.com/uselagoon/database-tools:latest

0 commit comments

Comments
 (0)