From 4fb549e954cb718c4271d28df386f3053b8c0b87 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Tue, 23 May 2023 08:57:07 -0700 Subject: [PATCH 1/6] Remove 1.21.x testing Signed-off-by: Kevin Fox --- .github/workflows/helm-chart-ci.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/helm-chart-ci.yaml b/.github/workflows/helm-chart-ci.yaml index 8bc24e3..a41d2e7 100644 --- a/.github/workflows/helm-chart-ci.yaml +++ b/.github/workflows/helm-chart-ci.yaml @@ -142,7 +142,6 @@ jobs: - v1.24.12 - v1.23.17 - v1.22.17 - - v1.21.14 values: - ${{ fromJson(needs.build-matrix.outputs.tests) }} From a1ba235c992039d09e3041809819ad9e3cdcd59a Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Tue, 23 May 2023 09:44:06 -0700 Subject: [PATCH 2/6] Update docs Signed-off-by: Kevin Fox --- charts/spire/README.md | 4 ++-- charts/spire/README.md.gotmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/spire/README.md b/charts/spire/README.md index ed954bf..f3576aa 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -19,9 +19,9 @@ A Helm chart for deploying the complete Spire stack including: spire-server, spi |:-----------|:-------------------| | SPIRE | `1.5.3+`, `1.6.3+` | | Helm | `3.x` | -| Kubernetes | `1.21+` | +| Kubernetes | `1.22+` | -> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. *The first version we tested this chart with is `1.21`.* +> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. *The first version we tested this chart with is `1.22`.* ## Prerequisites diff --git a/charts/spire/README.md.gotmpl b/charts/spire/README.md.gotmpl index f2dd15d..5239da7 100644 --- a/charts/spire/README.md.gotmpl +++ b/charts/spire/README.md.gotmpl @@ -21,9 +21,9 @@ |:-----------|:-------------------| | SPIRE | `1.5.3+`, `1.6.3+` | | Helm | `3.x` | -| Kubernetes | `1.21+` | +| Kubernetes | `1.22+` | -> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. *The first version we tested this chart with is `1.21`.* +> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. *The first version we tested this chart with is `1.22`.* ## Prerequisites From 38d51d59854fbbf6a7f581b6621775a4b81228d8 Mon Sep 17 00:00:00 2001 From: kfox1111 Date: Tue, 23 May 2023 09:55:38 -0700 Subject: [PATCH 3/6] Apply suggestions from code review Co-authored-by: Faisal Memon Signed-off-by: kfox1111 --- charts/spire/README.md.gotmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/spire/README.md.gotmpl b/charts/spire/README.md.gotmpl index 5239da7..39cbcaa 100644 --- a/charts/spire/README.md.gotmpl +++ b/charts/spire/README.md.gotmpl @@ -23,7 +23,7 @@ | Helm | `3.x` | | Kubernetes | `1.22+` | -> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. *The first version we tested this chart with is `1.22`.* +> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. ## Prerequisites From 69f402ecc65c1bf323886cb87fbda56604c55403 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Tue, 23 May 2023 09:56:05 -0700 Subject: [PATCH 4/6] Update docs Signed-off-by: Kevin Fox --- charts/spire/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/spire/README.md b/charts/spire/README.md index f3576aa..6c28acd 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -21,7 +21,7 @@ A Helm chart for deploying the complete Spire stack including: spire-server, spi | Helm | `3.x` | | Kubernetes | `1.22+` | -> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. *The first version we tested this chart with is `1.22`.* +> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. ## Prerequisites From dc5d9cfeec7d3a3afb7e86570182926ed22afa60 Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Tue, 23 May 2023 16:15:21 -0700 Subject: [PATCH 5/6] Fix root README.md Signed-off-by: Kevin Fox --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d5e947b..e14c7a5 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,9 @@ Unless otherwise noted in an application chart README, the following dependencie |:-----------|:-------------------| | SPIRE | `1.5.3`+, `1.6.x` | | Helm | `3.x` | -| Kubernetes | `1.21+` | +| Kubernetes | `1.22+` | -> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. *The first version we tested this chart with is `1.21`.* +> **Note**: For Kubernetes, we will officially support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions). Any version before the last 3 we will try to support as long it doesn't bring security issues or any big maintenance burden. *The first version we tested this chart with is `1.22`.* ## Contributing From 0df45e3cd8223fc2b7fd5542f807a7892479a40b Mon Sep 17 00:00:00 2001 From: Kevin Fox Date: Tue, 23 May 2023 16:26:23 -0700 Subject: [PATCH 6/6] Fix up docs Signed-off-by: Kevin Fox --- charts/spire/README.md | 2 -- charts/spire/README.md.gotmpl | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/spire/README.md b/charts/spire/README.md index 6c28acd..ed84243 100644 --- a/charts/spire/README.md +++ b/charts/spire/README.md @@ -96,8 +96,6 @@ Now you can interact with the Spire agent socket from your own application. The ## Requirements -Kubernetes: `>=1.21.0-0` - | Repository | Name | Version | |------------|------|---------| | file://./charts/spiffe-csi-driver | spiffe-csi-driver | 0.1.0 | diff --git a/charts/spire/README.md.gotmpl b/charts/spire/README.md.gotmpl index 39cbcaa..3e85623 100644 --- a/charts/spire/README.md.gotmpl +++ b/charts/spire/README.md.gotmpl @@ -87,7 +87,9 @@ Now you can interact with the Spire agent socket from your own application. The {{ template "chart.sourcesSection" . }} -{{ template "chart.requirementsSection" . }} +{{ template "chart.requirementsHeader" . }} + +{{ template "chart.requirementsTable" . }} {{ template "chart.valuesSection" . }}