Skip to content

Commit 1ed5fed

Browse files
markgoddardmarkgoddard
committed
feat: use Cofide SPIRE server v1.12.4-cofide.0
This change switches to use the Cofide SPIRE server instead of upstream, initially at version v1.12.4-cofide.0. The image repository is set, but the registry is not. The registry must be requested from Cofide.
1 parent 93d957b commit 1ed5fed

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

‎.github/tests/common.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ done
9393
)
9494
9595
# Used just for testing. You should provide your own values as described in the install instructions.
96+
# NOTE(Cofide upgrade): The tag used here must be in sync with the upstream Chart.yaml.
9697
common_test_your_values () {
9798
cat > /tmp/$$.example-your-values.yaml <<EOF
9899
global:
@@ -105,6 +106,11 @@ global:
105106
country: US
106107
organization: Production
107108
commonName: production.other
109+
spire-server:
110+
image:
111+
registry: ghcr.io
112+
repository: spire-server
113+
tag: 1.12.4
108114
EOF
109115
echo "/tmp/$$.example-your-values.yaml"
110116
}

‎charts/spire/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: >
44
A Helm chart for deploying the complete Spire stack including: spire-server, spire-agent, spiffe-csi-driver, spiffe-oidc-discovery-provider and spire-controller-manager.
55
type: application
66
version: 0.26.0-cofide.0
7-
appVersion: "1.12.4"
7+
appVersion: "1.12.4-cofide.0"
88
keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc", "spire-controller-manager"]
99
home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
1010
sources:

‎charts/spire/charts/spire-server/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: spire-server
33
description: A Helm chart to install the SPIRE server.
44
type: application
55
version: 0.1.0
6-
appVersion: "1.12.4"
6+
appVersion: "1.12.4-cofide.0"
77
keywords: ["spiffe", "spire-server", "spire-controller-manager"]
88
home: https://github.com/spiffe/helm-charts-hardened/tree/main/charts/spire
99
sources:

‎charts/spire/charts/spire-server/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
8282
| Name | Description | Value |
8383
| -------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- |
8484
| `replicaCount` | SPIRE server currently runs with a sqlite database. Scaling to multiple instances will not work until we use an external database. | `1` |
85-
| `image.registry` | The OCI registry to pull the image from | `ghcr.io` |
86-
| `image.repository` | The repository within the registry | `spiffe/spire-server` |
85+
| `image.registry` | The OCI registry to pull the image from. Request from Cofide. | `` |
86+
| `image.repository` | The repository within the registry | `cofide/spire-server` |
8787
| `image.pullPolicy` | The image pull policy | `IfNotPresent` |
8888
| `image.tag` | Overrides the image tag whose default is the chart appVersion | `""` |
8989
| `kind` | Define SPIRE server deployment type. Can be statefulset/deployment. Defaults to statefulset if not set. This feature is experimental. | `statefulset` |

‎charts/spire/charts/spire-server/templates/server-resource.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
{{- fail "clientKeyPath can only be set with database type mysql or aws_mysql." }}
6565
{{- end }}
6666
{{- end }}
67+
{{- if eq .Values.image.registry "" }}
68+
{{- fail "image.registry must be set." }}
69+
{{- end }}
6770
{{- if not .Values.externalServer }}
6871
apiVersion: apps/v1
6972
{{- if eq .Values.kind "statefulset" }}

‎charts/spire/charts/spire-server/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ replicaCount: 1
1515
## @param image.tag Overrides the image tag whose default is the chart appVersion
1616
##
1717
image:
18-
registry: ghcr.io
19-
repository: spiffe/spire-server
18+
registry: ""
19+
repository: cofide/spire-server
2020
pullPolicy: IfNotPresent
2121
tag: ""
2222

0 commit comments

Comments
 (0)