Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-06 19:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid substitution issue in kustomize credentials sync

Browse Source 
Signed-off-by: Tim Jacomb <tim.jacomb@hmcts.net>
This commit is contained in:
Tim Jacomb
2021-08-19 11:52:49 +01:00
parent 31da363495
commit 08f5ca39b0
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/integrations/eventhub-credentials-sync/_base/sync.yaml
View File

@@ -50,16 +50,16 @@ spec:
$(RECONCILE_SH) $(RECONCILE_SH)
apply-secret() { apply-secret() {
/kbin/kubectl create secret generic "${1}" \ /kbin/kubectl create secret generic "$1" \
--from-literal=token="${2}" \ --from-literal=token="$2" \
--from-literal=address="${3}" \ --from-literal=address="$3" \
--dry-run=client -o=yaml \ --dry-run=client -o=yaml \
| grep -v "creationTimestamp:" \ | grep -v "creationTimestamp:" \
| /kbin/kubectl apply -f - | /kbin/kubectl apply -f -
} }
pause_loop() { pause_loop() {
sleep "${SYNC_PERIOD:-3600}" || true sleep "$SYNC_PERIOD" || true
} }
graceful_exit() { graceful_exit() {
@@ -71,8 +71,8 @@ spec:
| tr [ % | tr [ %
)" )"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if [ "${job_ids}" ]; then if [ "$job_ids" ]; then
kill ${job_ids} kill $job_ids
fi fi
wait wait
echo "Graceful exit -- $(date)" echo "Graceful exit -- $(date)"
@@ -80,7 +80,7 @@ spec:
trap graceful_exit INT TERM trap graceful_exit INT TERM
echo "Loop started (period: ${SYNC_PERIOD} s) -- $(date)" echo "Loop started (period: $SYNC_PERIOD s) -- $(date)"
while true; do while true; do
reconcile & wait $! reconcile & wait $!
pause_loop & wait $! pause_loop & wait $!

6
manifests/integrations/eventhub-credentials-sync/_cronjobs/_base/sync.yaml
View File

@@ -52,9 +52,9 @@ spec:
$(RECONCILE_SH) $(RECONCILE_SH)
apply-secret() { apply-secret() {
/kbin/kubectl create secret generic "${1}" \ /kbin/kubectl create secret generic "$1" \
--from-literal=token="${2}" \ --from-literal=token="$2" \
--from-literal=address="${3}" \ --from-literal=address="$3" \
--dry-run=client -o=yaml \ --dry-run=client -o=yaml \
| grep -v "creationTimestamp:" \ | grep -v "creationTimestamp:" \
| /kbin/kubectl apply -f - | /kbin/kubectl apply -f -

16
manifests/integrations/registry-credentials-sync/_base/sync.yaml
View File

@@ -46,17 +46,17 @@ spec:
$(RECONCILE_SH) $(RECONCILE_SH)
apply-secret() { apply-secret() {
/kbin/kubectl create secret docker-registry "${1}" \ /kbin/kubectl create secret docker-registry "$1" \
--docker-password="${2}" \ --docker-password="$2" \
--docker-username="${3}" \ --docker-username="$3" \
--docker-server="${4}" \ --docker-server="$4" \
--dry-run=client -o=yaml \ --dry-run=client -o=yaml \
| grep -v "creationTimestamp:" \ | grep -v "creationTimestamp:" \
| /kbin/kubectl apply -f - | /kbin/kubectl apply -f -
} }
pause_loop() { pause_loop() {
sleep "${SYNC_PERIOD:-3600}" || true sleep "$SYNC_PERIOD" || true
} }
graceful_exit() { graceful_exit() {
@@ -68,8 +68,8 @@ spec:
| tr [ % | tr [ %
)" )"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if [ "${job_ids}" ]; then if [ "$job_ids" ]; then
kill ${job_ids} kill $job_ids
fi fi
wait wait
echo "Graceful exit -- $(date)" echo "Graceful exit -- $(date)"
@@ -77,7 +77,7 @@ spec:
trap graceful_exit INT TERM trap graceful_exit INT TERM
echo "Loop started (period: ${SYNC_PERIOD} s) -- $(date)" echo "Loop started (period: $SYNC_PERIOD s) -- $(date)"
while true; do while true; do
reconcile & wait $! reconcile & wait $!
pause_loop & wait $! pause_loop & wait $!

8
manifests/integrations/registry-credentials-sync/_cronjobs/_base/sync.yaml
View File

@@ -48,10 +48,10 @@ spec:
$(RECONCILE_SH) $(RECONCILE_SH)
apply-secret() { apply-secret() {
/kbin/kubectl create secret docker-registry "${1}" \ /kbin/kubectl create secret docker-registry "$1" \
--docker-password="${2}" \ --docker-password="$2" \
--docker-username="${3}" \ --docker-username="$3" \
--docker-server="${4}" \ --docker-server="$4" \
--dry-run=client -o=yaml \ --dry-run=client -o=yaml \
| grep -v "creationTimestamp:" \ | grep -v "creationTimestamp:" \
| /kbin/kubectl apply -f - | /kbin/kubectl apply -f -