Skip to content

Commit

Permalink
Sync upstream v1.30.1 (#317)
Browse files Browse the repository at this point in the history
* Comment to explain why test is done on STS ownerRef

* add informer argument to clusterapi provider builder

This change adds the informer factory as an argument to the
`buildCloudProvider` function for clusterapi so that building with tags
will work properly.

* Add informer argument to the CloudProviders builder.

* clusterapi: add missing error check

* Add instanceType/region support in Helm chart for Hetzner cloud provider

* doc: cluster-autoscaler: Oracle provider: Add small security note

* doc: cluster-autoscaler: Oracle provider: Add small security note

* doc: cluster-autoscaler: Oracle provider: Add small security note

* Update charts/cluster-autoscaler/README.md

* Update Auto Labels of Subprojects

* check empty ProviderID in ali NodeGroupForNode

* add gce constructor with custom timeout

* update README.md.gotmpl and added Helm docs for Hetzner Cloud

* bump chart version

* use older helm-docs version and remove empty line in values comment

* add missing line breaks

* Update charts/cluster-autoscaler/Chart.yaml

Co-authored-by: Shubham <shubham.kuchhal@india.nec.com>

* Reduce log spam in AtomicResizeFilteringProcessor

Also, introduce default per-node logging quotas. For now, identical to
the per-pod ones.

* Bump golang in /vertical-pod-autoscaler/pkg/updater

Bumps golang from 1.21.6 to 1.22.0.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golang in /vertical-pod-autoscaler/pkg/recommender

Bumps golang from 1.21.6 to 1.22.0.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golang in /vertical-pod-autoscaler/pkg/admission-controller

Bumps golang from 1.21.6 to 1.22.0.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update Chart.yaml

* Move estimatorBuilder from AutoscalingContext to Orchestrator Init

* VPA: bump golang.org/x/net to fix CVE-2023-39325

The version of golang.org/x/net currently used is vulnerable to
https://avd.aquasec.com/nvd/2023/cve-2023-39325/, bump it to fix that.

* Bump go version.

* Fix e2e test setup

* helm: enable clusterapi namespace autodiscovery

* Fix expectedToRegister to respect instances with nil status

* add option to keep node group backoff on OutOfResource error

* remove changes to backoff interface

* attach errors to scale-up request and add comments

* revert optionally keeping node group backoff

* remove RemoveBackoff from updateScaleRequests

* Add ProvisioningRequestProcessor (kubernetes#6488)

* Add kube-env to MigInfoProvider

* CA: GCE: add pricing for new Z3 machines

* Introduce LocalSSDSizeProvider interface for GCE

* Use KubeEnv in gce/templates.go

* Add templateName to kube-env to ensure that correct value is cached

* Add unit-tests

* extract create group to function

* Merged PR 1379: added retry for creatingAzureManager in case of throttled requests

added retry for forceRefresh in case of throttled requests
ran tests
MallocNanoZone=0 go test -race k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure -- passed

and commented out unit test -- commented out as it takes 10 minutes to complete

func TestCreateAzureManagerWithRetryError(t *testing.T) {
	ctrl := gomock.NewController(t)
	defer ctrl.Finish()
	mockVMClient := mockvmclient.NewMockInterface(ctrl)
	mockVMSSClient := mockvmssclient.NewMockInterface(ctrl)
	mockVMSSClient.EXPECT().List(gomock.Any(), "fakeId").Return([]compute.VirtualMachineScaleSet{}, retry.NewError(true, errors.New("test"))).AnyTimes()
	mockAzClient := &azClient{
		virtualMachinesClient:         mockVMClient,
		virtualMachineScaleSetsClient: mockVMSSClient,
	}
	manager, err := createAzureManagerInternal(strings.NewReader(validAzureCfg), cloudprovider.NodeGroupDiscoveryOptions{}, config.AutoscalingOptions{}, mockAzClient)
	assert.Nil(t, manager)
	assert.NotNil(t, err)
}

* docs: update outdated/deprecated taints in the examples

Refactor references to taints & tolerations, replacing master key
with control-plane across all the example YAMLs.

Signed-off-by: Feruzjon Muyassarov <feruzjon.muyassarov@intel.com>

* CA FAQ: clarify the point about scheduling constraints blocking scale-down

* Add warning about vendor removal to Makefile build target

Signed-off-by: Feruzjon Muyassarov <feruzjon.muyassarov@intel.com>

* fix: add missing ephemeral-storage resource definition

* Add BuildTestNodeWithAllocatable test utility method.

* Add ProvisioningRequest injector (kubernetes#6529)

* Add ProvisioningRequests injector

* Add test case for Accepted conditions and add supported provreq classes list

* Use Passive clock

* Consider preemption policy for expandable pods

* Fix a bug where atomic scale-down failure could affect subsequent atomic scale-downs

* Update gce_price_info.go

* Migrate from satori/go.uuid to google/uuid

* Delay force refresh by DefaultInterval when OCI GetNodePool call returns 404

* CA: update dependencies to k8s v1.30.0-alpha.3, go1.21.8

* Bump golang in /vertical-pod-autoscaler/pkg/admission-controller

Bumps golang from 1.22.0 to 1.22.1.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golang in /vertical-pod-autoscaler/pkg/updater

Bumps golang from 1.22.0 to 1.22.1.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golang in /vertical-pod-autoscaler/pkg/recommender

Bumps golang from 1.22.0 to 1.22.1.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update expander options for the AWS cloud provider README

* Remove shadow err variable in deleteCreatedNodesWithErros func

* fix memory leak in NodeDeleteTracker

* CA - Add 1.29 to version compatibility matrix

* ClusterAutoscaler: Put APIs in a separate go module

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>

* Extend update-deps.sh so that we can automatically update k8s libraries in the apis pkg

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>

* Clean up update-deps.sh

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>

* Update apis version to v1.29.2

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>

* Allow to override rancher provider settings

Currently it is only possible to set provider settings over yaml file.

This commit introduces env variables to override URL, token and cluster name.

If particular environment variable is set it overrides value supplied in yaml file.

Signed-off-by: Dinar Valeev <k0da@opensuse.org>
Co-authored-by: Donovan Muller <donovan.muller@absa.africa>

* Bump VPA version to 1.1.0

* Deprecate the Linode Cluster Autoscaler provider

Signed-off-by: Ondrej Kokes <ondrej.kokes@gmail.com>

* add price info for n4

* update n4 price info format

* Set "pd-balanced" as DefaultBootDiskType

It is a default since v1.24
Ref: https://cloud.google.com/kubernetes-engine/docs/how-to/custom-boot-disks#specify

* Clarify VPA and HPA limitations

Signed-off-by: Luke Addison <lukeaddison785@gmail.com>

* Update ionos-cloud-sdk-go and mocks

* Update provider code

* Add cloud API request metrics.
* Fix and update README

* Ignore ionos-cloud-sdk-go spelling

* fix n4 price format

* Add listManagedInstancesResults to GceCache.

* [clusterapi] Do not skip nodegroups with minSize=maxSize

* [clusterapi] Update tests for nodegroups with minSize=maxSize

* add tests

* made changes to support MIGs that use regional instance templates

* modified current unit tests to support the new modifications

* added comment to InstanceTemplateNameType

* Ran hack/go-fmtupdate.h on mig_info_provider_test.go

* Use KubeEnv in gce/templates.go

* Add templateName to kube-env to ensure that correct value is cached

* rebased and resolved conflicts

* added fix for unit tests

* changed InstanceTemplateNameType to InstanceTemplateName

* separated url parser to its own function, created unit test for the function

* separated url parser to its own function, created unit test for the function

* added unit test with regional MIG

* Migrate GCE client to server side operation wait

* Track type of node group created/deleted in auto-provisioned group metrics.

* trigger tests

* fix comment

* Add AtomicScaleUp method to NodeGroup interface

* Add an option to Cluster Autoscaler that allows triggering new loops
more frequently: based on new unschedulable pods and every time a
previous iteration was productive.

* Refactor StartDeletion usage patterns and enforce periodic scaledown status processor calls.

* Bump golang to 1.22

* updated admission-controller to have adjustable --min-tls-version and --tls-ciphers

* CA: Move the ProvisioningRequest CRD to apis module

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>

* Bump default VPA version to 1.1.0

As part of the 1.1.0 release: kubernetes#6388

* Format README

* Add chart versions

* Add script to update required chart versions in README

* Add chart version column in version matrix

* Move cluster-autoscaler update-chart-version-readme script to /hack

* Only check recent revisions when updating README

* Update min cluster-autoscaler chart for Kubernetes 1.29

* Remove unused NodeInfoProcessor

* Fix broken link in README.md to point to equinixmetal readme

* review comments - simplify retry logic

* CA: Before we perform go test, synchronizing go vendor

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>

* Cleanup ProvReq wrapper

* Make the Estimate func accept pods grouped.

The grouping should be made by the schedulability equivalence
meaning we can introduce optimizations to the binpacking.

Introduce a benchmark that estimates capacity needed for 51k pods,
which can be grouped to two equivalence groups 50k and 1k.

* Update CAPI docs

Add a link to the sample manifest and update the image used in the
example.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>

* Bump golang in /vertical-pod-autoscaler/pkg/updater

Bumps golang from 1.22.1 to 1.22.2.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golang in /vertical-pod-autoscaler/pkg/admission-controller

Bumps golang from 1.22.1 to 1.22.2.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump golang in /vertical-pod-autoscaler/pkg/recommender

Bumps golang from 1.22.1 to 1.22.2.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Introduce binbacking optimization for similar pods.

The optimization uses the fact that pods which are equivalent do not
need to be check multiple times against already filled nodes.
This changes the time complexity from O(pods*nodes) to O(pods).

* CA: Fix apis vendoring

* Add g6 EC2 instance type for AWS

* Copyright boilerplate

* Lower errors verbosity for kube-env label missing

* parentController may be nil when owner isn't scalable

* Update ProvisioningClass API Group

* Fix Autoscaling for worker nodes with invalid ProviderID

This change fixes a bug that arises when the user's cluster includes worker nodes not from Hetzner Cloud, such as a Hetzner Dedicated server or any server resource other than Hetzner. It also corrects the behavior when a server has been physically deleted from Hetzner Cloud.

Signed-off-by: Maksim Paskal <paskal.maksim@gmail.com>

* Add tests for Pods owner that doesn't implement /scale

* Add provreqOrchestrator that handle ProvReq classes (kubernetes#6627)

* Add provreqOrchestrator that handle ProvReq classes

* Review remarks

* Review remarks

* Cluster Autoscaler: Sync k8s.io dependencies to k/k v1.30.0, bump Go to 1.22.2

* [v1.30] fix(hetzner): hostname label is not considered

The Node Group info we currently return does not include the
`kubernetes.io/hostname` label, which is usually set on every node.

This causes issues when the user has an unscheduled pod with a
`topologySpreadConstraint` on `topologyKey: kubernetes.io/hostname`.
cluster-autoscaler is unable to fulfill this constraint and does not
scale up any of the node groups.

Related to kubernetes#6715

* Remove the flag for enabling ProvisioningRequests

The API is not stable yet, we don't want people to depend on the
current version.

* fix: scale up broken for providers not implementing NodeGroup.GetOptions()

Properly handle calls to `NodeGroup.GetOptions()` that return
`cloudprovider.ErrNotImplemented` in the scale up path.

* Add --enable-provisioning-requests flag

* [cluster-autoscaler-release-1.30] Fix ProvisioningRequest update (kubernetes#6825)

* Fix ProvisioningRequest update

* Review remarks

---------

Co-authored-by: Yaroslava Serdiuk <yaroslava@google.com>

* Update k/k vendor to 1.30.1 for CA 1.30

* sync changes

* added sync changes file

* golint fix

* update vpa vendor

* fixed volcengine

* ran gofmt

* synched azure

* synched azure

* synched IT

* removed IT log file

* addressed review comments

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Feruzjon Muyassarov <feruzjon.muyassarov@intel.com>
Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
Signed-off-by: Dinar Valeev <k0da@opensuse.org>
Signed-off-by: Ondrej Kokes <ondrej.kokes@gmail.com>
Signed-off-by: Luke Addison <lukeaddison785@gmail.com>
Signed-off-by: Lennart Jern <lennart.jern@est.tech>
Signed-off-by: Maksim Paskal <paskal.maksim@gmail.com>
Co-authored-by: Kubernetes Prow Robot <20407524+k8s-ci-robot@users.noreply.github.com>
Co-authored-by: David Benque <david.benque@datadoghq.com>
Co-authored-by: michael mccune <msm@opbstudios.com>
Co-authored-by: shubham82 <shubham.kuchhal@india.nec.com>
Co-authored-by: Markus Lehtonen <markus.lehtonen@intel.com>
Co-authored-by: Niklas Rosenstein <niklas.rosenstein@helsing.ai>
Co-authored-by: Ky-Anh Huynh <kyanh@viettug.org>
Co-authored-by: Niklas Rosenstein <rosensteinniklas@gmail.com>
Co-authored-by: Guy Templeton <guyjtempleton@googlemail.com>
Co-authored-by: daimaxiaxie <44503972+daimaxiaxie@users.noreply.github.com>
Co-authored-by: daimaxiaxie <codexiaxie@163.com>
Co-authored-by: Michal Pitr <michalpitr@google.com>
Co-authored-by: Daniel Kłobuszewski <danielmk@google.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Artur Żyliński <azylinski@google.com>
Co-authored-by: Alvaro Aleman <aaleman@confluent.io>
Co-authored-by: Marco Voelz <marco.voelz@sap.com>
Co-authored-by: Jack Francis <jackfrancis@gmail.com>
Co-authored-by: Yarin Miran <yarin@wiz.io>
Co-authored-by: Will Bowers <22203232+wllbo@users.noreply.github.com>
Co-authored-by: Yaroslava Serdiuk <yaroslava@google.com>
Co-authored-by: Bartłomiej Wróblewski <bwroblewski@google.com>
Co-authored-by: Anish Shah <shah.anish07@gmail.com>
Co-authored-by: Mahmoud Atwa <mahmoudatwa@google.com>
Co-authored-by: pawel siwek <pawelsiwek@google.com>
Co-authored-by: Miranda Craghead <mcraghead@microsoft.com>
Co-authored-by: Feruzjon Muyassarov <feruzjon.muyassarov@intel.com>
Co-authored-by: Kuba Tużnik <jtuznik@google.com>
Co-authored-by: Johnnie Ho <johnnieho89@gmail.com>
Co-authored-by: Walid Ghallab <walidghallab@google.com>
Co-authored-by: Karol Wychowaniec <kawych@google.com>
Co-authored-by: oksanabaza <obazylie@redhat.com>
Co-authored-by: Vijay Bhargav Eshappa <vijay.bhargav.eshappa@oracle.com>
Co-authored-by: David <drmorr@appliedcomputing.io>
Co-authored-by: Damika Gamlath <damika@google.com>
Co-authored-by: Ashish Pani <ashishpani988@gmail.com>
Co-authored-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
Co-authored-by: Dinar Valeev <k0da@opensuse.org>
Co-authored-by: Donovan Muller <donovan.muller@absa.africa>
Co-authored-by: Luiz Antonio <luizaoj@google.com>
Co-authored-by: Ondrej Kokes <ondrej.kokes@gmail.com>
Co-authored-by: Yuan <yuanwangyw@google.com>
Co-authored-by: Luke Addison <lukeaddison785@gmail.com>
Co-authored-by: Mario Valderrama <mario.valderrama@ionos.com>
Co-authored-by: Max Fedotov <m.a.fedotov@gmail.com>
Co-authored-by: Daniel-Redeploy <84455776+Daniel-Redeploy@users.noreply.github.com>
Co-authored-by: Edwinhr716 <edandres249@gmail.com>
Co-authored-by: Maksym Fuhol <mfuhol@google.com>
Co-authored-by: Allen Mun <allen.mun197@gmail.com>
Co-authored-by: mewa <marcin.k.chmiel@gmail.com>
Co-authored-by: Aayush Rangwala <ayush.rangwala@gmail.com>
Co-authored-by: prachigandhi <prachigandhi@microsoft.com>
Co-authored-by: Daniel Gutowski <danielgutowski@google.com>
Co-authored-by: Lennart Jern <lennart.jern@est.tech>
Co-authored-by: mendelski <mendelski@google.com>
Co-authored-by: ceuity <everland7942@gmail.com>
Co-authored-by: Maksim Paskal <paskal.maksim@gmail.com>
Co-authored-by: Julian Tölle <julian.toelle@hetzner-cloud.de>
Co-authored-by: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com>
  • Loading branch information
Show file tree
Hide file tree
Showing 2,726 changed files with 120,474 additions and 340,594 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@ updates:
open-pull-requests-limit: 3
labels:
- "vertical-pod-autoscaler"
- package-ecosystem: gomod
directory: "/addon-resizer"
schedule:
interval: daily
target-branch: "addon-resizer-release-1.8"
open-pull-requests-limit: 3
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.21.6'
go-version: '1.22.1'

- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion addon-resizer/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ emeritus_approvers:
- bskiba # 2022-09-30
- wojtek-t # 2022-09-30
labels:
- addon-resizer
- area/addon-resizer
2 changes: 1 addition & 1 deletion balancer/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ reviewers:
- mwielgus
- kgolab
labels:
- balancer
- area/balancer
3 changes: 1 addition & 2 deletions builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.


FROM golang:1.22.2
LABEL maintainer="Marcin Wielgus <mwielgus@google.com>"

Expand All @@ -22,6 +21,6 @@ ENV GO111MODULE auto

RUN apt-get update && apt-get --yes install libseccomp-dev
RUN go version
RUN go get github.com/tools/godep
RUN go install github.com/tools/godep@latest
RUN godep version
CMD ["/bin/bash"]
2 changes: 1 addition & 1 deletion charts/OWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ reviewers:
- gjtempleton

labels:
- helm-charts
- area/helm-charts
4 changes: 2 additions & 2 deletions charts/cluster-autoscaler/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.28.2
appVersion: 1.29.0
description: Scales Kubernetes worker nodes within autoscaling groups.
engine: gotpl
home: https://github.com/kubernetes/autoscaler
Expand All @@ -11,4 +11,4 @@ name: cluster-autoscaler
sources:
- https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
type: application
version: 9.34.1
version: 9.36.0
23 changes: 19 additions & 4 deletions charts/cluster-autoscaler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ To create a valid configuration, follow instructions for your cloud provider:
- [Azure](#azure)
- [OpenStack Magnum](#openstack-magnum)
- [Cluster API](#cluster-api)
- [Exoscale](#exoscale)
- [Hetzner Cloud](#hetzner-cloud)

### Templating the autoDiscovery.clusterName

Expand Down Expand Up @@ -222,6 +224,7 @@ $ helm install my-release autoscaler/cluster-autoscaler -f myvalues.yaml
`cloudProvider: clusterapi` must be set, and then one or more of

- `autoDiscovery.clusterName`
- or `autoDiscovery.namespace`
- or `autoDiscovery.labels`

See [here](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/clusterapi/README.md#configuring-node-group-auto-discovery) for more details.
Expand Down Expand Up @@ -259,6 +262,18 @@ $ helm install my-release autoscaler/cluster-autoscaler \

Read [cluster-autoscaler/cloudprovider/exoscale/README.md](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/exoscale/README.md) for further information on the setup without helm.

### Hetzner Cloud

The following parameters are required:

- `cloudProvider=hetzner`
- `extraEnv.HCLOUD_TOKEN=...`
- `autoscalingGroups=...`

Each autoscaling group requires an additional `instanceType` and `region` key to be set.

Read [cluster-autoscaler/cloudprovider/hetzner/README.md](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/hetzner/README.md) for further information on the setup without helm.

## Uninstalling the Chart

To uninstall `my-release`:
Expand Down Expand Up @@ -373,17 +388,17 @@ vpa:
| affinity | object | `{}` | Affinity for pod assignment |
| autoDiscovery.clusterName | string | `nil` | Enable autodiscovery for `cloudProvider=aws`, for groups matching `autoDiscovery.tags`. autoDiscovery.clusterName -- Enable autodiscovery for `cloudProvider=azure`, using tags defined in https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/azure/README.md#auto-discovery-setup. Enable autodiscovery for `cloudProvider=clusterapi`, for groups matching `autoDiscovery.labels`. Enable autodiscovery for `cloudProvider=gce`, but no MIG tagging required. Enable autodiscovery for `cloudProvider=magnum`, for groups matching `autoDiscovery.roles`. |
| autoDiscovery.labels | list | `[]` | Cluster-API labels to match https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/clusterapi/README.md#configuring-node-group-auto-discovery |
| autoDiscovery.namespace | string | `nil` | Enable autodiscovery via cluster namespace for for `cloudProvider=clusterapi` |
| autoDiscovery.roles | list | `["worker"]` | Magnum node group roles to match. |
| autoDiscovery.tags | list | `["k8s.io/cluster-autoscaler/enabled","k8s.io/cluster-autoscaler/{{ .Values.autoDiscovery.clusterName }}"]` | ASG tags to match, run through `tpl`. |
| autoscalingGroups | list | `[]` | For AWS, Azure AKS or Magnum. At least one element is required if not using `autoDiscovery`. For example: <pre> - name: asg1<br /> maxSize: 2<br /> minSize: 1 </pre> |
| autoscalingGroups | list | `[]` | For AWS, Azure AKS or Magnum. At least one element is required if not using `autoDiscovery`. For example: <pre> - name: asg1<br /> maxSize: 2<br /> minSize: 1 </pre> For Hetzner Cloud, the `instanceType` and `region` keys are also required. <pre> - name: mypool<br /> maxSize: 2<br /> minSize: 1<br /> instanceType: CPX21<br /> region: FSN1 </pre> |
| autoscalingGroupsnamePrefix | list | `[]` | For GCE. At least one element is required if not using `autoDiscovery`. For example: <pre> - name: ig01<br /> maxSize: 10<br /> minSize: 0 </pre> |
| awsAccessKeyID | string | `""` | AWS access key ID ([if AWS user keys used](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md#using-aws-credentials)) |
| awsRegion | string | `"us-east-1"` | AWS region (required if `cloudProvider=aws`) |
| awsSecretAccessKey | string | `""` | AWS access secret key ([if AWS user keys used](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md#using-aws-credentials)) |
| azureClientID | string | `""` | Service Principal ClientID with contributor permission to Cluster and Node ResourceGroup. Required if `cloudProvider=azure` |
| azureClientSecret | string | `""` | Service Principal ClientSecret with contributor permission to Cluster and Node ResourceGroup. Required if `cloudProvider=azure` |
| azureClusterName | string | `""` | Azure AKS cluster name. Required if `cloudProvider=azure` |
| azureNodeResourceGroup | string | `""` | Azure resource group where the cluster's nodes are located, typically set as `MC_<cluster-resource-group-name>_<cluster-name>_<location>`. Required if `cloudProvider=azure` |
| azureEnableForceDelete | bool | `false` | Whether to force delete VMs or VMSS instances when scaling down. |
| azureResourceGroup | string | `""` | Azure resource group that the cluster is located. Required if `cloudProvider=azure` |
| azureSubscriptionID | string | `""` | Azure subscription where the resources are located. Required if `cloudProvider=azure` |
| azureTenantID | string | `""` | Azure tenant where the resources are located. Required if `cloudProvider=azure` |
Expand Down Expand Up @@ -415,7 +430,7 @@ vpa:
| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
| image.pullSecrets | list | `[]` | Image pull secrets |
| image.repository | string | `"registry.k8s.io/autoscaling/cluster-autoscaler"` | Image repository |
| image.tag | string | `"v1.28.2"` | Image tag |
| image.tag | string | `"v1.29.0"` | Image tag |
| kubeTargetVersionOverride | string | `""` | Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands. |
| kwokConfigMapName | string | `"kwok-provider-config"` | configmap for configuring kwok provider |
| magnumCABundlePath | string | `"/etc/kubernetes/ca-bundle.crt"` | Path to the host's CA bundle, from `ca-file` in the cloud-config file. |
Expand Down
15 changes: 15 additions & 0 deletions charts/cluster-autoscaler/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ To create a valid configuration, follow instructions for your cloud provider:
- [Azure](#azure)
- [OpenStack Magnum](#openstack-magnum)
- [Cluster API](#cluster-api)
- [Exoscale](#exoscale)
- [Hetzner Cloud](#hetzner-cloud)

### Templating the autoDiscovery.clusterName

Expand Down Expand Up @@ -222,6 +224,7 @@ $ helm install my-release autoscaler/cluster-autoscaler -f myvalues.yaml
`cloudProvider: clusterapi` must be set, and then one or more of

- `autoDiscovery.clusterName`
- or `autoDiscovery.namespace`
- or `autoDiscovery.labels`

See [here](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/clusterapi/README.md#configuring-node-group-auto-discovery) for more details.
Expand Down Expand Up @@ -259,6 +262,18 @@ $ helm install my-release autoscaler/cluster-autoscaler \

Read [cluster-autoscaler/cloudprovider/exoscale/README.md](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/exoscale/README.md) for further information on the setup without helm.

### Hetzner Cloud

The following parameters are required:

- `cloudProvider=hetzner`
- `extraEnv.HCLOUD_TOKEN=...`
- `autoscalingGroups=...`

Each autoscaling group requires an additional `instanceType` and `region` key to be set.

Read [cluster-autoscaler/cloudprovider/hetzner/README.md](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/hetzner/README.md) for further information on the setup without helm.

## Uninstalling the Chart

To uninstall `my-release`:
Expand Down
4 changes: 2 additions & 2 deletions charts/cluster-autoscaler/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if or .Values.autoDiscovery.clusterName .Values.autoscalingGroups -}}
{{- if or ( or .Values.autoDiscovery.clusterName .Values.autoDiscovery.namespace .Values.autoDiscovery.labels ) .Values.autoscalingGroups }}

To verify that cluster-autoscaler has started, run:

Expand All @@ -8,7 +8,7 @@ To verify that cluster-autoscaler has started, run:

##############################################################################
#### ERROR: You must specify values for either ####
#### autoDiscovery.clusterName or autoscalingGroups[] ####
#### autoDiscovery or autoscalingGroups[] ####
##############################################################################

The deployment and pod will not be created and the installation is not functional
Expand Down
48 changes: 38 additions & 10 deletions charts/cluster-autoscaler/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,11 @@ app.kubernetes.io/name: {{ include "cluster-autoscaler.name" . | quote }}


{{/*
Return labels, including instance, name and version.
Return labels, including instance and name.
*/}}
{{- define "cluster-autoscaler.labels" -}}
{{ include "cluster-autoscaler.instance-name" . }}
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
helm.sh/chart: {{ include "cluster-autoscaler.chart" . | quote }}
{{- if .Values.additionalLabels }}
{{ toYaml .Values.additionalLabels }}
Expand Down Expand Up @@ -112,21 +109,52 @@ Return true if the priority expander is enabled
{{- end -}}

{{/*
Return the autodiscoveryparameters for clusterapi.
autoDiscovery.clusterName for clusterapi.
*/}}
{{- define "cluster-autoscaler.capiAutodiscoveryConfig" -}}
{{- if .Values.autoDiscovery.clusterName -}}
{{- define "cluster-autoscaler.capiAutodiscovery.clusterName" -}}
{{- print "clusterName=" -}}{{ tpl (.Values.autoDiscovery.clusterName) . }}
{{- end -}}
{{- if and .Values.autoDiscovery.clusterName .Values.autoDiscovery.labels -}}
{{- print "," -}}

{{/*
autoDiscovery.namespace for clusterapi.
*/}}
{{- define "cluster-autoscaler.capiAutodiscovery.namespace" -}}
{{- print "namespace=" }}{{ .Values.autoDiscovery.namespace -}}
{{- end -}}
{{- if .Values.autoDiscovery.labels -}}

{{/*
autoDiscovery.labels for clusterapi.
*/}}
{{- define "cluster-autoscaler.capiAutodiscovery.labels" -}}
{{- range $i, $el := .Values.autoDiscovery.labels -}}
{{- if $i -}}{{- print "," -}}{{- end -}}
{{- range $key, $val := $el -}}
{{- $key -}}{{- print "=" -}}{{- $val -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Return the autodiscoveryparameters for clusterapi.
*/}}
{{- define "cluster-autoscaler.capiAutodiscoveryConfig" -}}
{{- if .Values.autoDiscovery.clusterName -}}
{{ include "cluster-autoscaler.capiAutodiscovery.clusterName" . }}
{{- if .Values.autoDiscovery.namespace }}
{{- print "," -}}
{{ include "cluster-autoscaler.capiAutodiscovery.namespace" . }}
{{- end -}}
{{- if .Values.autoDiscovery.labels }}
{{- print "," -}}
{{ include "cluster-autoscaler.capiAutodiscovery.labels" . }}
{{- end -}}
{{- else if .Values.autoDiscovery.namespace -}}
{{ include "cluster-autoscaler.capiAutodiscovery.namespace" . }}
{{- if .Values.autoDiscovery.labels }}
{{- print "," -}}
{{ include "cluster-autoscaler.capiAutodiscovery.labels" . }}
{{- end -}}
{{- else if .Values.autoDiscovery.labels -}}
{{ include "cluster-autoscaler.capiAutodiscovery.labels" . }}
{{- end -}}
{{- end -}}
10 changes: 8 additions & 2 deletions charts/cluster-autoscaler/templates/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if or ( or .Values.autoDiscovery.clusterName .Values.autoDiscovery.labels ) .Values.autoscalingGroups }}
{{- if or ( or .Values.autoDiscovery.clusterName .Values.autoDiscovery.namespace .Values.autoDiscovery.labels ) .Values.autoscalingGroups }}
{{/* one of the above is required */}}
apiVersion: {{ template "deployment.apiVersion" . }}
kind: Deployment
Expand Down Expand Up @@ -60,8 +60,12 @@ spec:
{{- end }}
{{- if .Values.autoscalingGroups }}
{{- range .Values.autoscalingGroups }}
{{- if eq $.Values.cloudProvider "hetzner" }}
- --nodes={{ .minSize }}:{{ .maxSize }}:{{ .instanceType }}:{{ .region }}:{{ .name }}
{{- else }}
- --nodes={{ .minSize }}:{{ .maxSize }}:{{ .name }}
{{- end }}
{{- end }}
{{- end }}
{{- if eq .Values.cloudProvider "rancher" }}
{{- if .Values.cloudConfigPath }}
Expand Down Expand Up @@ -95,7 +99,7 @@ spec:
- --cluster-name={{ tpl (.Values.magnumClusterName) . }}
{{- end }}
{{- else if eq .Values.cloudProvider "clusterapi" }}
{{- if or .Values.autoDiscovery.clusterName .Values.autoDiscovery.labels }}
{{- if or .Values.autoDiscovery.clusterName .Values.autoDiscovery.labels .Values.autoDiscovery.namepace }}
- --node-group-auto-discovery=clusterapi:{{ template "cluster-autoscaler.capiAutodiscoveryConfig" . }}
{{- end }}
{{- if eq .Values.clusterAPIMode "incluster-kubeconfig"}}
Expand Down Expand Up @@ -166,6 +170,8 @@ spec:
secretKeyRef:
key: VMType
name: {{ default (include "cluster-autoscaler.fullname" .) .Values.secretKeyRefNameOverride }}
- name: AZURE_ENABLE_FORCE_DELETE
value: "{{ .Values.azureEnableForceDelete }}"
{{- if .Values.azureUseWorkloadIdentityExtension }}
- name: ARM_USE_WORKLOAD_IDENTITY_EXTENSION
value: "true"
Expand Down
25 changes: 15 additions & 10 deletions charts/cluster-autoscaler/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ autoDiscovery:
# Enable autodiscovery for `cloudProvider=magnum`, for groups matching `autoDiscovery.roles`.
clusterName: # cluster.local

# autoDiscovery.namespace -- Enable autodiscovery via cluster namespace for for `cloudProvider=clusterapi`
namespace: # default

# autoDiscovery.tags -- ASG tags to match, run through `tpl`.
tags:
- k8s.io/cluster-autoscaler/enabled
Expand All @@ -36,6 +39,14 @@ autoDiscovery:
# maxSize: 2<br />
# minSize: 1
# </pre>
# For Hetzner Cloud, the `instanceType` and `region` keys are also required.
# <pre>
# - name: mypool<br />
# maxSize: 2<br />
# minSize: 1<br />
# instanceType: CPX21<br />
# region: FSN1
# </pre>
autoscalingGroups: []
# - name: asg1
# maxSize: 2
Expand Down Expand Up @@ -75,14 +86,6 @@ azureClientID: ""
# Required if `cloudProvider=azure`
azureClientSecret: ""

# azureClusterName -- Azure AKS cluster name.
# Required if `cloudProvider=azure`
azureClusterName: ""

# azureNodeResourceGroup -- Azure resource group where the cluster's nodes are located, typically set as `MC_<cluster-resource-group-name>_<cluster-name>_<location>`.
# Required if `cloudProvider=azure`
azureNodeResourceGroup: ""

# azureResourceGroup -- Azure resource group that the cluster is located.
# Required if `cloudProvider=azure`
azureResourceGroup: ""
Expand All @@ -104,6 +107,9 @@ azureUseWorkloadIdentityExtension: false
# azureVMType -- Azure VM type.
azureVMType: "vmss"

# azureEnableForceDelete -- Whether to force delete VMs or VMSS instances when scaling down.
azureEnableForceDelete: false

# cloudConfigPath -- Configuration file for cloud provider.
cloudConfigPath: ""

Expand Down Expand Up @@ -230,7 +236,7 @@ image:
# image.repository -- Image repository
repository: registry.k8s.io/autoscaling/cluster-autoscaler
# image.tag -- Image tag
tag: v1.28.2
tag: v1.29.0
# image.pullPolicy -- Image pull policy
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
Expand Down Expand Up @@ -375,7 +381,6 @@ serviceMonitor:
# serviceMonitor.metricRelabelings -- MetricRelabelConfigs to apply to samples before ingestion.
metricRelabelings: {}


# tolerations -- List of node taints to tolerate (requires Kubernetes >= 1.6).
tolerations: []

Expand Down
14 changes: 6 additions & 8 deletions cluster-autoscaler/.gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
cluster-autoscaler
cluster-autoscaler-amd64
cluster-autoscaler-arm64
cluster-autoscaler-s390x
cluster_autoscaler
main
.cover
/cluster-autoscaler
/cluster-autoscaler-amd64
/cluster-autoscaler-arm64
/cluster-autoscaler-s390x
/.cover

# Vim-related files
[._]*.s[a-w][a-z]
Expand All @@ -13,4 +11,4 @@ main
Session.vim
.netrwhist
.vscode
/integration/logs
./integration/logs
Loading

0 comments on commit e9e32f3

Please sign in to comment.