kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
pull/10898/head v2.22.2
Max Gautier 2024-02-06 12:07:46 +00:00 committed by GitHub
parent 1f4ca14029
commit 12a65c45e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -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: to access the inventory and SSH key in the container, like this:
```ShellSession ```ShellSession
git checkout v2.22.0 git checkout v2.22.2
docker pull quay.io/kubespray/kubespray:v2.22.0 docker pull quay.io/kubespray/kubespray:v2.22.2
docker run --rm -it --mount type=bind,source="$(pwd)"/inventory/sample,dst=/inventory \ 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 \ --mount type=bind,source="${HOME}"/.ssh/id_rsa,dst=/root/.ssh/id_rsa \
quay.io/kubespray/kubespray:v2.22.0 bash quay.io/kubespray/kubespray:v2.22.0 bash

2
docs/ansible_collection.md
View File

@ -15,7 +15,7 @@ Kubespray can be installed as an [Ansible collection](https://docs.ansible.com/a
collections: collections:
- name: https://github.com/kubernetes-sigs/kubespray - name: https://github.com/kubernetes-sigs/kubespray
type: git type: git
version: v2.21.0 version: v2.22.2
``` ```
2. Install your collection 2. Install your collection

2
galaxy.yml
View File

@ -2,7 +2,7 @@
namespace: kubernetes_sigs namespace: kubernetes_sigs
description: Deploy a production ready Kubernetes cluster description: Deploy a production ready Kubernetes cluster
name: kubespray name: kubespray
version: 2.21.0 version: 2.22.2
readme: README.md readme: README.md
authors: authors:
- luksi1 - luksi1

14
tests/scripts/check_galaxy_version.sh
View File

@ -2,17 +2,11 @@
set -e set -e
version_from_galaxy=$(grep "^version:" galaxy.yml | awk '{print $2}') 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 then
echo "Please update galaxy.yml version to match the KUBESPRAY_VERSION. Be sure to remove the \"v\" to adhere" echo "Please update galaxy.yml version to match the next KUBESPRAY_VERSION."
echo "to semenatic versioning" echo "Be sure to remove the \"v\" to adhere to semantic 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"
exit 1 exit 1
fi fi