feature. update kubernetes version to 1.29.8

openinfradev · Sep 6, 2024 · 6b49313 · 6b49313
1 parent 228e573
commit 6b49313
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/aws-msa-reference/tks-cluster/site-values.yaml b/aws-msa-reference/tks-cluster/site-values.yaml
@@ -27,7 +27,7 @@ charts:
     sshKeyName: $(sshKeyName)
     cluster:
       name: $(clusterName)
-      kubernetesVersion: v1.26.10
+      kubernetesVersion: v1.29.8
       eksEnabled: false
       multitenancyId:
         kind: AWSClusterRoleIdentity
@@ -54,6 +54,8 @@ charts:
     kubeadmControlPlane:
       replicas: $(tksCpNode)
       controlPlaneMachineType: $(tksCpNodeType)
+      ami:
+        id: ami-02e4e8f09921cfe97
     machinePool:
     - name: taco
       machineType: $(tksInfraNodeType)
@@ -69,6 +71,8 @@ charts:
         taco-ingress-gateway: enabled
       roleAdditionalPolicies:
       - "arn:aws:iam::aws:policy/AmazonS3FullAccess"
+      ami:
+        id: ami-02e4e8f09921cfe97
     machineDeployment:
     - name: normal
       numberOfAZ: 3 # ap-northeast-2
@@ -80,6 +84,8 @@ charts:
       rootVolume:
         size: 50
         type: gp2
+      ami:
+        id: ami-02e4e8f09921cfe97
 
 - name: ingress-nginx
   override:

diff --git a/aws-reference/tks-cluster/site-values.yaml b/aws-reference/tks-cluster/site-values.yaml
@@ -27,7 +27,7 @@ charts:
     sshKeyName: $(sshKeyName)
     cluster:
       name: $(clusterName)
-      kubernetesVersion: v1.26.10
+      kubernetesVersion: v1.29.8
       eksEnabled: false
       multitenancyId:
         kind: AWSClusterRoleIdentity
@@ -54,6 +54,8 @@ charts:
     kubeadmControlPlane:
       replicas: $(tksCpNode)
       controlPlaneMachineType: $(tksCpNodeType)
+      ami:
+        id: ami-02e4e8f09921cfe97
     machinePool:
     - name: taco
       machineType: $(tksInfraNodeType)
@@ -69,6 +71,8 @@ charts:
         taco-ingress-gateway: enabled
       roleAdditionalPolicies:
       - "arn:aws:iam::aws:policy/AmazonS3FullAccess"
+      ami:
+        id: ami-02e4e8f09921cfe97
     machineDeployment:
     - name: normal
       numberOfAZ: 3 # ap-northeast-2
@@ -80,6 +84,8 @@ charts:
       rootVolume:
         size: 50
         type: gp2
+      ami:
+        id: ami-02e4e8f09921cfe97
 
 - name: ingress-nginx
   override:

diff --git a/byoh-reference/tks-cluster/site-values.yaml b/byoh-reference/tks-cluster/site-values.yaml
@@ -18,7 +18,7 @@ charts:
   override:
     cluster:
       name: $(clusterName)
-      kubernetesVersion: v1.25.11
+      kubernetesVersion: v1.29.8
     byoCluster:
       bundleLookupBaseRegistry: harbor.taco-cat.xyz/cluster_api_provider_bringyourownhost
       controlPlaneEndpoint:

diff --git a/eks-msa-reference/tks-cluster/site-values.yaml b/eks-msa-reference/tks-cluster/site-values.yaml
@@ -27,14 +27,14 @@ charts:
       name: $(clusterName)
       region: $(clusterRegion)
       eksEnabled: true
-      kubernetesVersion: v1.25.9
+      kubernetesVersion: v1.29.8
       eksAddons:
       - name: "aws-ebs-csi-driver"
-        version: "v1.18.0-eksbuild.1"
+        version: "v1.34.0-eksbuild.1"
         conflictResolution: "overwrite"
       - name: "vpc-cni"
         conflictResolution: "overwrite"
-        version: "v1.12.6-eksbuild.2"
+        version: "v1.18.3-eksbuild.2"
       multitenancyId:
         kind: AWSClusterRoleIdentity
         name: $(cloudAccountID)-account-role

diff --git a/eks-reference/tks-cluster/site-values.yaml b/eks-reference/tks-cluster/site-values.yaml
@@ -30,14 +30,14 @@ charts:
       name: $(clusterName)
       region: $(clusterRegion)
       eksEnabled: true
-      kubernetesVersion: v1.25.9
+      kubernetesVersion: v1.29.8
       eksAddons:
       - name: "aws-ebs-csi-driver"
-        version: "v1.18.0-eksbuild.1"
+        version: "v1.34.0-eksbuild.1"
         conflictResolution: "overwrite"
       - name: "vpc-cni"
         conflictResolution: "overwrite"
-        version: "v1.12.6-eksbuild.2"
+        version: "v1.18.3-eksbuild.2"
       multitenancyId:
         kind: AWSClusterRoleIdentity
         name: $(cloudAccountID)-account-role