Skip to content

Commit 7fcdc51

Browse files
cbandyJonathan S. Katz
cbandy
authored and
Jonathan S. Katz
committed
Remove trailing spaces and indent consistently with spaces in config
To preserve whitespace, Kubernetes renders ConfigMap values with these artifacts as double-quoted scalars in YAML. Removing them makes it possible to `kubectl edit cm/pgo-config` with some effectiveness. The Ansible template for `pgo.yaml` still renders some trailing spaces when some variables are unset.
1 parent c709667 commit 7fcdc51

33 files changed

+438
-448
lines changed

‎ansible/roles/pgo-operator/files/pgo-configs/affinity.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"operator": "{{.OperatorValue}}",
99
"values": [
1010
"{{.NodeLabelValue}}"
11-
]
12-
}]
13-
}
14-
}]
15-
}
11+
]
12+
}]
13+
}
14+
}]
15+
}
1616
},

‎ansible/roles/pgo-operator/files/pgo-configs/backrest-job.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
},
1414
"spec": {
15-
"backoffLimit": 0,
15+
"backoffLimit": 0,
1616
"template": {
1717
"metadata": {
1818
"name": "{{.JobName}}",
@@ -26,16 +26,16 @@
2626
},
2727
"spec": {
2828
"volumes": [
29-
{{.PgbackrestRestoreVolumes}}
30-
],
31-
{{.SecurityContext}}
29+
{{.PgbackrestRestoreVolumes}}
30+
],
31+
{{.SecurityContext}}
3232
"serviceAccountName": "pgo-backrest",
3333
"containers": [{
3434
"name": "backrest",
3535
"image": "{{.PGOImagePrefix}}/pgo-backrest:{{.PGOImageTag}}",
3636
"volumeMounts": [
37-
{{.PgbackrestRestoreVolumeMounts}}
38-
],
37+
{{.PgbackrestRestoreVolumeMounts}}
38+
],
3939
"env": [{
4040
"name": "COMMAND",
4141
"value": "{{.Command}}"

‎ansible/roles/pgo-operator/files/pgo-configs/backrest-restore-job.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,46 +12,46 @@
1212
}
1313
},
1414
"spec": {
15-
"backoffLimit": 0,
15+
"backoffLimit": 0,
1616
"template": {
1717
"metadata": {
1818
"name": "{{.JobName}}",
1919
"labels": {
2020
"vendor": "crunchydata",
21-
"pgo-backrest-restore": "true",
21+
"pgo-backrest-restore": "true",
2222
"backrest-restore-to-pvc": "{{.ToClusterPVCName}}",
2323
"pg-cluster": "{{.ClusterName}}",
2424
"service-name": "{{.ClusterName}}"
2525
}
2626
},
2727
"spec": {
2828
"volumes": [ {
29-
"name": "pgdata",
30-
"persistentVolumeClaim": {
31-
"claimName": "{{.ToClusterPVCName}}"
32-
}
33-
}, {
34-
"name": "sshd",
35-
"secret": {
36-
"secretName": "{{.ClusterName}}-backrest-repo-config",
37-
"defaultMode": 511
38-
}
39-
} ],
29+
"name": "pgdata",
30+
"persistentVolumeClaim": {
31+
"claimName": "{{.ToClusterPVCName}}"
32+
}
33+
}, {
34+
"name": "sshd",
35+
"secret": {
36+
"secretName": "{{.ClusterName}}-backrest-repo-config",
37+
"defaultMode": 511
38+
}
39+
} ],
4040

41-
{{.SecurityContext}}
41+
{{.SecurityContext}}
4242
"serviceAccountName": "pgo-backrest",
4343
"containers": [{
4444
"name": "backrest",
4545
"image": "{{.PGOImagePrefix}}/pgo-backrest-restore:{{.PGOImageTag}}",
4646
"volumeMounts": [ {
47-
"mountPath": "/pgdata",
48-
"name": "pgdata",
49-
"readOnly": false
50-
}, {
51-
"mountPath": "/sshd",
52-
"name": "sshd",
53-
"readOnly": true
54-
} ],
47+
"mountPath": "/pgdata",
48+
"name": "pgdata",
49+
"readOnly": false
50+
}, {
51+
"mountPath": "/sshd",
52+
"name": "sshd",
53+
"readOnly": true
54+
} ],
5555
"env": [{
5656
{{.PgbackrestS3EnvVars}}
5757
"name": "COMMAND_OPTS",

‎ansible/roles/pgo-operator/files/pgo-configs/backup-job.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
"kind": "Job",
44
"metadata": {
55
"name": "{{.JobName}}",
6-
"labels": {
7-
"vendor": "crunchydata",
8-
"pgbackup": "true",
9-
"pg-cluster": "{{.Name}}"
10-
}
6+
"labels": {
7+
"vendor": "crunchydata",
8+
"pgbackup": "true",
9+
"pg-cluster": "{{.Name}}"
10+
}
1111
},
1212
"spec": {
1313
"backoffLimit": 0,
1414
"template": {
1515
"metadata": {
1616
"name": "{{.JobName}}",
1717
"labels": {
18-
"vendor": "crunchydata",
19-
"pgbackup": "true",
20-
"pg-cluster": "{{.Name}}"
18+
"vendor": "crunchydata",
19+
"pgbackup": "true",
20+
"pg-cluster": "{{.Name}}"
2121
}
2222
},
2323
"spec": {
@@ -36,7 +36,7 @@
3636
"name": "pgdata",
3737
"readOnly": false
3838
}],
39-
{{.ContainerResources }}
39+
{{.ContainerResources }}
4040
"env": [{
4141
"name": "BACKUP_HOST",
4242
"value": "{{.BackupHost}}"

‎ansible/roles/pgo-operator/files/pgo-configs/cluster-deployment.json‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
"spec": {
1212
"replicas": {{.Replicas}},
1313
"selector": {
14-
"matchLabels": {
15-
"vendor": "crunchydata",
16-
{{.DeploymentLabels }}
17-
}
14+
"matchLabels": {
15+
"vendor": "crunchydata",
16+
{{.DeploymentLabels }}
17+
}
1818
},
1919
"template": {
2020
"metadata": {
@@ -29,8 +29,6 @@
2929
{{.SecurityContext }}
3030

3131
"containers": [
32-
33-
3432
{
3533
"name": "database",
3634
"image": "{{.CCPImagePrefix}}/{{.CCPImage}}:{{.CCPImageTag}}",
@@ -71,7 +69,7 @@
7169
"name": "PGDATA_PATH_OVERRIDE",
7270
"value": "{{.DataPathOverride}}"
7371
}, {
74-
{{.PgmonitorEnvVars}}
72+
{{.PgmonitorEnvVars}}
7573
{{.PgbackrestEnvVars}}
7674
{{.PgbackrestS3EnvVars}}
7775
"name": "PG_DATABASE",
@@ -115,7 +113,6 @@
115113
"mountPath": "/recover",
116114
"name": "recover-volume"
117115
}
118-
119116
],
120117

121118
"ports": [{
@@ -130,7 +127,7 @@
130127

131128
{{.BadgerAddon }}
132129

133-
],
130+
],
134131
"volumes": [{
135132
"name": "pgdata",
136133
{{.PVCName}}
@@ -151,7 +148,7 @@
151148
"name": "sshd",
152149
"secret": {
153150
"secretName": "{{.ClusterName}}-backrest-repo-config",
154-
"defaultMode": 511
151+
"defaultMode": 511
155152
}
156153
}, {
157154
"name": "root-volume",

‎ansible/roles/pgo-operator/files/pgo-configs/pgbadger.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
,{
22
"name": "pgbadger",
3-
"image": "{{.CCPImagePrefix}}/crunchy-pgbadger:{{.CCPImageTag}}",
3+
"image": "{{.CCPImagePrefix}}/crunchy-pgbadger:{{.CCPImageTag}}",
44
"ports": [ {
55
"containerPort": {{.PGBadgerPort}},
66
"protocol": "TCP"
@@ -13,11 +13,11 @@
1313
"initialDelaySeconds": 20,
1414
"periodSeconds": 10
1515
},
16-
{{.ContainerResources }}
16+
{{.ContainerResources }}
1717
"env": [ {
18-
"name": "BADGER_TARGET",
19-
"value": "{{.BadgerTarget}}"
20-
},{
18+
"name": "BADGER_TARGET",
19+
"value": "{{.BadgerTarget}}"
20+
}, {
2121
"name": "PGBADGER_SERVICE_PORT",
2222
"value": "{{.PGBadgerPort}}"
2323
} ],

‎ansible/roles/pgo-operator/files/pgo-configs/pgbouncer-template.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
"spec": {
1515
"replicas": 1,
1616
"selector": {
17-
"matchLabels": {
18-
"name": "{{.Name}}",
19-
"crunchy-pgbouncer": "true",
20-
"pg-cluster": "{{.ClusterName}}",
21-
"service-name": "{{.Name}}",
22-
"vendor": "crunchydata"
23-
}
24-
},
17+
"matchLabels": {
18+
"name": "{{.Name}}",
19+
"crunchy-pgbouncer": "true",
20+
"pg-cluster": "{{.ClusterName}}",
21+
"service-name": "{{.Name}}",
22+
"vendor": "crunchydata"
23+
}
24+
},
2525
"template": {
2626
"metadata": {
2727
"labels": {
2828
"name": "{{.Name}}",
2929
"crunchy-pgbouncer": "true",
3030
"pg-cluster": "{{.ClusterName}}",
3131
"service-name": "{{.Name}}",
32-
"vendor": "crunchydata"
32+
"vendor": "crunchydata"
3333
}
3434
},
3535
"spec": {
@@ -41,7 +41,7 @@
4141
"containerPort": {{.Port}},
4242
"protocol": "TCP"
4343
}],
44-
{{.ContainerResources }}
44+
{{.ContainerResources }}
4545
"env": [{
4646
"name": "PG_USERNAME",
4747
"valueFrom": {

‎ansible/roles/pgo-operator/files/pgo-configs/pgdump-job.json‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@
77
"vendor": "crunchydata",
88
"pgdump": "true",
99
"pg-cluster": "{{.ClusterName}}",
10-
"pg-task": "{{.TaskName}}"
11-
}
10+
"pg-task": "{{.TaskName}}"
11+
}
1212
},
1313
"spec": {
14-
"backoffLimit": 0,
14+
"backoffLimit": 0,
1515
"template": {
1616
"metadata": {
1717
"name": "{{.JobName}}",
1818
"labels": {
1919
"vendor":"crunchydata",
20-
"pgdump":"true",
21-
"pg-cluster":"{{.ClusterName}}"
20+
"pgdump":"true",
21+
"pg-cluster":"{{.ClusterName}}"
2222
}
2323
},
2424
"spec": {
2525
"volumes": [
2626
{
2727
"name": "pgdata",
2828
"persistentVolumeClaim": {
29-
"claimName": "{{.PgDumpPVC}}"
29+
"claimName": "{{.PgDumpPVC}}"
3030
}
3131
}
3232
],
33-
33+
3434
{{.SecurityContext}}
3535

3636
"containers": [{
@@ -43,7 +43,7 @@
4343
"readOnly": false
4444
}
4545
],
46-
{{.ContainerResources}}
46+
{{.ContainerResources}}
4747
"env": [
4848
{
4949
"name": "PGDUMP_HOST",
@@ -52,41 +52,41 @@
5252
{
5353
"name": "PGDUMP_USER",
5454
"valueFrom": {
55-
"secretKeyRef": {
56-
"name": "{{.PgDumpUserSecret}}",
57-
"key": "username"
58-
}
59-
}
55+
"secretKeyRef": {
56+
"name": "{{.PgDumpUserSecret}}",
57+
"key": "username"
58+
}
59+
}
6060
},
6161
{
6262
"name": "PGDUMP_PASS",
6363
"valueFrom": {
64-
"secretKeyRef": {
65-
"name": "{{.PgDumpUserSecret}}",
66-
"key": "password"
67-
}
68-
}
64+
"secretKeyRef": {
65+
"name": "{{.PgDumpUserSecret}}",
66+
"key": "password"
67+
}
68+
}
6969
},
7070
{
7171
"name": "PGDUMP_DB",
7272
"value": "{{.PgDumpDB}}"
7373
},
74-
{
75-
"name": "PGDUMP_PORT",
76-
"value": "{{.PgDumpPort}}"
77-
},
78-
{
79-
"name": "PGDUMP_CUSTOM_OPTS",
80-
"value": "{{.PgDumpOpts}}"
81-
},
82-
{
83-
"name": "PGDUMP_FILENAME",
84-
"value": "{{.PgDumpFilename}}"
85-
},
86-
{
87-
"name": "PGDUMP_ALL",
88-
"value": "{{.PgDumpAll}}"
89-
}
74+
{
75+
"name": "PGDUMP_PORT",
76+
"value": "{{.PgDumpPort}}"
77+
},
78+
{
79+
"name": "PGDUMP_CUSTOM_OPTS",
80+
"value": "{{.PgDumpOpts}}"
81+
},
82+
{
83+
"name": "PGDUMP_FILENAME",
84+
"value": "{{.PgDumpFilename}}"
85+
},
86+
{
87+
"name": "PGDUMP_ALL",
88+
"value": "{{.PgDumpAll}}"
89+
}
9090
]
9191
}
9292
],

0 commit comments

Comments
 (0)