Skip to content

Commit 3cb22b7

Browse files
authored
fix: Add quotes around top key/value pairs (#92)
1 parent 04350c6 commit 3cb22b7

File tree

2 files changed

+44
-10
lines changed

2 files changed

+44
-10
lines changed

.github/workflows/k8s-reset-data.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,29 @@ jobs:
2929
runs-on:
3030
- self-hosted
3131
steps:
32-
- name: Get helm release values
33-
run: helm get values opencrvs -n ${namespace} > ${namespace}.yaml
32+
- name: Get helm release values and Quote specific fields that are commonly numeric
33+
run: |
34+
helm get values opencrvs -n ${namespace} -ojson | \
35+
jq '
36+
# Quote image tags
37+
if has("image") and (.image | has("tag")) and (.image.tag | type == "number") then
38+
.image.tag = (.image.tag | tostring)
39+
else . end |
40+
41+
# Quote version numbers
42+
if has("version") and (.version | type == "number") then
43+
.version = (.version | tostring)
44+
else . end |
45+
46+
# Quote port numbers if needed (optional)
47+
if has("service") and (.service | has("port")) and (.service.port | type == "number") then
48+
.service.port = (.service.port | tostring)
49+
else . end
50+
' > ${namespace}.json
3451
- name: Cleanup environment
3552
run: |
3653
kubectl delete job -n ${namespace} --ignore-not-found=true data-cleanup
37-
helm template -f ${namespace}.yaml \
54+
helm template -f ${namespace}.json \
3855
--set data_cleanup.enabled=true \
3956
--namespace ${namespace} \
4057
-s templates/data-cleanup-job.yaml \
@@ -47,7 +64,7 @@ jobs:
4764
- name: Re-run postgres on-deploy
4865
run: |
4966
kubectl delete job -n ${namespace} --ignore-not-found=true postgres-on-deploy;
50-
helm template -f ${namespace}.yaml \
67+
helm template -f ${namespace}.json \
5168
-s templates/postgres-on-update.yaml \
5269
--namespace ${namespace} \
5370
oci://ghcr.io/opencrvs/opencrvs-services | kubectl apply -n ${namespace} --wait=true -f -;
@@ -57,7 +74,7 @@ jobs:
5774
- name: Migration
5875
run: |
5976
kubectl delete job -n ${namespace} --ignore-not-found=true data-migration
60-
helm template -f ${namespace}.yaml \
77+
helm template -f ${namespace}.json \
6178
-s templates/data-migration-job.yaml \
6279
--namespace ${namespace} \
6380
oci://ghcr.io/opencrvs/opencrvs-services | kubectl apply -n ${namespace} --wait=true -f -
@@ -67,7 +84,7 @@ jobs:
6784
- name: Re-run postgres on-deploy
6885
run: |
6986
kubectl delete job -n ${namespace} --ignore-not-found=true postgres-on-deploy;
70-
helm template -f ${namespace}.yaml \
87+
helm template -f ${namespace}.json \
7188
-s templates/postgres-on-update.yaml \
7289
--namespace ${namespace} \
7390
oci://ghcr.io/opencrvs/opencrvs-services | kubectl apply -n ${namespace} --wait=true -f -;
@@ -79,7 +96,7 @@ jobs:
7996
kubectl delete job -n ${namespace} --ignore-not-found=true data-seed
8097
kubectl delete pod -n ${namespace} -lapp=events;
8198
kubectl wait --for=condition=ready pod -n ${namespace} -lapp=events;
82-
helm template -f ${namespace}.yaml \
99+
helm template -f ${namespace}.json \
83100
--set data_seed.enabled=true \
84101
--namespace ${namespace} \
85102
-s templates/data-seed-job.yaml \

.github/workflows/k8s-seed-data.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,32 @@ jobs:
2020
ENV: ${{ inputs.environment }}
2121
runs-on: [self-hosted]
2222
steps:
23-
- name: Get values from deployed release
24-
run: helm get values opencrvs --namespace opencrvs-${ENV} > values-${ENV}.yaml
23+
- name: Get helm release values and Quote specific fields that are commonly numeric
24+
run: |
25+
helm get values opencrvs -n ${namespace} -ojson | \
26+
jq '
27+
# Quote image tags
28+
if has("image") and (.image | has("tag")) and (.image.tag | type == "number") then
29+
.image.tag = (.image.tag | tostring)
30+
else . end |
31+
32+
# Quote version numbers
33+
if has("version") and (.version | type == "number") then
34+
.version = (.version | tostring)
35+
else . end |
36+
37+
# Quote port numbers if needed (optional)
38+
if has("service") and (.service | has("port")) and (.service.port | type == "number") then
39+
.service.port = (.service.port | tostring)
40+
else . end
41+
' > ${namespace}.json
2542
- name: Seeding data
2643
run: |
2744
kubectl delete job -n opencrvs-${ENV} data-seed || true
2845
kubectl delete pod -n opencrvs-${ENV} -lapp=events;
2946
sleep 30;
3047
kubectl wait --for=condition=ready pod -n opencrvs-${ENV} -lapp=events;
31-
helm template -f values-${ENV}.yaml \
48+
helm template -f ${namespace}.json \
3249
--set data_seed.enabled=true \
3350
--namespace opencrvs-${ENV} \
3451
-s templates/data-seed-job.yaml \

0 commit comments

Comments
 (0)