From 7f5346fc845c9efa0acb9d4fe9043f5ce196a0ff Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@philips.com>
Date: Thu, 3 Nov 2022 14:26:18 +0100
Subject: [PATCH] Switch to ghcr.io for images and bump to 1.5.0

Resolves #31

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 charts/spire/Chart.yaml  |  4 ++--
 charts/spire/README.md   | 14 +++++++-------
 charts/spire/values.yaml | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/charts/spire/Chart.yaml b/charts/spire/Chart.yaml
index 44eb7d1..8d4e21a 100644
--- a/charts/spire/Chart.yaml
+++ b/charts/spire/Chart.yaml
@@ -28,8 +28,8 @@ description: |
   ```
 type: application
 version: 0.1.0
-appVersion: "1.4.4"
-keywords: ["spiffe", "spire", "spire-server", "spire-agent"]
+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
diff --git a/charts/spire/README.md b/charts/spire/README.md
index 3176992..b1e5315 100644
--- a/charts/spire/README.md
+++ b/charts/spire/README.md
@@ -1,6 +1,6 @@
 # spire
 
-![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.4.4](https://img.shields.io/badge/AppVersion-1.4.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.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.
 
@@ -50,8 +50,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 | `{}` |  |
@@ -82,8 +82,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"` |  |
@@ -106,8 +106,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 | `{}` |  |
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
index 53bd9a5..be6cf44 100644
--- a/charts/spire/values.yaml
+++ b/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: ""