trivial. add tksCpNode

openinfradev · Sep 7, 2023 · 1b0f917 · 1b0f917
1 parent 67afc19
commit 1b0f917
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/aws-msa-reference/tks-cluster/site-values.yaml b/aws-msa-reference/tks-cluster/site-values.yaml
@@ -8,10 +8,11 @@ global:
   clusterName: cluster.local
   sshKeyName: CHANGEME
   clusterRegion: CHANGEME
-  mdNumOfAz: CHANGEME
-  cpReplicas: CHANGEME
   cloudAccountID: CHANGEME
 
+  tksCpNode: CHNAGEME
+  tksCpNodeMax: CHANGEME
+  tksCpNodeType: CHANGEME
   tksInfraNode: CHNAGEME
   tksInfraNodeMax: CHANGEME
   tksInfraNodeType: CHANGEME
@@ -49,7 +50,7 @@ charts:
             toPort: 5473
       bastion.enabled: false
     kubeadmControlPlane:
-      replicas: $(cpReplicas)
+      replicas: $(tksCpNode)
     machinePool:
     - name: taco
       machineType: $(tksInfraNodeType)
@@ -65,17 +66,16 @@ charts:
         taco-ingress-gateway: enabled
       roleAdditionalPolicies:
       - "arn:aws:iam::aws:policy/AmazonS3FullAccess"
-    machineDeployment:
     - name: normal
-      numberOfAZ: $(mdNumOfAz)
-      minSizePerAZ: 0 # $(tksUserNode)?
-      maxSizePerAZ: $(tksUserNodeMax)
-      selector:
-        matchLabels:
       machineType: $(tksUserNodeType)
+      replicas: $(tksUserNode)
+      minSize: 0
+      maxSize: $(tksUserNodeMax)
       rootVolume:
         size: 50
         type: gp2
+      roleAdditionalPolicies:
+      - "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy"
 
 - name: ingress-nginx
   override:

diff --git a/aws-reference/tks-cluster/site-values.yaml b/aws-reference/tks-cluster/site-values.yaml
@@ -8,10 +8,11 @@ global:
   clusterName: cluster.local
   sshKeyName: CHANGEME
   clusterRegion: CHANGEME
-  mdNumOfAz: CHANGEME
-  cpReplicas: CHANGEME
   cloudAccountID: CHANGEME
 
+  tksCpNode: CHNAGEME
+  tksCpNodeMax: CHANGEME
+  tksCpNodeType: CHANGEME
   tksInfraNode: CHNAGEME
   tksInfraNodeMax: CHANGEME
   tksInfraNodeType: CHANGEME
@@ -49,7 +50,7 @@ charts:
             toPort: 5473
       bastion.enabled: false
     kubeadmControlPlane:
-      replicas: $(cpReplicas)
+      replicas: $(tksCpNode)
     machinePool:
     - name: taco
       machineType: $(tksInfraNodeType)
@@ -65,17 +66,16 @@ charts:
         taco-ingress-gateway: enabled
       roleAdditionalPolicies:
       - "arn:aws:iam::aws:policy/AmazonS3FullAccess"
-    machineDeployment:
     - name: normal
-      numberOfAZ: $(mdNumOfAz)
-      minSizePerAZ: 0 # $(tksUserNode)?
-      maxSizePerAZ: $(tksUserNodeMax)
-      selector:
-        matchLabels:
       machineType: $(tksUserNodeType)
+      replicas: $(tksUserNode)
+      minSize: 0
+      maxSize: $(tksUserNodeMax)
       rootVolume:
         size: 50
         type: gp2
+      roleAdditionalPolicies:
+      - "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy"
 
 - name: ingress-nginx
   override:

diff --git a/eks-reference/tks-cluster/site-values.yaml b/eks-reference/tks-cluster/site-values.yaml
@@ -10,6 +10,9 @@ global:
   clusterRegion: CHANGEME
   cloudAccountID: CHANGEME
 
+  tksCpNode: CHNAGEME
+  tksCpNodeMax: CHANGEME
+  tksCpNodeType: CHANGEME
   tksInfraNode: CHNAGEME
   tksInfraNodeMax: CHANGEME
   tksInfraNodeType: CHANGEME