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

fix aws*-reference for production #214

Merged
merged 1 commit into from
Nov 7, 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
34 changes: 12 additions & 22 deletions aws-msa-reference/tks-cluster/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ global:
clusterRegion: CHANGEME
cloudAccountID: CHANGEME

tksCpNode: CHNAGEME
tksCpNodeMax: CHANGEME
tksCpNodeType: CHANGEME
tksCpNode: 3
tksCpNodeType: m5a.2xlarge
tksInfraNode: CHNAGEME
tksInfraNodeMax: CHANGEME
tksInfraNodeType: CHANGEME
Expand Down Expand Up @@ -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)
Expand All @@ -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:
Expand Down Expand Up @@ -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

22 changes: 12 additions & 10 deletions aws-reference/tks-cluster/site-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ global:
clusterRegion: CHANGEME
cloudAccountID: CHANGEME

tksCpNode: CHNAGEME
tksCpNodeMax: CHANGEME
tksCpNodeType: CHANGEME
tksCpNode: 3
tksCpNodeType: m5a.2xlarge
tksInfraNode: CHNAGEME
tksInfraNodeMax: CHANGEME
tksInfraNodeType: CHANGEME
Expand Down Expand Up @@ -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)
Expand All @@ -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:
Expand Down