From c80205bdede75d714a05e4f2da44f555e39d69f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Douglas=20Gad=C3=AAlha?= Date: Mon, 28 Aug 2023 18:06:11 -0300 Subject: [PATCH 1/3] fix(chart): cloudProvider name reference for OCI --- charts/cluster-autoscaler/templates/deployment.yaml | 2 +- charts/cluster-autoscaler/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/cluster-autoscaler/templates/deployment.yaml b/charts/cluster-autoscaler/templates/deployment.yaml index 957398a3bd69..2b5bba272b01 100644 --- a/charts/cluster-autoscaler/templates/deployment.yaml +++ b/charts/cluster-autoscaler/templates/deployment.yaml @@ -80,7 +80,7 @@ spec: - --node-group-auto-discovery=mig:namePrefix={{ .name }},min={{ .minSize }},max={{ .maxSize }} {{- end }} {{- end }} - {{- if eq .Values.cloudProvider "oci-oke" }} + {{- if eq .Values.cloudProvider "oci" }} {{- if .Values.cloudConfigPath }} - --nodes={{ .minSize }}:{{ .maxSize }}:{{ .name }} - --balance-similar-node-groups diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml index a7deb24a7e70..ec4e605fbcaa 100644 --- a/charts/cluster-autoscaler/values.yaml +++ b/charts/cluster-autoscaler/values.yaml @@ -6,7 +6,7 @@ affinity: {} additionalLabels: {} autoDiscovery: - # cloudProviders `aws`, `gce`, `azure`, `magnum` and `clusterapi` `oci-oke` are supported by auto-discovery at this time + # cloudProviders `aws`, `gce`, `azure`, `magnum` and `clusterapi` `oci` are supported by auto-discovery at this time # AWS: Set tags as described in https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md#auto-discovery-setup # autoDiscovery.clusterName -- Enable autodiscovery for `cloudProvider=aws`, for groups matching `autoDiscovery.tags`. From 2327f192d096f75a1f46cc09fcd006095932d302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Douglas=20Gad=C3=AAlha?= Date: Mon, 28 Aug 2023 18:35:50 -0300 Subject: [PATCH 2/3] fix(docs): inline list of supported cloud providers --- charts/cluster-autoscaler/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml index ec4e605fbcaa..b7b39739d3ec 100644 --- a/charts/cluster-autoscaler/values.yaml +++ b/charts/cluster-autoscaler/values.yaml @@ -6,7 +6,7 @@ affinity: {} additionalLabels: {} autoDiscovery: - # cloudProviders `aws`, `gce`, `azure`, `magnum` and `clusterapi` `oci` are supported by auto-discovery at this time + # cloudProviders `aws`, `gce`, `azure`, `magnum`, `clusterapi` and `oci` are supported by auto-discovery at this time # AWS: Set tags as described in https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md#auto-discovery-setup # autoDiscovery.clusterName -- Enable autodiscovery for `cloudProvider=aws`, for groups matching `autoDiscovery.tags`. From 6c677b97ab1a7ef423707748d405a958ab8a595c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Douglas=20Gad=C3=AAlha?= Date: Mon, 28 Aug 2023 18:39:57 -0300 Subject: [PATCH 3/3] chore: bump cluster-autoscaler chart version --- charts/cluster-autoscaler/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/cluster-autoscaler/Chart.yaml b/charts/cluster-autoscaler/Chart.yaml index 7bbaffd34b6c..394a0be6d268 100644 --- a/charts/cluster-autoscaler/Chart.yaml +++ b/charts/cluster-autoscaler/Chart.yaml @@ -11,4 +11,4 @@ name: cluster-autoscaler sources: - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler type: application -version: 9.29.2 +version: 9.29.3