From 218e33c8a339f56d74c7f842157a2e689e5bb75d Mon Sep 17 00:00:00 2001 From: Jugwan Eom Date: Tue, 21 May 2024 02:22:13 +0000 Subject: [PATCH 1/3] tks-cluster: aws: use external cloud provider --- tks-cluster/infra/aws/resources.yaml | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/tks-cluster/infra/aws/resources.yaml b/tks-cluster/infra/aws/resources.yaml index f6bc7a4..b542b1a 100644 --- a/tks-cluster/infra/aws/resources.yaml +++ b/tks-cluster/infra/aws/resources.yaml @@ -11,7 +11,7 @@ spec: type: helmrepo repository: https://harbor.taco-cat.xyz/chartrepo/tks name: cluster-api-aws - version: 0.10.1 + version: 0.11.1 releaseName: cluster-api-aws targetNamespace: argo values: @@ -21,12 +21,12 @@ spec: region: TO_BE_FIXED kubernetesVersion: v1.25.9 podCidrBlocks: - - 192.168.0.0/16 + - 192.168.0.0/16 bastion: enabled: true instanceType: t3.micro allowedCIDRBlocks: - - 127.0.0.1/32 + - 127.0.0.1/32 useSpotInstance: enabled: true kubeadmControlPlane: @@ -41,6 +41,26 @@ spec: --- apiVersion: helm.fluxcd.io/v1 kind: HelmRelease +metadata: + labels: + name: aws-cloud-controller-manager + name: aws-cloud-controller-manager +spec: + helmVersion: v3 + chart: + type: helmrepo + repository: https://harbor.taco-cat.xyz/chartrepo/tks + name: aws-cloud-controller-manager + version: 0.0.8 + origin: https://kubernetes.github.io/cloud-provider-aws + releaseName: aws-cloud-controller-manager + targetNamespace: kube-system + values: + image: + repository: harbor.taco-cat.xyz/tks/cloud-controller-manager +--- +apiVersion: helm.fluxcd.io/v1 +kind: HelmRelease metadata: labels: name: aws-ebs-csi-driver From 597fb199e4ec97bb070d94ba010377b32d50a623 Mon Sep 17 00:00:00 2001 From: Jugwan Eom Date: Tue, 21 May 2024 02:22:39 +0000 Subject: [PATCH 2/3] tks-cluster: aws: use gp3 volume type --- tks-cluster/infra/aws/resources.yaml | 2 +- tks-cluster/infra/aws/site-values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tks-cluster/infra/aws/resources.yaml b/tks-cluster/infra/aws/resources.yaml index b542b1a..960693a 100644 --- a/tks-cluster/infra/aws/resources.yaml +++ b/tks-cluster/infra/aws/resources.yaml @@ -34,7 +34,7 @@ spec: controlPlaneMachineType: TO_BE_FIXED rootVolume: size: 20 # GB - type: gp2 + type: gp3 machinePool: [] machineDeployment: [] wait: true diff --git a/tks-cluster/infra/aws/site-values.yaml b/tks-cluster/infra/aws/site-values.yaml index 0e6f1f5..6b9ae3f 100644 --- a/tks-cluster/infra/aws/site-values.yaml +++ b/tks-cluster/infra/aws/site-values.yaml @@ -26,7 +26,7 @@ charts: maxSize: 16 rootVolume: size: 200 - type: gp2 + type: gp3 labels: taco-lma: enabled servicemesh: enabled From 344627bce15127ebde1fd7e760b74400189604eb Mon Sep 17 00:00:00 2001 From: Jugwan Eom Date: Tue, 21 May 2024 02:23:05 +0000 Subject: [PATCH 3/3] tks-cluster: aws: fix indent --- tks-cluster/infra/aws/resources.yaml | 35 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tks-cluster/infra/aws/resources.yaml b/tks-cluster/infra/aws/resources.yaml index 960693a..6d550eb 100644 --- a/tks-cluster/infra/aws/resources.yaml +++ b/tks-cluster/infra/aws/resources.yaml @@ -72,6 +72,7 @@ spec: repository: https://harbor.taco-cat.xyz/chartrepo/tks name: aws-ebs-csi-driver version: 2.24.0 + origin: https://kubernetes-sigs.github.io/aws-ebs-csi-driver releaseName: aws-ebs-csi-driver targetNamespace: kube-system values: @@ -97,20 +98,20 @@ spec: image: repository: harbor.taco-cat.xyz/tks/csi-node-driver-registrar snapshotterSidecarEnabled: true - storageClasses: - - name: taco-storage - # annotation metadata - annotations: - storageclass.kubernetes.io/is-default-class: "true" - # label metadata - labels: - support: taco-apps - # defaults to WaitForFirstConsumer - volumeBindingMode: WaitForFirstConsumer - # defaults to Delete - reclaimPolicy: Delete - parameters: - encrypted: "true" + storageClasses: + - name: taco-storage + # annotation metadata + annotations: + storageclass.kubernetes.io/is-default-class: "true" + # label metadata + labels: + support: taco-apps + # defaults to WaitForFirstConsumer + volumeBindingMode: WaitForFirstConsumer + # defaults to Delete + reclaimPolicy: Delete + parameters: + encrypted: "true" wait: true --- @@ -142,13 +143,13 @@ spec: chart: type: helmrepo repository: https://harbor.taco-cat.xyz/chartrepo/tks - name: s3-chart + name: s3-chart version: v1.0.3 - releaseName: s3-chart + releaseName: s3-chart targetNamespace: taco-system values: image: - repository: harbor.taco-cat.xyz/tks/s3-controller #public.ecr.aws/aws-controllers-k8s/s3-controller + repository: harbor.taco-cat.xyz/tks/s3-controller #public.ecr.aws/aws-controllers-k8s/s3-controller tag: v1.0.3 aws: region: ap-northeast-2