Skip to content

Commit 805648e

Browse files
sdwilshsdwilsh
committed
fix(kube-vip): codegen no longer works correctly, breaking action
1 parent 482988f commit 805648e

2 files changed

Lines changed: 39 additions & 36 deletions

File tree

‎.github/workflows/codegen-kube-vip.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ jobs:
4141
git config user.name "formwork-remover[bot]"
4242
git config user.email "${{ vars.FORMWORK_REMOVER_APP_ID }}+formwork-remover[bot]@users.noreply.github.com"
4343
git add kustomization/components/kube-vip/daemonset/ kustomization/components/kube-vip/rbac.yml
44-
git diff --cached --quiet && exit 0
44+
if git diff --cached --quiet; then
45+
echo "No changes to commit."
46+
exit 0
47+
fi
4548
git commit -m "chore(package): regenerate kube-vip manifests"
4649
git push

‎justfile‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -36,40 +36,40 @@ codegen-kube-vip:
3636
> ${SCRATCH}
3737
3838
# Drop namespace and let user configure this.
39-
yq -iy 'del(.metadata.namespace)' ${SCRATCH}
39+
yq -i 'del(.metadata.namespace)' ${SCRATCH}
4040
4141
# Remove creationTimestamp fields as we do not care about them.
42-
yq -iy 'del(.metadata.creationTimestamp)' ${SCRATCH}
43-
yq -iy 'del(.spec.template.metadata.creationTimestamp)' ${SCRATCH}
42+
yq -i 'del(.metadata.creationTimestamp)' ${SCRATCH}
43+
yq -i 'del(.spec.template.metadata.creationTimestamp)' ${SCRATCH}
4444
4545
# Remove empty objects that get added by their generator.
46-
yq -iy 'del(.spec.template.spec.containers[0].resources)' ${SCRATCH}
47-
yq -iy 'del(.spec.updateStrategy)' ${SCRATCH}
46+
yq -i 'del(.spec.template.spec.containers[0].resources)' ${SCRATCH}
47+
yq -i 'del(.spec.updateStrategy)' ${SCRATCH}
4848
4949
# Remove the tag from the image, as it is managed by the `kustomization.yml` file.
50-
yq -iy '.spec.template.spec.containers[0].image = "ghcr.io/kube-vip/kube-vip"' ${SCRATCH}
50+
yq -i '.spec.template.spec.containers[0].image = "ghcr.io/kube-vip/kube-vip"' ${SCRATCH}
5151
5252
# Remove VIP address, as this is a required patch.
53-
yq -iy 'del(.spec.template.spec.containers[0].env[] | select(.name == "address"))' ${SCRATCH}
53+
yq -i 'del(.spec.template.spec.containers[0].env[] | select(.name == "address"))' ${SCRATCH}
5454
5555
# Remove prometheus_server.
56-
yq -iy 'del(.spec.template.spec.containers[0].env[] | select(.name == "prometheus_server"))' ${SCRATCH}
56+
yq -i 'del(.spec.template.spec.containers[0].env[] | select(.name == "prometheus_server"))' ${SCRATCH}
5757
5858
# Set cp_namespace via a reference.
59-
yq -iy 'del(.spec.template.spec.containers[0].env[] | select(.name == "cp_namespace") | .value)' ${SCRATCH}
60-
yq -iy '(.spec.template.spec.containers[0].env[] | select(.name == "cp_namespace") | .valueFrom.fieldRef.fieldPath) = "metadata.namespace"' ${SCRATCH}
59+
yq -i 'del(.spec.template.spec.containers[0].env[] | select(.name == "cp_namespace") | .value)' ${SCRATCH}
60+
yq -i '(.spec.template.spec.containers[0].env[] | select(.name == "cp_namespace") | .valueFrom.fieldRef.fieldPath) = "metadata.namespace"' ${SCRATCH}
6161
6262
# Add appropriate priorityClassName to the manifest.
63-
yq -iy '.spec.template.spec.priorityClassName = "system-cluster-critical"' ${SCRATCH}
63+
yq -i '.spec.template.spec.priorityClassName = "system-cluster-critical"' ${SCRATCH}
6464
6565
# Sort the container's env by the name of the environment variables to set.
66-
yq -iy '.spec.template.spec.containers[0].env |= sort_by(.name)' ${SCRATCH}
66+
yq -i '.spec.template.spec.containers[0].env |= sort_by(.name)' ${SCRATCH}
6767
6868
# Write out the final output.
6969
echo '# @codegen-command: just codegen-kube-vip' > ${DEST}
7070
echo '# @generated' >> ${DEST}
7171
echo '---' >> ${DEST}
72-
yq -y -S '' ${SCRATCH} \
72+
yq '.' ${SCRATCH} \
7373
| sed -e "s/'/\"/g" \
7474
>> ${DEST}
7575
@@ -86,44 +86,44 @@ codegen-kube-vip:
8686
> ${SCRATCH}
8787
8888
# Set a unique name that is different from the control plane daemonset.
89-
yq -iy '.metadata.name = "kube-vip-svc-ds"' ${SCRATCH}
90-
yq -iy '.spec.selector.matchLabels."app.kubernetes.io/name" = "kube-vip-svc-ds"' ${SCRATCH}
91-
yq -iy '.spec.template.metadata.labels."app.kubernetes.io/name" = "kube-vip-svc-ds"' ${SCRATCH}
89+
yq -i '.metadata.name = "kube-vip-svc-ds"' ${SCRATCH}
90+
yq -i '.spec.selector.matchLabels."app.kubernetes.io/name" = "kube-vip-svc-ds"' ${SCRATCH}
91+
yq -i '.spec.template.metadata.labels."app.kubernetes.io/name" = "kube-vip-svc-ds"' ${SCRATCH}
9292
9393
# Drop namespace and let user configure this.
94-
yq -iy 'del(.metadata.namespace)' ${SCRATCH}
94+
yq -i 'del(.metadata.namespace)' ${SCRATCH}
9595
9696
# Remove creationTimestamp fields as we do not care about them.
97-
yq -iy 'del(.metadata.creationTimestamp)' ${SCRATCH}
98-
yq -iy 'del(.spec.template.metadata.creationTimestamp)' ${SCRATCH}
97+
yq -i 'del(.metadata.creationTimestamp)' ${SCRATCH}
98+
yq -i 'del(.spec.template.metadata.creationTimestamp)' ${SCRATCH}
9999
100100
# Remove empty objects that get added by their generator.
101-
yq -iy 'del(.spec.template.spec.containers[0].resources)' ${SCRATCH}
102-
yq -iy 'del(.spec.updateStrategy)' ${SCRATCH}
101+
yq -i 'del(.spec.template.spec.containers[0].resources)' ${SCRATCH}
102+
yq -i 'del(.spec.updateStrategy)' ${SCRATCH}
103103
104104
# Remove the tag from the image, as it is managed by the `kustomization.yml` file.
105-
yq -iy '.spec.template.spec.containers[0].image = "ghcr.io/kube-vip/kube-vip"' ${SCRATCH}
105+
yq -i '.spec.template.spec.containers[0].image = "ghcr.io/kube-vip/kube-vip"' ${SCRATCH}
106106
107107
# Remove unused environment settings.
108-
yq -iy 'del(.spec.template.spec.containers[0].env[] | select(.name == "dns_mode"))' ${SCRATCH}
109-
yq -iy 'del(.spec.template.spec.containers[0].env[] | select(.name == "port"))' ${SCRATCH}
110-
yq -iy 'del(.spec.template.spec.containers[0].env[] | select(.name == "prometheus_server"))' ${SCRATCH}
111-
yq -iy 'del(.spec.template.spec.containers[0].env[] | select(.name == "vip_address"))' ${SCRATCH}
108+
yq -i 'del(.spec.template.spec.containers[0].env[] | select(.name == "dns_mode"))' ${SCRATCH}
109+
yq -i 'del(.spec.template.spec.containers[0].env[] | select(.name == "port"))' ${SCRATCH}
110+
yq -i 'del(.spec.template.spec.containers[0].env[] | select(.name == "prometheus_server"))' ${SCRATCH}
111+
yq -i 'del(.spec.template.spec.containers[0].env[] | select(.name == "vip_address"))' ${SCRATCH}
112112
113113
# Set cp_namespace via a reference.
114-
yq -iy '.spec.template.spec.containers[0].env += [{"name": "cp_namespace", "valueFrom": { "fieldRef": { "fieldPath": "metadata.namespace"}}}]' ${SCRATCH}
114+
yq -i '.spec.template.spec.containers[0].env += [{"name": "cp_namespace", "valueFrom": { "fieldRef": { "fieldPath": "metadata.namespace"}}}]' ${SCRATCH}
115115
116116
# Add appropriate priorityClassName to the manifest.
117-
yq -iy '.spec.template.spec.priorityClassName = "critical-application-infra"' ${SCRATCH}
117+
yq -i '.spec.template.spec.priorityClassName = "critical-application-infra"' ${SCRATCH}
118118
119119
# Sort the container's env by the name of the environment variables to set.
120-
yq -iy '.spec.template.spec.containers[0].env |= sort_by(.name)' ${SCRATCH}
120+
yq -i '.spec.template.spec.containers[0].env |= sort_by(.name)' ${SCRATCH}
121121
122122
# Write out the final output.
123123
echo '# @codegen-command: just codegen-kube-vip' > ${DEST}
124124
echo '# @generated' >> ${DEST}
125125
echo '---' >> ${DEST}
126-
yq -y -S '' ${SCRATCH} \
126+
yq '.' ${SCRATCH} \
127127
| sed -e "s/'/\"/g" \
128128
>> ${DEST}
129129
@@ -138,18 +138,18 @@ codegen-kube-vip:
138138
> ${SCRATCH}
139139
140140
# Drop namespace and let user configure this.
141-
yq -iy 'del(.metadata.namespace)' ${SCRATCH}
142-
yq -iy 'del(select(.kind == "ClusterRoleBinding") | .subjects[] | select(.name == "kube-vip") | .namespace)' ${SCRATCH}
141+
yq -i 'del(.metadata.namespace)' ${SCRATCH}
142+
yq -i 'del(select(.kind == "ClusterRoleBinding") | .subjects[] | select(.name == "kube-vip") | .namespace)' ${SCRATCH}
143143
144144
# Sort rules.
145-
yq -iy '.rules[]?.resources |= sort_by(.)' ${SCRATCH}
146-
yq -iy '.rules[]?.verbs |= sort_by(.)' ${SCRATCH}
145+
yq -i '.rules[]?.resources |= sort_by(.)' ${SCRATCH}
146+
yq -i '.rules[]?.verbs |= sort_by(.)' ${SCRATCH}
147147
148148
# Write out the final output.
149149
echo '# @codegen-command: just codegen-kube-vip' > ${DEST}
150150
echo '# @generated' >> ${DEST}
151151
echo '---' >> ${DEST}
152-
yq -y -S '' ${SCRATCH} \
152+
yq '.' ${SCRATCH} \
153153
| sed -e "s/'/\"/g" \
154154
>> ${DEST}
155155

0 commit comments

Comments
 (0)