Skip to content

Commit 0a7f88f

Browse files
andrewlecuyerjkatz
authored andcommitted
Updates the Ansible installer to include the recent
changes made to use a Kubernetes secret with the 'crunchy-collect' container.
1 parent 5d1e5b6 commit 0a7f88f

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@
144144
"secret": {
145145
"secretName": "{{.PrimarySecretName}}"
146146
}
147+
}, {
148+
"name": "collect-volume",
149+
{{.CollectVolume}}
147150
}, {
148151
"name": "sshd",
149152
"secret": {

ansible/roles/pgo-operator/files/pgo-configs/collect.json

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,32 @@
55
"containerPort": 9187,
66
"protocol": "TCP"
77
}],
8-
"env": [{
9-
"name": "DATA_SOURCE_NAME",
10-
"value": "postgresql://ccp_monitoring:[email protected]:5432/postgres?sslmode=disable"
11-
},
12-
{
13-
"name": "JOB_NAME",
14-
"value": "{{.JobName}}"
15-
}
8+
"env": [
9+
{
10+
"name": "COLLECT_PG_HOST",
11+
"value": "127.0.0.1"
12+
},
13+
{
14+
"name": "COLLECT_PG_PORT",
15+
"value": "{{.PgPort}}"
16+
},
17+
{
18+
"name": "COLLECT_PG_DATABASE",
19+
"value": "postgres"
20+
},
21+
{
22+
"name": "COLLECT_PG_PARAMS",
23+
"value": "sslmode=disable"
24+
},
25+
{
26+
"name": "JOB_NAME",
27+
"value": "{{.JobName}}"
28+
}
29+
],
30+
"volumeMounts": [
31+
{
32+
"mountPath": "/collect-pguser",
33+
"name": "collect-volume"
34+
}
1635
]
1736
}

0 commit comments

Comments
 (0)