From b92e81d41694af214908a4dd21dc45cecf784864 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 1 Mar 2023 12:08:03 +0100 Subject: [PATCH 1/5] Bump spire-server image to 1.6.0 (arm64 support) Signed-off-by: Marco Franssen --- charts/spire/charts/spire-server/Chart.yaml | 2 +- charts/spire/charts/spire-server/README.md | 13 ++++++++++--- charts/spire/charts/spire-server/README.md.gotmpl | 7 +++++++ charts/spire/charts/spire-server/values.yaml | 5 ++--- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/charts/spire/charts/spire-server/Chart.yaml b/charts/spire/charts/spire-server/Chart.yaml index b1b7be3..b1714db 100644 --- a/charts/spire/charts/spire-server/Chart.yaml +++ b/charts/spire/charts/spire-server/Chart.yaml @@ -3,4 +3,4 @@ name: spire-server description: A Helm chart to install the SPIRE server. type: application version: 0.1.0 -appVersion: "1.5.4" +appVersion: "1.6.0" diff --git a/charts/spire/charts/spire-server/README.md b/charts/spire/charts/spire-server/README.md index 922a447..65d1c84 100644 --- a/charts/spire/charts/spire-server/README.md +++ b/charts/spire/charts/spire-server/README.md @@ -2,10 +2,17 @@ -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.4](https://img.shields.io/badge/AppVersion-1.5.4-informational?style=flat-square) +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) A Helm chart to install the SPIRE server. +> **Note**: Minimum Spire version is `1.5.3`. +> The recommended version is `1.6.0` to support arm64 nodes. If running with any +> prior version to `1.6.0` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. +> +> The recommended spire-controller-manager version is `0.2.2` to support arm64 nodes. If running with any +> prior version to `0.2.2` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. + ## Values | Key | Type | Default | Description | @@ -32,7 +39,7 @@ A Helm chart to install the SPIRE server. | controllerManager.image.pullPolicy | string | `"IfNotPresent"` | | | controllerManager.image.registry | string | `"ghcr.io"` | | | controllerManager.image.repository | string | `"spiffe/spire-controller-manager"` | | -| controllerManager.image.version | string | `"0.2.1"` | | +| controllerManager.image.version | string | `"0.2.2"` | | | controllerManager.resources | object | `{}` | | | controllerManager.securityContext | object | `{}` | | | controllerManager.service.annotations | object | `{}` | | @@ -51,7 +58,7 @@ A Helm chart to install the SPIRE server. | jwtIssuer | string | `"oidc-discovery.example.org"` | | | logLevel | string | `"info"` | | | nameOverride | string | `""` | | -| nodeSelector."kubernetes.io/arch" | string | `"amd64"` | | +| nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | | replicaCount | int | `1` | SPIRE server currently runs with a sqlite database. Scaling to multiple instances will not work until we use an external database. | diff --git a/charts/spire/charts/spire-server/README.md.gotmpl b/charts/spire/charts/spire-server/README.md.gotmpl index 13545c4..712d68b 100644 --- a/charts/spire/charts/spire-server/README.md.gotmpl +++ b/charts/spire/charts/spire-server/README.md.gotmpl @@ -10,6 +10,13 @@ {{ template "chart.homepageLine" . }} +> **Note**: Minimum Spire version is `1.5.3`. +> The recommended version is `1.6.0` to support arm64 nodes. If running with any +> prior version to `1.6.0` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. +> +> The recommended spire-controller-manager version is `0.2.2` to support arm64 nodes. If running with any +> prior version to `0.2.2` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. + {{ template "chart.maintainersSection" . }} {{ template "chart.sourcesSection" . }} diff --git a/charts/spire/charts/spire-server/values.yaml b/charts/spire/charts/spire-server/values.yaml index 60e06d4..e027fc2 100644 --- a/charts/spire/charts/spire-server/values.yaml +++ b/charts/spire/charts/spire-server/values.yaml @@ -64,8 +64,7 @@ autoscaling: targetCPUUtilizationPercentage: 80 # targetMemoryUtilizationPercentage: 80 -nodeSelector: - kubernetes.io/arch: amd64 +nodeSelector: {} tolerations: [] @@ -114,7 +113,7 @@ controllerManager: repository: spiffe/spire-controller-manager pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - version: "0.2.1" + version: "0.2.2" resources: {} # We usually recommend not to specify default resources and to leave this as a conscious From a632f7602165a4a22a3fbc677b2c373eef130d3f Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 1 Mar 2023 12:08:22 +0100 Subject: [PATCH 2/5] Bump spire-agent image to 1.6.0 (arm64 support) Signed-off-by: Marco Franssen --- charts/spire/charts/spire-agent/Chart.yaml | 2 +- charts/spire/charts/spire-agent/README.md | 8 ++++++-- charts/spire/charts/spire-agent/README.md.gotmpl | 4 ++++ charts/spire/charts/spire-agent/values.yaml | 3 +-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/charts/spire/charts/spire-agent/Chart.yaml b/charts/spire/charts/spire-agent/Chart.yaml index ed2233f..9fe0970 100644 --- a/charts/spire/charts/spire-agent/Chart.yaml +++ b/charts/spire/charts/spire-agent/Chart.yaml @@ -3,4 +3,4 @@ name: spire-agent description: A Helm chart to install the SPIRE agent. type: application version: 0.1.0 -appVersion: "1.5.4" +appVersion: "1.6.0" diff --git a/charts/spire/charts/spire-agent/README.md b/charts/spire/charts/spire-agent/README.md index 6fadeb9..7acd57c 100644 --- a/charts/spire/charts/spire-agent/README.md +++ b/charts/spire/charts/spire-agent/README.md @@ -2,10 +2,14 @@ -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.4](https://img.shields.io/badge/AppVersion-1.5.4-informational?style=flat-square) +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) A Helm chart to install the SPIRE agent. +> **Note**: Minimum Spire version is `1.5.3`. +> The recommended version is `1.6.0` to support arm64 nodes. If running with any +> prior version to `1.6.0` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. + ## Values | Key | Type | Default | Description | @@ -21,7 +25,7 @@ A Helm chart to install the SPIRE agent. | imagePullSecrets | list | `[]` | | | logLevel | string | `"info"` | | | nameOverride | string | `""` | | -| nodeSelector."kubernetes.io/arch" | string | `"amd64"` | | +| nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | | priorityClassName | string | `""` | Priority class assigned to daemonset pods | diff --git a/charts/spire/charts/spire-agent/README.md.gotmpl b/charts/spire/charts/spire-agent/README.md.gotmpl index 13545c4..f9dafb6 100644 --- a/charts/spire/charts/spire-agent/README.md.gotmpl +++ b/charts/spire/charts/spire-agent/README.md.gotmpl @@ -10,6 +10,10 @@ {{ template "chart.homepageLine" . }} +> **Note**: Minimum Spire version is `1.5.3`. +> The recommended version is `1.6.0` to support arm64 nodes. If running with any +> prior version to `1.6.0` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. + {{ template "chart.maintainersSection" . }} {{ template "chart.sourcesSection" . }} diff --git a/charts/spire/charts/spire-agent/values.yaml b/charts/spire/charts/spire-agent/values.yaml index dda6fe3..f8fea2e 100644 --- a/charts/spire/charts/spire-agent/values.yaml +++ b/charts/spire/charts/spire-agent/values.yaml @@ -49,8 +49,7 @@ resources: {} # cpu: 100m # memory: 128Mi -nodeSelector: - kubernetes.io/arch: amd64 +nodeSelector: {} logLevel: info clusterName: example-cluster From 79889ff3edaa2a09015154b697260b103568b1b6 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 1 Mar 2023 12:08:52 +0100 Subject: [PATCH 3/5] Bump spiffe-oidc-discovery-provider image to 1.6.0 (arm64 support) Signed-off-by: Marco Franssen --- .../charts/spiffe-oidc-discovery-provider/Chart.yaml | 2 +- .../spire/charts/spiffe-oidc-discovery-provider/README.md | 8 ++++++-- .../spiffe-oidc-discovery-provider/README.md.gotmpl | 4 ++++ .../charts/spiffe-oidc-discovery-provider/values.yaml | 3 +-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/Chart.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/Chart.yaml index ee29699..0165f4d 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/Chart.yaml +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/Chart.yaml @@ -3,4 +3,4 @@ name: spiffe-oidc-discovery-provider description: A Helm chart to install the SPIFFE OIDC discovery provider. type: application version: 0.1.0 -appVersion: "1.5.4" +appVersion: "1.6.0" diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md index 6bfaeb5..daf4253 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md @@ -2,10 +2,14 @@ -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.4](https://img.shields.io/badge/AppVersion-1.5.4-informational?style=flat-square) +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square) A Helm chart to install the SPIFFE OIDC discovery provider. +> **Note**: Minimum Spire version is `1.5.3`. +> The recommended version is `1.6.0` to support arm64 nodes. If running with any +> prior version to `1.6.0` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. + ## Values | Key | Type | Default | Description | @@ -36,7 +40,7 @@ A Helm chart to install the SPIFFE OIDC discovery provider. | insecureScheme.nginx.image.version | string | `"1.23.2-alpine"` | | | insecureScheme.nginx.resources | object | `{}` | | | nameOverride | string | `""` | | -| nodeSelector."kubernetes.io/arch" | string | `"amd64"` | | +| nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | | replicaCount | int | `1` | | diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md.gotmpl b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md.gotmpl index 13545c4..f9dafb6 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/README.md.gotmpl +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/README.md.gotmpl @@ -10,6 +10,10 @@ {{ template "chart.homepageLine" . }} +> **Note**: Minimum Spire version is `1.5.3`. +> The recommended version is `1.6.0` to support arm64 nodes. If running with any +> prior version to `1.6.0` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. + {{ template "chart.maintainersSection" . }} {{ template "chart.sourcesSection" . }} diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml index 90d7379..b3a754c 100644 --- a/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml +++ b/charts/spire/charts/spiffe-oidc-discovery-provider/values.yaml @@ -102,8 +102,7 @@ autoscaling: targetCPUUtilizationPercentage: 80 targetMemoryUtilizationPercentage: 80 -nodeSelector: - kubernetes.io/arch: amd64 +nodeSelector: {} tolerations: [] From 75480ede45292033b29b09feb3267213bfbbda20 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 1 Mar 2023 12:09:19 +0100 Subject: [PATCH 4/5] Bump spiffe-csi-driver image to 0.2.3 (arm64 support) Signed-off-by: Marco Franssen --- charts/spire/charts/spiffe-csi-driver/Chart.yaml | 2 +- charts/spire/charts/spiffe-csi-driver/README.md | 7 +++++-- charts/spire/charts/spiffe-csi-driver/README.md.gotmpl | 3 +++ charts/spire/charts/spiffe-csi-driver/values.yaml | 3 +-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/charts/spire/charts/spiffe-csi-driver/Chart.yaml b/charts/spire/charts/spiffe-csi-driver/Chart.yaml index be915ee..9aaefb1 100644 --- a/charts/spire/charts/spiffe-csi-driver/Chart.yaml +++ b/charts/spire/charts/spiffe-csi-driver/Chart.yaml @@ -3,4 +3,4 @@ name: spiffe-csi-driver description: A Helm chart to install the SPIFFE CSI driver. type: application version: 0.1.0 -appVersion: "0.2.1" +appVersion: "0.2.3" diff --git a/charts/spire/charts/spiffe-csi-driver/README.md b/charts/spire/charts/spiffe-csi-driver/README.md index e8ca746..41cd407 100644 --- a/charts/spire/charts/spiffe-csi-driver/README.md +++ b/charts/spire/charts/spiffe-csi-driver/README.md @@ -2,10 +2,13 @@ -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.1](https://img.shields.io/badge/AppVersion-0.2.1-informational?style=flat-square) +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.3](https://img.shields.io/badge/AppVersion-0.2.3-informational?style=flat-square) A Helm chart to install the SPIFFE CSI driver. +> **Note**: The recommended version is `0.2.3` to support arm64 nodes. If running with any +> prior version to `0.2.3` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. + ## Values | Key | Type | Default | Description | @@ -23,7 +26,7 @@ A Helm chart to install the SPIFFE CSI driver. | nodeDriverRegistrar.image.repository | string | `"sig-storage/csi-node-driver-registrar"` | | | nodeDriverRegistrar.image.version | string | `"v2.6.2"` | | | nodeDriverRegistrar.resources | object | `{}` | | -| nodeSelector."kubernetes.io/arch" | string | `"amd64"` | | +| nodeSelector | object | `{}` | | | podAnnotations | object | `{}` | | | podSecurityContext | object | `{}` | | | priorityClassName | string | `""` | Priority class assigned to daemonset pods | diff --git a/charts/spire/charts/spiffe-csi-driver/README.md.gotmpl b/charts/spire/charts/spiffe-csi-driver/README.md.gotmpl index 13545c4..657bce3 100644 --- a/charts/spire/charts/spiffe-csi-driver/README.md.gotmpl +++ b/charts/spire/charts/spiffe-csi-driver/README.md.gotmpl @@ -10,6 +10,9 @@ {{ template "chart.homepageLine" . }} +> **Note**: The recommended version is `0.2.3` to support arm64 nodes. If running with any +> prior version to `0.2.3` you have to use a `nodeSelector` to limit to `kubernetes.io/arch: amd64`. + {{ template "chart.maintainersSection" . }} {{ template "chart.sourcesSection" . }} diff --git a/charts/spire/charts/spiffe-csi-driver/values.yaml b/charts/spire/charts/spiffe-csi-driver/values.yaml index fa6efc1..bae9f2d 100644 --- a/charts/spire/charts/spiffe-csi-driver/values.yaml +++ b/charts/spire/charts/spiffe-csi-driver/values.yaml @@ -43,8 +43,7 @@ securityContext: # drop: # - ALL -nodeSelector: - kubernetes.io/arch: amd64 +nodeSelector: {} nodeDriverRegistrar: image: From a3c04c0d2229dc677946c7b93045879f30389b31 Mon Sep 17 00:00:00 2001 From: Marco Franssen Date: Wed, 1 Mar 2023 12:35:45 +0100 Subject: [PATCH 5/5] Update supported versions Signed-off-by: Marco Franssen --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cfc36f2..f41a5db 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Unless otherwise noted in an application chart README, the following dependencie | Dependency | Supported Versions | |:-----------|:-------------------| -| SPIRE | `1.4.x`, `1.5.x` | +| SPIRE | `1.5.x`, `1.6.x` | | Helm | `3.x` | For Kubernetes we will officially try to support the last 3 versions as described in [k8s versioning](https://kubernetes.io/releases/version-skew-policy/#supported-versions).