From 12a65c45e994d62b41811e3ae165181a3ac4383b Mon Sep 17 00:00:00 2001
From: Max Gautier <mg@max.gautier.name>
Date: Tue, 6 Feb 2024 12:07:46 +0000
Subject: [PATCH] Refactor check_galaxy + fix version (#10729) (#10891)

* 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
---
 README.md                             |  4 ++--
 docs/ansible_collection.md            |  2 +-
 galaxy.yml                            |  2 +-
 tests/scripts/check_galaxy_version.sh | 14 ++++----------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index b96ad4416cf..51944b47feb 100644
--- a/README.md
+++ b/README.md
@@ -75,8 +75,8 @@ You will then need to use [bind mounts](https://docs.docker.com/storage/bind-mou
 to access the inventory and SSH key in the container, like this:
 
 ```ShellSession
-git checkout v2.22.0
-docker pull quay.io/kubespray/kubespray:v2.22.0
+git checkout v2.22.2
+docker pull quay.io/kubespray/kubespray:v2.22.2
 docker run --rm -it --mount type=bind,source="$(pwd)"/inventory/sample,dst=/inventory \
   --mount type=bind,source="${HOME}"/.ssh/id_rsa,dst=/root/.ssh/id_rsa \
   quay.io/kubespray/kubespray:v2.22.0 bash
diff --git a/docs/ansible_collection.md b/docs/ansible_collection.md
index 7e04a9d53ee..93cfa655314 100644
--- a/docs/ansible_collection.md
+++ b/docs/ansible_collection.md
@@ -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.21.0
+     version: v2.22.2
    ```
 
 2. Install your collection
diff --git a/galaxy.yml b/galaxy.yml
index 2d06d27db3d..97898504b31 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -2,7 +2,7 @@
 namespace: kubernetes_sigs
 description: Deploy a production ready Kubernetes cluster
 name: kubespray
-version: 2.21.0
+version: 2.22.2
 readme: README.md
 authors:
   - luksi1
diff --git a/tests/scripts/check_galaxy_version.sh b/tests/scripts/check_galaxy_version.sh
index b6679dba472..d663f121f07 100755
--- a/tests/scripts/check_galaxy_version.sh
+++ b/tests/scripts/check_galaxy_version.sh
@@ -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