diff --git a/aws-msa-reference/tks-cluster/site-values.yaml b/aws-msa-reference/tks-cluster/site-values.yaml index 803dd0e..b14bd03 100644 --- a/aws-msa-reference/tks-cluster/site-values.yaml +++ b/aws-msa-reference/tks-cluster/site-values.yaml @@ -10,9 +10,8 @@ global: clusterRegion: CHANGEME cloudAccountID: CHANGEME - tksCpNode: CHNAGEME - tksCpNodeMax: CHANGEME - tksCpNodeType: CHANGEME + tksCpNode: 3 + tksCpNodeType: t3.large tksInfraNode: CHNAGEME tksInfraNodeMax: CHANGEME tksInfraNodeType: CHANGEME @@ -49,10 +48,12 @@ charts: protocol: tcp fromPort: 5473 toPort: 5473 - bastion.enabled: false - baseOS: ubuntu-22.04 + bastion: + enabled: false + baseOS: ubuntu-20.04 kubeadmControlPlane: replicas: $(tksCpNode) + controlPlaneMachineType: $(tksCpNodeType) machinePool: - name: taco machineType: $(tksInfraNodeType) @@ -68,16 +69,17 @@ charts: taco-ingress-gateway: enabled roleAdditionalPolicies: - "arn:aws:iam::aws:policy/AmazonS3FullAccess" + machineDeployment: - name: normal + numberOfAZ: 3 # ap-northeast-2 + minSizePerAZ: $(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: @@ -113,15 +115,3 @@ charts: override: deployMgmtRbacOnly: targetNamespace: $(clusterName) - -- name: argo-rollouts - override: - controller: - nodeSelector: - taco-lma: enabled - replicas: 2 - image: - registry: harbor.taco-cat.xyz - repository: tks/argo-rollouts - tag: v1.4.1 - diff --git a/aws-reference/tks-cluster/site-values.yaml b/aws-reference/tks-cluster/site-values.yaml index 1d60234..c5e3f1d 100644 --- a/aws-reference/tks-cluster/site-values.yaml +++ b/aws-reference/tks-cluster/site-values.yaml @@ -11,7 +11,6 @@ global: cloudAccountID: CHANGEME tksCpNode: CHNAGEME - tksCpNodeMax: CHANGEME tksCpNodeType: CHANGEME tksInfraNode: CHNAGEME tksInfraNodeMax: CHANGEME @@ -49,10 +48,12 @@ charts: protocol: tcp fromPort: 5473 toPort: 5473 - bastion.enabled: false - baseOS: ubuntu-22.04 + bastion + enabled: false + baseOS: ubuntu-20.04 kubeadmControlPlane: replicas: $(tksCpNode) + controlPlaneMachineType: $(tksCpNodeType) machinePool: - name: taco machineType: $(tksInfraNodeType) @@ -68,16 +69,17 @@ charts: taco-ingress-gateway: enabled roleAdditionalPolicies: - "arn:aws:iam::aws:policy/AmazonS3FullAccess" + machineDeployment: - name: normal + numberOfAZ: 3 # ap-northeast-2 + minSizePerAZ: $(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: