Skip to content

Commit

Permalink
Refactor check_galaxy + fix version (kubernetes-sigs#10729)
Browse files Browse the repository at this point in the history
* Remove checks for docs using exact tags

Instead use a more generic documentation for installing kubespray as a
collection from git.

* Check that we upgraded galaxy.yml to next version

This is only intented to check for human error. The version in galaxy
should be the next (which does not mean the same if we're on master or a
release branch).

* Set collection version to KUBESPRAY_NEXT_VERSION
  • Loading branch information
VannTen committed Jan 11, 2024
1 parent 824bde7 commit ee4a403
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/ansible_collection.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Kubespray can be installed as an [Ansible collection](https://docs.ansible.com/a
collections:
- name: https://github.com/kubernetes-sigs/kubespray
type: git
version: v2.22.1
version: master # use the appropriate tag or branch for the version you need
```
2. Install your collection
Expand Down
14 changes: 4 additions & 10 deletions tests/scripts/check_galaxy_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,11 @@
set -e

version_from_galaxy=$(grep "^version:" galaxy.yml | awk '{print $2}')
version_from_docs=$(grep -P "^\s+version:\sv\d+\.\d+\.\d+" docs/ansible_collection.md | awk '{print $2}')

if [[ $KUBESPRAY_VERSION != "v${version_from_galaxy}" ]]
# TODO: compute the next expected version somehow
if [[ $KUBESPRAY_VERSION == "v${version_from_galaxy}" ]]
then
echo "Please update galaxy.yml version to match the KUBESPRAY_VERSION. Be sure to remove the \"v\" to adhere"
echo "to semenatic versioning"
exit 1
fi

if [[ $KUBESPRAY_VERSION != "${version_from_docs}" ]]
then
echo "Please update the documentation for Ansible collections under docs/ansible_collection.md to reflect the KUBESPRAY_VERSION"
echo "Please update galaxy.yml version to match the next KUBESPRAY_VERSION."
echo "Be sure to remove the \"v\" to adhere to semantic versioning"
exit 1
fi

0 comments on commit ee4a403

Please sign in to comment.