Merge pull request #288 from openinfradev/develop

[WIP] 20231107 develop to release
openinfradev · Nov 8, 2023 · 2812e55 · 2812e55
2 parents 1392ee3 + 0f01196
commit 2812e55
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 51 deletions.
diff --git a/tks-cluster/base/resources.yaml b/tks-cluster/base/resources.yaml
@@ -168,59 +168,22 @@ apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
   labels:
-    name: k8s-cluster-autoscaler
-  name: k8s-cluster-autoscaler
+    name: cluster-autoscaler
+  name: cluster-autoscaler
 spec:
   helmVersion: v3
   chart:
     type: helmrepo
     repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: cluster-autoscaler
-    version: 9.28.0
+    version: 9.29.4
     origin: https://kubernetes.github.io/autoscaler
   releaseName: cluster-autoscaler
   targetNamespace: kube-system
   values:
     image:
       tag: TO_BE_FIXED
-    awsRegion: TO_BE_FIXED
-    autoDiscovery:
-      clusterName: TO_BE_FIXED
-    cloudProvider: aws
-    rbac:
-     serviceAccount:
-       create: false
-       name: "cluster-autoscaler"
-    extraArgs:
-      expander: priority
-    expanderPriorities:
-      "10":
-        - .*-taco
-      "50":
-        - .*-normal
-  wait: true
----
-apiVersion: helm.fluxcd.io/v1
-kind: HelmRelease
-metadata:
-  labels:
-    name: cluster-autoscaler
-  name: cluster-autoscaler
-spec:
-  helmVersion: v3
-  chart:
-    type: helmrepo
-    repository: https://harbor.taco-cat.xyz/chartrepo/tks
-    name: cluster-autoscaler
-    version: 0.2.0
-    origin: https://openinfradev.github.io/helm-repo
-  releaseName: cluster-autoscaler
-  targetNamespace: kube-system
-  values:
-    separateMgmtClusterEnabled: true
-    discoveryNamespace: TO_BE_FIXED
-    discoveryClusterName: TO_BE_FIXED
-    mgmtKubeconfigSecretName: mgmt-kubeconfig
+    cloudProvider: TO_BE_FIXED
   wait: true
 ---
 apiVersion: helm.fluxcd.io/v1

diff --git a/tks-cluster/base/site-values.yaml b/tks-cluster/base/site-values.yaml
@@ -11,14 +11,6 @@ charts:
 - name: ingress-nginx
   override:
 
-- name: k8s-cluster-autoscaler
-  override:
-    image:
-      tag: v1.25.1
-    awsRegion: ap-northeast-2
-    autoDiscovery:
-      clusterName: $(clusterName)
-
 - name: cluster-autoscaler
   override:
     discoveryNamespace: $(clusterName)

diff --git a/tks-cluster/infra/aws/resources.yaml b/tks-cluster/infra/aws/resources.yaml
@@ -51,7 +51,7 @@ spec:
     type: helmrepo
     repository: https://harbor.taco-cat.xyz/chartrepo/tks
     name: aws-ebs-csi-driver
-    version: 2.6.4-skt
+    version: 2.24.0
   releaseName: aws-ebs-csi-driver
   targetNamespace: kube-system
   values:
@@ -135,4 +135,4 @@ spec:
     deployment:
       nodeSelector:
         kubernetes.io/os: linux
-        taco-lma: enabled
+        taco-lma: enabled