make the upstream cluster-autoscaler chart common to all

openinfradev · Oct 30, 2023 · fd31515 · fd31515
1 parent 74a58d7
commit fd31515
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 20 deletions.
diff --git a/aws-msa-reference/tks-cluster/site-values.yaml b/aws-msa-reference/tks-cluster/site-values.yaml
@@ -28,6 +28,7 @@ charts:
     sshKeyName: $(sshKeyName)
     cluster:
       name: $(clusterName)
+      kubernetesVersion: v1.26.10
       eksEnabled: false
       multitenancyId:
         kind: AWSClusterRoleIdentity
@@ -95,8 +96,17 @@ charts:
 
 - name: cluster-autoscaler
   override:
-    discoveryNamespace: $(clusterName)
-    discoveryClusterName: $(clusterName)
+    image:
+      repository: harbor.taco-cat.xyz/tks/cluster-autoscaler
+      tag: v1.26.4
+    autoDiscovery:
+      clusterName: $(clusterName)
+      labels:
+        - namespace: $(clusterName)
+    cloudProvider: clusterapi
+    clusterAPICloudConfigPath: /etc/kubernetes/mgmt-kubeconfig
+    clusterAPIKubeconfigSecret: "mgmt-kubeconfig"
+    clusterAPIMode: incluster-kubeconfig
 
 - name: cluster-autoscaler-rbac
   override:

diff --git a/aws-reference/tks-cluster/site-values.yaml b/aws-reference/tks-cluster/site-values.yaml
@@ -28,6 +28,7 @@ charts:
     sshKeyName: $(sshKeyName)
     cluster:
       name: $(clusterName)
+      kubernetesVersion: v1.26.10
       eksEnabled: false
       multitenancyId:
         kind: AWSClusterRoleIdentity
@@ -95,8 +96,17 @@ charts:
 
 - name: cluster-autoscaler
   override:
-    discoveryNamespace: $(clusterName)
-    discoveryClusterName: $(clusterName)
+    image:
+      repository: harbor.taco-cat.xyz/tks/cluster-autoscaler
+      tag: v1.26.4
+    autoDiscovery:
+      clusterName: $(clusterName)
+      labels:
+        - namespace: $(clusterName)
+    cloudProvider: clusterapi
+    clusterAPICloudConfigPath: /etc/kubernetes/mgmt-kubeconfig
+    clusterAPIKubeconfigSecret: "mgmt-kubeconfig"
+    clusterAPIMode: incluster-kubeconfig
 
 - name: cluster-autoscaler-rbac
   override:

diff --git a/eks-msa-reference/tks-cluster/site-values.yaml b/eks-msa-reference/tks-cluster/site-values.yaml
@@ -83,21 +83,28 @@ charts:
         enable-underscores-in-headers: "true"
         proxy-body-size: "10m"
 
-- name: cluster-autoscaler
-  override:
-    discoveryNamespace: $(clusterName)
-    discoveryClusterName: $(clusterName)
-
 - name: cluster-autoscaler-rbac
   override:
     deployMgmtRbacOnly:
       targetNamespace: $(clusterName)
 
-- name: k8s-cluster-autoscaler
+- name: cluster-autoscaler
   override:
     image:
       repository: harbor.taco-cat.xyz/tks/cluster-autoscaler
-      tag: v1.25.2
-    awsRegion: ap-northeast-2
+      tag: v1.25.3
     autoDiscovery:
       clusterName: $(clusterName)
+    cloudProvider: aws
+    awsRegion: ap-northeast-2
+    rbac:
+     serviceAccount:
+       create: false
+       name: "cluster-autoscaler"
+    extraArgs:
+      expander: priority
+    expanderPriorities:
+      "10":
+        - .*-taco
+      "50":
+        - .*-normal
diff --git a/eks-reference/tks-cluster/site-values.yaml b/eks-reference/tks-cluster/site-values.yaml
@@ -86,21 +86,28 @@ charts:
         enable-underscores-in-headers: "true"
         proxy-body-size: "10m"
 
-- name: cluster-autoscaler
-  override:
-    discoveryNamespace: $(clusterName)
-    discoveryClusterName: $(clusterName)
-
 - name: cluster-autoscaler-rbac
   override:
     deployMgmtRbacOnly:
       targetNamespace: $(clusterName)
 
-- name: k8s-cluster-autoscaler
+- name: cluster-autoscaler
   override:
     image:
       repository: harbor.taco-cat.xyz/tks/cluster-autoscaler
-      tag: v1.25.2
-    awsRegion: ap-northeast-2
+      tag: v1.25.3
     autoDiscovery:
       clusterName: $(clusterName)
+    cloudProvider: aws
+    awsRegion: ap-northeast-2
+    rbac:
+     serviceAccount:
+       create: false
+       name: "cluster-autoscaler"
+    extraArgs:
+      expander: priority
+    expanderPriorities:
+      "10":
+        - .*-taco
+      "50":
+        - .*-normal