Merge pull request #318 from openinfradev/develop

20240521 develop to release
openinfradev · May 21, 2024 · 99f74ca · 99f74ca
2 parents 0c4e04a + 03ebf80
commit 99f74ca
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 22 deletions.
diff --git 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,26 +21,46 @@ 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:
       replicas: 3
       controlPlaneMachineType: TO_BE_FIXED
       rootVolume:
         size: 20 # GB
-        type: gp2
+        type: gp3
     machinePool: []
     machineDeployment: []
   wait: true
 ---
 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
@@ -52,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:
@@ -77,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
 ---
@@ -122,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

diff --git 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