Skip to content

Commit fcced9f

Browse files
authored
Merge pull request #19 from superfly/resizer
use kubernetes service host env var
2 parents 0f0bcb7 + 37f2231 commit fcced9f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

internal/postgres/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ done
216216
if post250 {
217217
script = fmt.Sprintf(`
218218
# Parameters for curl when managing autogrow annotation.
219-
APISERVER="https://kubernetes.default.svc"
219+
APISERVER="https://${KUBERNETES_SERVICE_HOST}"
220220
SERVICEACCOUNT="/var/run/secrets/kubernetes.io/serviceaccount"
221221
NAMESPACE=$(cat ${SERVICEACCOUNT}/namespace)
222222
TOKEN=$(cat ${SERVICEACCOUNT}/token)
@@ -246,7 +246,7 @@ while read -r -t 5 -u "${fd}" ||:; do
246246
newSize="$(((sizeInt / 2)+sizeInt))"
247247
newSizeMi="${newSize}Mi"
248248
d='[{"op": "add", "path": "/metadata/annotations/suggested-pgdata-pvc-size", "value": "'"$newSizeMi"'"}]'
249-
curl --cacert ${CACERT} --header "Authorization: Bearer ${TOKEN}" -XPATCH "${APISERVER}/api/v1/namespaces/${NAMESPACE}/pods/${HOSTNAME}?fieldManager=kubectl-annotate" -H "Content-Type: application/json-patch+json" --data "$d"
249+
curl --cacert ${CACERT} --header "Authorization: Bearer ${TOKEN}" -XPATCH "${APISERVER}/api/v1/namespaces/${NAMESPACE}/pods/${hostname}?fieldManager=kubectl-annotate" -H "Content-Type: application/json-patch+json" --data "$d"
250250
fi
251251
done
252252
`,

internal/postgres/reconcile_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ containers:
172172
- |-
173173
monitor() {
174174
# Parameters for curl when managing autogrow annotation.
175-
APISERVER="https://kubernetes.default.svc"
175+
APISERVER="https://${KUBERNETES_SERVICE_HOST}"
176176
SERVICEACCOUNT="/var/run/secrets/kubernetes.io/serviceaccount"
177177
NAMESPACE=$(cat ${SERVICEACCOUNT}/namespace)
178178
TOKEN=$(cat ${SERVICEACCOUNT}/token)
@@ -202,7 +202,7 @@ containers:
202202
newSize="$(((sizeInt / 2)+sizeInt))"
203203
newSizeMi="${newSize}Mi"
204204
d='[{"op": "add", "path": "/metadata/annotations/suggested-pgdata-pvc-size", "value": "'"$newSizeMi"'"}]'
205-
curl --cacert ${CACERT} --header "Authorization: Bearer ${TOKEN}" -XPATCH "${APISERVER}/api/v1/namespaces/${NAMESPACE}/pods/${HOSTNAME}?fieldManager=kubectl-annotate" -H "Content-Type: application/json-patch+json" --data "$d"
205+
curl --cacert ${CACERT} --header "Authorization: Bearer ${TOKEN}" -XPATCH "${APISERVER}/api/v1/namespaces/${NAMESPACE}/pods/${hostname}?fieldManager=kubectl-annotate" -H "Content-Type: application/json-patch+json" --data "$d"
206206
fi
207207
done
208208
}; export -f monitor; exec -a "$0" bash -ceu monitor

0 commit comments

Comments
 (0)