From 78348004634b577dee748a72e722a9ec8a74b162 Mon Sep 17 00:00:00 2001
From: Marco Franssen <marco.franssen@philips.com>
Date: Thu, 3 Nov 2022 16:46:28 +0100
Subject: [PATCH] Move replicaCount to server and oidc components

Signed-off-by: Marco Franssen <marco.franssen@gmail.com>
---
 charts/spire/README.md                         | 3 ++-
 charts/spire/templates/oidc-deployment.yaml    | 2 +-
 charts/spire/templates/server-statefulset.yaml | 2 +-
 charts/spire/values.yaml                       | 8 ++------
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/charts/spire/README.md b/charts/spire/README.md
index c73b9a0..7c1d188 100644
--- a/charts/spire/README.md
+++ b/charts/spire/README.md
@@ -93,13 +93,13 @@ Kubernetes: `>=1.21.0-0`
 | oidc.jwtIssuer | string | `"oidc-discovery.example.org"` |  |
 | oidc.logLevel | string | `"INFO"` |  |
 | oidc.nodeSelector."kubernetes.io/arch" | string | `"amd64"` |  |
+| oidc.replicaCount | int | `1` |  |
 | oidc.resources | object | `{}` |  |
 | oidc.service.annotations | object | `{}` |  |
 | oidc.service.port | int | `80` |  |
 | oidc.service.type | string | `"NodePort"` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext | object | `{}` |  |
-| replicaCount | int | `1` |  |
 | securityContext | object | `{}` |  |
 | server.dataStorage.accessMode | string | `"ReadWriteOnce"` |  |
 | server.dataStorage.enabled | bool | `true` |  |
@@ -110,6 +110,7 @@ Kubernetes: `>=1.21.0-0`
 | server.image.repository | string | `"spiffe/spire-server"` |  |
 | server.image.version | string | `""` |  |
 | server.nodeSelector."kubernetes.io/arch" | string | `"amd64"` |  |
+| server.replicaCount | int | `1` |  |
 | server.resources | object | `{}` |  |
 | server.service.port | int | `8081` |  |
 | server.service.type | string | `"ClusterIP"` |  |
diff --git a/charts/spire/templates/oidc-deployment.yaml b/charts/spire/templates/oidc-deployment.yaml
index f40071a..e4b0dca 100644
--- a/charts/spire/templates/oidc-deployment.yaml
+++ b/charts/spire/templates/oidc-deployment.yaml
@@ -8,7 +8,7 @@ metadata:
     {{- include "spire.oidc.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.oidc.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
diff --git a/charts/spire/templates/server-statefulset.yaml b/charts/spire/templates/server-statefulset.yaml
index c47e6ac..aa4ce15 100644
--- a/charts/spire/templates/server-statefulset.yaml
+++ b/charts/spire/templates/server-statefulset.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "spire.server.labels" . | nindent 4 }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.server.replicaCount }}
   {{- end }}
   serviceName: {{ include "spire.fullname" . }}-server
   selector:
diff --git a/charts/spire/values.yaml b/charts/spire/values.yaml
index 2765d4b..41eeac3 100644
--- a/charts/spire/values.yaml
+++ b/charts/spire/values.yaml
@@ -1,9 +1,3 @@
-# Default values for spire.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
 waitForIt:
   image:
     registry: gcr.io
@@ -32,6 +26,7 @@ workloadRegistrar:
     #   memory: 64Mi
 
 server:
+  replicaCount: 1
   image:
     # registry: gcr.io
     # repository: spiffe-io/spire-server
@@ -104,6 +99,7 @@ nodeDriverRegistrar:
 
 oidc:
   enabled: false
+  replicaCount: 1
 
   image:
     # registry: gcr.io