Merge branch 'switch-to-ghcr'

Author: marcofranssen

charts/spire/Chart.yaml

@@ -27,9 +27,9 @@ description: |
           - --service-account-signing-key-file=/run/config/pki/sa.key
   ```
 type: application
-version: 0.5.4
-appVersion: "1.4.4"
-keywords: ["spiffe", "spire", "spire-server", "spire-agent"]
+version: 0.5.5
+appVersion: "1.5.0"
+keywords: ["spiffe", "spire", "spire-server", "spire-agent", "oidc"]
 home: https://github.com/philips-labs/helm-charts/charts/spire
 sources:
   - https://github.com/philips-labs/helm-charts/charts/spire

charts/spire/README.md

@@ -2,7 +2,7 @@
 
 <!-- This README.md is generated. -->
 
-![Version: 0.5.4](https://img.shields.io/badge/Version-0.5.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.4](https://img.shields.io/badge/AppVersion-1.4.4-informational?style=flat-square)
+![Version: 0.5.5](https://img.shields.io/badge/Version-0.5.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.0](https://img.shields.io/badge/AppVersion-1.5.0-informational?style=flat-square)
 
 A Helm chart for deploying spire-server and spire-agent.
 
@@ -52,8 +52,8 @@ Kubernetes: `>=1.21.0-0`
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
 | agent.image.pullPolicy | string | `"IfNotPresent"` |  |
-| agent.image.registry | string | `"gcr.io"` |  |
-| agent.image.repository | string | `"spiffe-io/spire-agent"` |  |
+| agent.image.registry | string | `"ghcr.io"` |  |
+| agent.image.repository | string | `"spiffe/spire-agent"` |  |
 | agent.image.version | string | `""` |  |
 | agent.nodeSelector."kubernetes.io/arch" | string | `"amd64"` |  |
 | agent.resources | object | `{}` |  |
@@ -84,8 +84,8 @@ Kubernetes: `>=1.21.0-0`
 | oidc.domains[3] | string | `"oidc-discovery.example.org"` |  |
 | oidc.enabled | bool | `false` |  |
 | oidc.image.pullPolicy | string | `"IfNotPresent"` |  |
-| oidc.image.registry | string | `"gcr.io"` |  |
-| oidc.image.repository | string | `"spiffe-io/oidc-discovery-provider"` |  |
+| oidc.image.registry | string | `"ghcr.io"` |  |
+| oidc.image.repository | string | `"spiffe/spire-oidc-provider"` |  |
 | oidc.image.version | string | `""` |  |
 | oidc.insecureScheme.enabled | bool | `false` |  |
 | oidc.insecureScheme.nginx.image.pullPolicy | string | `"IfNotPresent"` |  |
@@ -108,8 +108,8 @@ Kubernetes: `>=1.21.0-0`
 | server.dataStorage.size | string | `"1Gi"` |  |
 | server.dataStorage.storageClass | string | `nil` |  |
 | server.image.pullPolicy | string | `"IfNotPresent"` |  |
-| server.image.registry | string | `"gcr.io"` |  |
-| server.image.repository | string | `"spiffe-io/spire-server"` |  |
+| server.image.registry | string | `"ghcr.io"` |  |
+| server.image.repository | string | `"spiffe/spire-server"` |  |
 | server.image.version | string | `""` |  |
 | server.nodeSelector."kubernetes.io/arch" | string | `"amd64"` |  |
 | server.resources | object | `{}` |  |

charts/spire/templates/server-configmap.yaml

@@ -18,7 +18,8 @@ data:
       {{- if eq (.Values.oidc.enabled | toString) "true" }}
       jwt_issuer = "{{ .Values.oidc.jwtIssuer }}"
       {{ end }}
-      default_svid_ttl = "1h"
+      default_x509_svid_ttl = "1h"
+      default_jwt_svid_ttl = "1h"
       ca_subject = {
         country = ["NL"],
         organization = ["EXAMPLE"],

charts/spire/values.yaml

@@ -33,8 +33,8 @@ workloadRegistrar:
 
 server:
   image:
-    registry: gcr.io
-    repository: spiffe-io/spire-server
+    registry: ghcr.io
+    repository: spiffe/spire-server
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     version: ""
@@ -104,8 +104,8 @@ oidc:
   enabled: false
 
   image:
-    registry: gcr.io
-    repository: spiffe-io/oidc-discovery-provider
+    registry: ghcr.io
+    repository: spiffe/spire-oidc-provider
     pullPolicy: IfNotPresent
     version: ""
 
@@ -158,8 +158,8 @@ oidc:
 
 agent:
   image:
-    registry: gcr.io
-    repository: spiffe-io/spire-agent
+    registry: ghcr.io
+    repository: spiffe/spire-agent
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     version: ""