Merge pull request #222 from cho4036/render-test-local

Minor fix: add oidc config on k8s api & set keycloak replica to 3ea
openinfradev · Nov 15, 2023 · 11a3b3b · 11a3b3b
2 parents c731b00 + 1a32486
commit 11a3b3b
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 8 deletions.
diff --git a/aws-reference/tks-admin-tools/site-values.yaml b/aws-reference/tks-admin-tools/site-values.yaml
@@ -12,6 +12,7 @@ global:
 charts:
 - name: keycloak
   override:
+    replicaCount: 3
     global.storageClass: $(storageClass)
     auth.adminPassword: $(commonPassword)
     ingress.enabled: true

diff --git a/byoh-reference/tks-admin-tools/site-values.yaml b/byoh-reference/tks-admin-tools/site-values.yaml
@@ -12,6 +12,7 @@ global:
 charts:
 - name: keycloak
   override:
+    replicaCount: 3
     global.storageClass: $(storageClass)
     auth.adminPassword: $(commonPassword)
     ingress.enabled: true

diff --git a/byoh-reference/tks-cluster/site-values.yaml b/byoh-reference/tks-cluster/site-values.yaml
@@ -11,6 +11,8 @@ global:
   tksCpNode: CHNAGEME
   tksInfraNode: CHNAGEME
   tksUserNode: CHANGEME
+  keycloakIssuerUri: CHANGEME
+  keycloakClientId: CHANGEME
 charts:
 - name: cluster-api-byoh
   override:
@@ -27,6 +29,11 @@ charts:
         matchLabels:
           role: $(clusterName)-control-plane
       replicas: $(tksCpNode)
+      clusterConfiguration:
+        apiServer:
+          extraArgs:
+            oidc-client-id: $(keycloakClientId)
+            oidc-issuer-url: $(keycloakIssuerUri)
     machineDeployment:
     - name: taco
       replicas: $(tksInfraNode)

diff --git a/byoh-ssu-reference/tks-admin-tools/site-values.yaml b/byoh-ssu-reference/tks-admin-tools/site-values.yaml
@@ -13,6 +13,7 @@ global:
 charts:
   - name: keycloak
     override:
+      replicaCount: 3
       global.storageClass: $(storageClass)
       auth.adminPassword: $(commonPassword)
       ingress.enabled: true

diff --git a/byoh-ssu-reference/tks-cluster/site-values.yaml b/byoh-ssu-reference/tks-cluster/site-values.yaml
@@ -11,6 +11,8 @@ global:
   tksCpNode: CHNAGEME
   tksInfraNode: CHNAGEME
   tksUserNode: CHANGEME
+  keycloakIssuerUri: CHANGEME
+  keycloakClientId: CHANGEME
 charts:
 - name: cluster-api-byoh
   override:
@@ -27,6 +29,11 @@ charts:
         matchLabels:
           role: $(clusterName)-control-plane
       replicas: $(tksCpNode)
+      clusterConfiguration:
+        apiServer:
+          extraArgs:
+            oidc-client-id: $(keycloakClientId)
+            oidc-issuer-url: $(keycloakIssuerUri)
     machineDeployment:
     - name: taco
       replicas: $(tksInfraNode)

diff --git a/byoh-stage-reference/tks-admin-tools/site-values.yaml b/byoh-stage-reference/tks-admin-tools/site-values.yaml
@@ -13,6 +13,7 @@ global:
 charts:
   - name: keycloak
     override:
+      replicaCount: 3
       global.storageClass: $(storageClass)
       auth.adminPassword: $(commonPassword)
       ingress.enabled: true

diff --git a/byoh-stage-reference/tks-cluster/site-values.yaml b/byoh-stage-reference/tks-cluster/site-values.yaml
@@ -11,6 +11,8 @@ global:
   tksCpNode: CHNAGEME
   tksInfraNode: CHNAGEME
   tksUserNode: CHANGEME
+  keycloakIssuerUri: CHANGEME
+  keycloakClientId: CHANGEME
 charts:
 - name: cluster-api-byoh
   override:
@@ -27,6 +29,11 @@ charts:
         matchLabels:
           role: $(clusterName)-control-plane
       replicas: $(tksCpNode)
+      clusterConfiguration:
+        apiServer:
+          extraArgs:
+            oidc-client-id: $(keycloakClientId)
+            oidc-issuer-url: $(keycloakIssuerUri)
     machineDeployment:
     - name: taco
       replicas: $(tksInfraNode)

diff --git a/byoh-suy-reference/tks-admin-tools/site-values.yaml b/byoh-suy-reference/tks-admin-tools/site-values.yaml
@@ -13,6 +13,7 @@ global:
 charts:
   - name: keycloak
     override:
+      replicaCount: 3
       global.storageClass: $(storageClass)
       auth.adminPassword: $(commonPassword)
       ingress.enabled: true

diff --git a/byoh-suy-reference/tks-cluster/site-values.yaml b/byoh-suy-reference/tks-cluster/site-values.yaml
@@ -11,6 +11,8 @@ global:
   tksCpNode: CHNAGEME
   tksInfraNode: CHNAGEME
   tksUserNode: CHANGEME
+  keycloakIssuerUri: CHANGEME
+  keycloakClientId: CHANGEME
 charts:
 - name: cluster-api-byoh
   override:
@@ -27,6 +29,11 @@ charts:
         matchLabels:
           role: $(clusterName)-control-plane
       replicas: $(tksCpNode)
+      clusterConfiguration:
+        apiServer:
+          extraArgs:
+            oidc-client-id: $(keycloakClientId)
+            oidc-issuer-url: $(keycloakIssuerUri)
     machineDeployment:
     - name: taco
       replicas: $(tksInfraNode)

diff --git a/eks-reference/tks-admin-tools/site-values.yaml b/eks-reference/tks-admin-tools/site-values.yaml
@@ -12,6 +12,7 @@ global:
 charts:
 - name: keycloak
   override:
+    replicaCount: 3
     global.storageClass: $(storageClass)
     auth.adminPassword: $(commonPassword)
     ingress.enabled: true
@@ -47,7 +48,7 @@ charts:
       ingress:
         hosts:
           core: TO_BE_FIXED
-        className: "nginx"  
+        className: "nginx"
     externalURL: TO_BE_FIXED
     persistence:
       persistentVolumeClaim:
@@ -74,21 +75,21 @@ charts:
     database:
       type: external
       external:
-        host: $(dbHost)  
+        host: $(dbHost)
         password: $(commonPassword)
         sslmode: "require"
     core:
-      replicas: 2  
+      replicas: 2
     jobservice:
-      replicas: 2  
+      replicas: 2
     registry:
-      replicas: 2  
+      replicas: 2
     chartmuseum:
-      replicas: 2  
+      replicas: 2
     trivy:
-      replicas: 2  
+      replicas: 2
     portal:
-      replicas: 2  
+      replicas: 2
     harborAdminPassword: $(commonPassword)
 
 - name: ingress-nginx