From 338cdcf2ceb19a87c1ce852ef89d24a4ea27f531 Mon Sep 17 00:00:00 2001 From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Date: Thu, 22 Jun 2023 18:08:37 -0400 Subject: [PATCH] docs: list tested Kubernetes versions (#12276) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> remove crud Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> remove crud Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> so-called readability Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> workflow Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> stash Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> git yay Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> stash Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> pop at the right moment Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> add Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> changes Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> changes Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> changes Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --- .github/workflows/init-release.yaml | 7 ++++++ docs/operator-manual/installation.md | 8 ++++++- .../tested-kubernetes-versions.md | 6 +++++ hack/update-supported-versions.sh | 23 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 docs/operator-manual/tested-kubernetes-versions.md create mode 100644 hack/update-supported-versions.sh diff --git a/.github/workflows/init-release.yaml b/.github/workflows/init-release.yaml index bd032f1037200..67dcf62a9e372 100644 --- a/.github/workflows/init-release.yaml +++ b/.github/workflows/init-release.yaml @@ -56,6 +56,13 @@ jobs: make manifests-local VERSION=${{ inputs.TARGET_VERSION }} git diff + - name: Generate version compatibility table + run: | + git stash + bash hack/update-supported-versions.sh + git add -u . + git stash pop + - name: Create pull request uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # v4.2.4 with: diff --git a/docs/operator-manual/installation.md b/docs/operator-manual/installation.md index c900d38ac66f5..03c61c80134fa 100644 --- a/docs/operator-manual/installation.md +++ b/docs/operator-manual/installation.md @@ -97,4 +97,10 @@ For example if the latest minor version of ArgoCD are 2.4.3 and 2.3.5 while sup * Argo CD 2.4.3 on Kubernetes 1.22 * Argo CD 2.3.5 on Kubernetes 1.24 * Argo CD 2.3.5 on Kubernetes 1.23 -* Argo CD 2.3.5 on Kubernetes 1.22 \ No newline at end of file +* Argo CD 2.3.5 on Kubernetes 1.22 + +## Tested versions + +The following table shows the versions of Kubernetes that are tested with each version of Argo CD. + +{!docs/operator-manual/tested-kubernetes-versions.md!} diff --git a/docs/operator-manual/tested-kubernetes-versions.md b/docs/operator-manual/tested-kubernetes-versions.md new file mode 100644 index 0000000000000..897620296a515 --- /dev/null +++ b/docs/operator-manual/tested-kubernetes-versions.md @@ -0,0 +1,6 @@ +| Argo CD version | Kubernetes versions | +|-----------------|---------------------| +| 2.7 | v1.26, v1.25, v1.24, v1.23 | +| 2.6 | v1.24, v1.23, v1.22 | +| 2.5 | v1.24, v1.23, v1.22 | + diff --git a/hack/update-supported-versions.sh b/hack/update-supported-versions.sh new file mode 100644 index 0000000000000..f4f10aa31a007 --- /dev/null +++ b/hack/update-supported-versions.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +out="| Argo CD version | Kubernetes versions |\n" +out+="|-----------------|---------------------|\n" + +argocd_minor_version=$(git rev-parse --abbrev-ref HEAD | sed 's/release-//') +argocd_major_version_num=$(echo "$argocd_minor_version" | sed -E 's/\.[0-9]+//') +argocd_minor_version_num=$(echo "$argocd_minor_version" | sed -E 's/[0-9]+\.//') + +for n in 0 1 2; do + minor_version_num=$((argocd_minor_version_num - n)) + minor_version="${argocd_major_version_num}.${minor_version_num}" + git checkout "release-$minor_version" > /dev/null || exit 1 + line=$(yq '.jobs["test-e2e"].strategy.matrix["k3s-version"][]' .github/workflows/ci-build.yaml | \ + jq --arg minor_version "$minor_version" --raw-input --slurp --raw-output \ + 'split("\n")[:-1] | map(sub("\\.[0-9]+$"; "")) | join(", ") | "| \($minor_version) | \(.) |"') + out+="$line\n" +done + +git checkout "release-$argocd_minor_version" + + +printf "$out" > docs/operator-manual/tested-kubernetes-versions.md