Skip to content

Commit 279c4fe

Browse files
authored
šŸ› fix fleetconfig-system namespace typo, catch image/release tag mismatches in CI (#20)
* fix: typo in smoketests; remove ns overrides from devspace.yaml * ci: bump image tag & update CI to catch mismatches * fix: prevent globbing, word-splitting * chore: make reviewable --------- Signed-off-by: Tyler Gillson <[email protected]>
1 parent 7378cba commit 279c4fe

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

ā€Ž.github/workflows/release.ymlā€Ž

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,15 @@ jobs:
8080
set -e
8181
mkdir -p release
8282
pushd release
83+
84+
# assert that the default image tag in values.yaml matches the release version
85+
chartImageTag=$(yq eval '.image.tag' ../${{ matrix.repository }}/charts/${{ matrix.repository }}/values.yaml)
86+
if [[ "$chartImageTag" != "${{ needs.env.outputs.RELEASE_VERSION }}" && "$chartImageTag" != "${{ needs.env.outputs.TRIMMED_RELEASE_VERSION }}" ]]; then
87+
echo "Error: .image.tag in values.yaml ($chartImageTag) does not match the release version (${{ needs.env.outputs.RELEASE_VERSION }}) or the trimmed release version (${{ needs.env.outputs.TRIMMED_RELEASE_VERSION }})"
88+
exit 1
89+
fi
90+
91+
# stage helm dependencies and package the chart
8392
yq eval '.dependencies[] | .name + " " + .repository' ../${{ matrix.repository }}/charts/${{ matrix.repository }}/Chart.yaml | while read -r repo_name repo_url; do
8493
if [[ ! "$repo_url" =~ ^(oci://|file://) ]]; then
8594
helm repo add "$repo_name" "$repo_url"
@@ -92,6 +101,7 @@ jobs:
92101
helm package ../${{ matrix.repository }}/charts/${{ matrix.repository }} \
93102
--app-version ${{ needs.env.outputs.RELEASE_VERSION }} \
94103
--version ${{ needs.env.outputs.TRIMMED_RELEASE_VERSION }}
104+
95105
popd
96106
97107
- name: publish release

ā€Žfleetconfig-controller/charts/fleetconfig-controller/README.mdā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Refer to the [Multicluster Controlplane configuration](https://github.com/open-c
105105
| `replicas` | fleetconfig-controller replica count | `1` |
106106
| `imageRegistry` | Image registry | `""` |
107107
| `image.repository` | Image repository | `quay.io/open-cluster-management/fleetconfig-controller` |
108-
| `image.tag` | x-release-please-version | `v0.0.1` |
108+
| `image.tag` | Image tag | `v0.0.2` |
109109
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
110110
| `imagePullSecrets` | Image pull secrets | `[]` |
111111
| `serviceAccount.annotations` | Annotations to add to the service account | `{}` |

ā€Žfleetconfig-controller/charts/fleetconfig-controller/values.yamlā€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,11 @@ replicas: 1
237237
imageRegistry: ""
238238

239239
## @param image.repository Image repository
240-
## @param image.tag x-release-please-version
240+
## @param image.tag Image tag
241241
## @param image.pullPolicy Image pull policy
242242
image:
243243
repository: quay.io/open-cluster-management/fleetconfig-controller
244-
tag: v0.0.1 # x-release-please-version
244+
tag: v0.0.2
245245
pullPolicy: IfNotPresent
246246

247247
## @param imagePullSecrets Image pull secrets

ā€Žfleetconfig-controller/devspace.yamlā€Ž

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ images:
7171

7272
deployments:
7373
fleetconfig-controller:
74-
namespace: fleetconfig-system
7574
helm:
7675
chart:
7776
name: ${CONTEXT}/charts/fleetconfig-controller
@@ -84,7 +83,6 @@ deployments:
8483
updateImageTags: false
8584

8685
fleetconfig-controller-dev:
87-
namespace: fleetconfig-system
8886
helm:
8987
chart:
9088
name: ${CONTEXT}/charts/fleetconfig-controller
@@ -94,7 +92,6 @@ deployments:
9492
- ${CONTEXT}/charts/fleetconfig-controller/values.yaml
9593

9694
fleetconfig-controller-local:
97-
namespace: fleetconfig-system
9895
helm:
9996
chart:
10097
name: ${CONTEXT}/charts/fleetconfig-controller

ā€Žfleetconfig-controller/docs/smoketests.mdā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ mkdir -p $TARGET_DIR
6767
1. Install the `fleetconfig-controller` on the hub using the `deploy-local` pipeline
6868

6969
```bash
70-
devspace run-pipeline deploy-local -n fleet-config-system --skip-build
70+
devspace run-pipeline deploy-local -n fleetconfig-system --skip-build
7171
```
7272

7373
1. Verify that the `FleetConfig` is reconciled successfully

0 commit comments

Comments
Ā (0)