From 01f47f76e80130c7d184f69e4912347122d52e0a Mon Sep 17 00:00:00 2001 From: sungil Date: Tue, 29 Aug 2023 08:40:12 +0000 Subject: [PATCH 1/3] tks-cluster: remove resource request for the ingress-nginx pod the resouce request moves to decapod-base-yaml --- aws-msa-reference/tks-cluster/site-values.yaml | 4 ---- aws-reference/tks-cluster/site-values.yaml | 4 ---- eks-msa-reference/tks-cluster/site-values.yaml | 4 ---- eks-reference/tks-cluster/site-values.yaml | 4 ---- 4 files changed, 16 deletions(-) diff --git a/aws-msa-reference/tks-cluster/site-values.yaml b/aws-msa-reference/tks-cluster/site-values.yaml index 905c89a..33a3a86 100644 --- a/aws-msa-reference/tks-cluster/site-values.yaml +++ b/aws-msa-reference/tks-cluster/site-values.yaml @@ -79,10 +79,6 @@ charts: controller: nodeSelector: taco-lma: enabled - resources: - requests: - cpu: 2000m - memory: 4Gi service: externalTrafficPolicy: Local annotations: diff --git a/aws-reference/tks-cluster/site-values.yaml b/aws-reference/tks-cluster/site-values.yaml index c89d8bf..66f59ff 100644 --- a/aws-reference/tks-cluster/site-values.yaml +++ b/aws-reference/tks-cluster/site-values.yaml @@ -78,10 +78,6 @@ charts: controller: nodeSelector: taco-lma: enabled - resources: - requests: - cpu: 2000m - memory: 4Gi service: externalTrafficPolicy: Local annotations: diff --git a/eks-msa-reference/tks-cluster/site-values.yaml b/eks-msa-reference/tks-cluster/site-values.yaml index 7b8b64c..b0ce2c7 100644 --- a/eks-msa-reference/tks-cluster/site-values.yaml +++ b/eks-msa-reference/tks-cluster/site-values.yaml @@ -69,10 +69,6 @@ charts: controller: nodeSelector: taco-lma: enabled - resources: - requests: - cpu: 2000m - memory: 4Gi service: externalTrafficPolicy: Local annotations: diff --git a/eks-reference/tks-cluster/site-values.yaml b/eks-reference/tks-cluster/site-values.yaml index 11a2580..008fbf1 100644 --- a/eks-reference/tks-cluster/site-values.yaml +++ b/eks-reference/tks-cluster/site-values.yaml @@ -69,10 +69,6 @@ charts: controller: nodeSelector: taco-lma: enabled - resources: - requests: - cpu: 2000m - memory: 4Gi service: externalTrafficPolicy: Local annotations: From 4d9287547a7e4e5134a500394fc7010ee142a0f8 Mon Sep 17 00:00:00 2001 From: sungil Date: Tue, 29 Aug 2023 07:44:05 +0000 Subject: [PATCH 2/3] tks-cluster: change names of variable to align with context explicitly. --- .../tks-cluster/site-values.yaml | 31 ++++++++-------- aws-reference/tks-cluster/site-values.yaml | 30 +++++++++------- .../tks-cluster/site-values.yaml | 33 +++++++++-------- eks-reference/tks-cluster/site-values.yaml | 35 ++++++++++--------- 4 files changed, 71 insertions(+), 58 deletions(-) diff --git a/aws-msa-reference/tks-cluster/site-values.yaml b/aws-msa-reference/tks-cluster/site-values.yaml index 33a3a86..43d7692 100644 --- a/aws-msa-reference/tks-cluster/site-values.yaml +++ b/aws-msa-reference/tks-cluster/site-values.yaml @@ -9,15 +9,18 @@ global: sshKeyName: CHANGEME clusterRegion: CHANGEME mdNumOfAz: CHANGEME - mdMinSizePerAz: CHANGEME - mdMaxSizePerAz: CHANGEME - mdMachineType: CHANGEME cpReplicas: CHANGEME - mpReplicas: CHANGEME - mpMachineType: CHANGEME - awsAccountID: CHANGEME cloudAccountID: CHANGEME - awsUserId: CHANGEME + + tksInfraNode: CHNAGEME + tksInfraNodeMax: CHANGEME + tksInfraNodeType: CHANGEME + tksUserNode: CHANGEME + tksUserNodeMax: CHANGEME + tksUserNodeType: CHANGEME + # 노드 스탑을 위해서는 min은 항상 0 + # 승규님 의견 추가: machine pool 노드에 축소불가설정 필요 + charts: - name: cluster-api-aws override: @@ -49,10 +52,10 @@ charts: replicas: $(cpReplicas) machinePool: - name: taco - machineType: $(mpMachineType) - replicas: $(mpReplicas) - minSize: 3 - maxSize: 3 + machineType: $(tksInfraNodeType) + replicas: $(tksInfraNode) + minSize: 0 + maxSize: $(tksInfraNodeMax) rootVolume: size: 200 type: gp2 @@ -65,11 +68,11 @@ charts: machineDeployment: - name: normal numberOfAZ: $(mdNumOfAz) - minSizePerAZ: $(mdMinSizePerAz) - maxSizePerAZ: $(mdMaxSizePerAz) + minSizePerAZ: 0 # $(tksUserNode)? + maxSizePerAZ: $(tksUserNodeMax) selector: matchLabels: - machineType: $(mdMachineType) + machineType: $(tksUserNodeType) rootVolume: size: 50 type: gp2 diff --git a/aws-reference/tks-cluster/site-values.yaml b/aws-reference/tks-cluster/site-values.yaml index 66f59ff..b67fe33 100644 --- a/aws-reference/tks-cluster/site-values.yaml +++ b/aws-reference/tks-cluster/site-values.yaml @@ -9,14 +9,18 @@ global: sshKeyName: CHANGEME clusterRegion: CHANGEME mdNumOfAz: CHANGEME - mdMinSizePerAz: CHANGEME - mdMaxSizePerAz: CHANGEME - mdMachineType: CHANGEME cpReplicas: CHANGEME - mpReplicas: CHANGEME - mpMachineType: CHANGEME - awsAccountID: CHANGEME cloudAccountID: CHANGEME + + tksInfraNode: CHNAGEME + tksInfraNodeMax: CHANGEME + tksInfraNodeType: CHANGEME + tksUserNode: CHANGEME + tksUserNodeMax: CHANGEME + tksUserNodeType: CHANGEME + # 노드 스탑을 위해서는 min은 항상 0 + # 승규님 의견 추가: machine pool 노드에 축소불가설정 필요 + charts: - name: cluster-api-aws override: @@ -48,10 +52,10 @@ charts: replicas: $(cpReplicas) machinePool: - name: taco - machineType: $(mpMachineType) - replicas: $(mpReplicas) - minSize: 3 - maxSize: 3 + machineType: $(tksInfraNodeType) + replicas: $(tksInfraNode) + minSize: 0 + maxSize: $(tksInfraNodeMax) rootVolume: size: 200 type: gp2 @@ -64,11 +68,11 @@ charts: machineDeployment: - name: normal numberOfAZ: $(mdNumOfAz) - minSizePerAZ: $(mdMinSizePerAz) - maxSizePerAZ: $(mdMaxSizePerAz) + minSizePerAZ: 0 # $(tksUserNode)? + maxSizePerAZ: $(tksUserNodeMax) selector: matchLabels: - machineType: $(mdMachineType) + machineType: $(tksUserNodeType) rootVolume: size: 50 type: gp2 diff --git a/eks-msa-reference/tks-cluster/site-values.yaml b/eks-msa-reference/tks-cluster/site-values.yaml index b0ce2c7..d8ef128 100644 --- a/eks-msa-reference/tks-cluster/site-values.yaml +++ b/eks-msa-reference/tks-cluster/site-values.yaml @@ -8,14 +8,17 @@ global: clusterName: cluster.local sshKeyName: CHANGEME clusterRegion: CHANGEME - mdNumOfAz: CHANGEME - mdMinSizePerAz: CHANGEME - mdMaxSizePerAz: CHANGEME - mdMachineType: CHANGEME - cpReplicas: CHANGEME - mpReplicas: CHANGEME - mpMachineType: CHANGEME cloudAccountID: CHANGEME + + tksInfraNode: CHNAGEME + tksInfraNodeMax: CHANGEME + tksInfraNodeType: CHANGEME + tksUserNode: CHANGEME + tksUserNodeMax: CHANGEME + tksUserNodeType: CHANGEME + # 노드 스탑을 위해서는 min은 항상 0 + # 승규님 의견 추가: machine pool 노드에 축소불가설정 필요 + charts: - name: cluster-api-aws override: @@ -39,10 +42,10 @@ charts: enabled: false machinePool: - name: taco - machineType: $(mpMachineType) - replicas: $(mpReplicas) - minSize: 3 - maxSize: 3 + machineType: $(tksInfraNodeType) + replicas: $(tksInfraNode) + minSize: 0 + maxSize: $(tksInfraNodeMax) rootVolume: size: 200 type: gp2 @@ -54,10 +57,10 @@ charts: - "arn:aws:iam::aws:policy/AmazonS3FullAccess" - "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy" - name: normal - machineType: $(mdMachineType) - replicas: $(mdNumOfAz) - minSize: $(mdMinSizePerAz) - maxSize: $(mdMaxSizePerAz) + machineType: $(tksUserNodeType) + replicas: $(tksUserNode) + minSize: 0 + maxSize: $(tksUserNodeMax) rootVolume: size: 50 type: gp2 diff --git a/eks-reference/tks-cluster/site-values.yaml b/eks-reference/tks-cluster/site-values.yaml index 008fbf1..d8ef128 100644 --- a/eks-reference/tks-cluster/site-values.yaml +++ b/eks-reference/tks-cluster/site-values.yaml @@ -8,14 +8,17 @@ global: clusterName: cluster.local sshKeyName: CHANGEME clusterRegion: CHANGEME - mdNumOfAz: CHANGEME - mdMinSizePerAz: CHANGEME - mdMaxSizePerAz: CHANGEME - mdMachineType: CHANGEME - cpReplicas: CHANGEME - mpReplicas: CHANGEME - mpMachineType: CHANGEME cloudAccountID: CHANGEME + + tksInfraNode: CHNAGEME + tksInfraNodeMax: CHANGEME + tksInfraNodeType: CHANGEME + tksUserNode: CHANGEME + tksUserNodeMax: CHANGEME + tksUserNodeType: CHANGEME + # 노드 스탑을 위해서는 min은 항상 0 + # 승규님 의견 추가: machine pool 노드에 축소불가설정 필요 + charts: - name: cluster-api-aws override: @@ -39,10 +42,10 @@ charts: enabled: false machinePool: - name: taco - machineType: $(mpMachineType) - replicas: $(mpReplicas) - minSize: 3 - maxSize: 3 + machineType: $(tksInfraNodeType) + replicas: $(tksInfraNode) + minSize: 0 + maxSize: $(tksInfraNodeMax) rootVolume: size: 200 type: gp2 @@ -54,10 +57,10 @@ charts: - "arn:aws:iam::aws:policy/AmazonS3FullAccess" - "arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy" - name: normal - machineType: $(mdMachineType) - replicas: $(mdNumOfAz) - minSize: $(mdMinSizePerAz) - maxSize: $(mdMaxSizePerAz) + machineType: $(tksUserNodeType) + replicas: $(tksUserNode) + minSize: 0 + maxSize: $(tksUserNodeMax) rootVolume: size: 50 type: gp2 @@ -93,8 +96,8 @@ charts: - name: k8s-cluster-autoscaler override: image: - tag: v1.25.2 repository: harbor.taco-cat.xyz/tks/cluster-autoscaler + tag: v1.25.2 awsRegion: ap-northeast-2 autoDiscovery: clusterName: $(clusterName) From f9ea66113a58c95c371735393635f3dacc937fec Mon Sep 17 00:00:00 2001 From: Taekyu Date: Thu, 7 Sep 2023 18:10:50 +0900 Subject: [PATCH 3/3] tks-cluster: add tksCpNode instead of az count, .... --- aws-msa-reference/tks-cluster/site-values.yaml | 18 +++++++++--------- aws-reference/tks-cluster/site-values.yaml | 18 +++++++++--------- eks-reference/tks-cluster/site-values.yaml | 3 +++ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/aws-msa-reference/tks-cluster/site-values.yaml b/aws-msa-reference/tks-cluster/site-values.yaml index 43d7692..c8d580c 100644 --- 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 index b67fe33..fc3d31e 100644 --- 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 index d8ef128..715f0ad 100644 --- 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