Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

최소사항 클러스터 지원을 위한 여정 #174

Merged
merged 3 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions aws-msa-reference/tks-cluster/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@ global:
clusterName: cluster.local
sshKeyName: CHANGEME
clusterRegion: CHANGEME
mdNumOfAz: CHANGEME
mdMinSizePerAz: CHANGEME
mdMaxSizePerAz: CHANGEME
mdMachineType: CHANGEME
cpReplicas: CHANGEME
mpReplicas: CHANGEME
mpMachineType: CHANGEME
awsAccountID: CHANGEME
cloudAccountID: CHANGEME
awsUserId: CHANGEME

tksCpNode: CHNAGEME
tksCpNodeMax: CHANGEME
tksCpNodeType: CHANGEME
tksInfraNode: CHNAGEME
tksInfraNodeMax: CHANGEME
tksInfraNodeType: CHANGEME
tksUserNode: CHANGEME
tksUserNodeMax: CHANGEME
tksUserNodeType: CHANGEME
intelliguy marked this conversation as resolved.
Show resolved Hide resolved
# 노드 스탑을 위해서는 min은 항상 0
# 승규님 의견 추가: machine pool 노드에 축소불가설정 필요

charts:
- name: cluster-api-aws
override:
Expand Down Expand Up @@ -46,13 +50,13 @@ charts:
toPort: 5473
bastion.enabled: false
kubeadmControlPlane:
replicas: $(cpReplicas)
replicas: $(tksCpNode)
machinePool:
- name: taco
machineType: $(mpMachineType)
replicas: $(mpReplicas)
minSize: 3
maxSize: 3
machineType: $(tksInfraNodeType)
replicas: $(tksInfraNode)
minSize: 0
maxSize: $(tksInfraNodeMax)
rootVolume:
size: 200
type: gp2
Expand All @@ -62,27 +66,22 @@ charts:
taco-ingress-gateway: enabled
roleAdditionalPolicies:
- "arn:aws:iam::aws:policy/AmazonS3FullAccess"
machineDeployment:
- name: normal
numberOfAZ: $(mdNumOfAz)
minSizePerAZ: $(mdMinSizePerAz)
maxSizePerAZ: $(mdMaxSizePerAz)
selector:
matchLabels:
machineType: $(mdMachineType)
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:
controller:
nodeSelector:
taco-lma: enabled
resources:
requests:
cpu: 2000m
memory: 4Gi
service:
externalTrafficPolicy: Local
annotations:
Expand Down
48 changes: 24 additions & 24 deletions aws-reference/tks-cluster/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,20 @@ global:
clusterName: cluster.local
sshKeyName: CHANGEME
clusterRegion: CHANGEME
mdNumOfAz: CHANGEME
mdMinSizePerAz: CHANGEME
mdMaxSizePerAz: CHANGEME
mdMachineType: CHANGEME
cpReplicas: CHANGEME
mpReplicas: CHANGEME
mpMachineType: CHANGEME
awsAccountID: CHANGEME
cloudAccountID: CHANGEME

tksCpNode: CHNAGEME
tksCpNodeMax: CHANGEME
tksCpNodeType: CHANGEME
tksInfraNode: CHNAGEME
tksInfraNodeMax: CHANGEME
tksInfraNodeType: CHANGEME
tksUserNode: CHANGEME
tksUserNodeMax: CHANGEME
tksUserNodeType: CHANGEME
# 노드 스탑을 위해서는 min은 항상 0
# 승규님 의견 추가: machine pool 노드에 축소불가설정 필요

charts:
- name: cluster-api-aws
override:
Expand Down Expand Up @@ -45,13 +50,13 @@ charts:
toPort: 5473
bastion.enabled: false
kubeadmControlPlane:
replicas: $(cpReplicas)
replicas: $(tksCpNode)
machinePool:
- name: taco
machineType: $(mpMachineType)
replicas: $(mpReplicas)
minSize: 3
maxSize: 3
machineType: $(tksInfraNodeType)
replicas: $(tksInfraNode)
minSize: 0
maxSize: $(tksInfraNodeMax)
rootVolume:
size: 200
type: gp2
Expand All @@ -61,27 +66,22 @@ charts:
taco-ingress-gateway: enabled
roleAdditionalPolicies:
- "arn:aws:iam::aws:policy/AmazonS3FullAccess"
machineDeployment:
- name: normal
numberOfAZ: $(mdNumOfAz)
minSizePerAZ: $(mdMinSizePerAz)
maxSizePerAZ: $(mdMaxSizePerAz)
selector:
matchLabels:
machineType: $(mdMachineType)
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:
controller:
nodeSelector:
taco-lma: enabled
resources:
requests:
cpu: 2000m
memory: 4Gi
service:
externalTrafficPolicy: Local
annotations:
Expand Down
37 changes: 18 additions & 19 deletions eks-msa-reference/tks-cluster/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -69,10 +72,6 @@ charts:
controller:
nodeSelector:
taco-lma: enabled
resources:
requests:
cpu: 2000m
memory: 4Gi
service:
externalTrafficPolicy: Local
annotations:
Expand Down
42 changes: 22 additions & 20 deletions eks-reference/tks-cluster/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,20 @@ global:
clusterName: cluster.local
sshKeyName: CHANGEME
clusterRegion: CHANGEME
mdNumOfAz: CHANGEME
mdMinSizePerAz: CHANGEME
mdMaxSizePerAz: CHANGEME
mdMachineType: CHANGEME
cpReplicas: CHANGEME
mpReplicas: CHANGEME
mpMachineType: CHANGEME
cloudAccountID: CHANGEME

tksCpNode: CHNAGEME
tksCpNodeMax: CHANGEME
tksCpNodeType: CHANGEME
tksInfraNode: CHNAGEME
tksInfraNodeMax: CHANGEME
tksInfraNodeType: CHANGEME
tksUserNode: CHANGEME
tksUserNodeMax: CHANGEME
tksUserNodeType: CHANGEME
# 노드 스탑을 위해서는 min은 항상 0
# 승규님 의견 추가: machine pool 노드에 축소불가설정 필요

charts:
- name: cluster-api-aws
override:
Expand All @@ -39,10 +45,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
Expand All @@ -54,10 +60,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
Expand All @@ -69,10 +75,6 @@ charts:
controller:
nodeSelector:
taco-lma: enabled
resources:
requests:
cpu: 2000m
memory: 4Gi
service:
externalTrafficPolicy: Local
annotations:
Expand All @@ -97,8 +99,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)