Sync with upstream `v1.29.4` #327

rishabh-11 · 2024-09-27T08:52:13Z

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #326

Special notes for your reviewer:
IT pass for AWS

Release note:

Synced with upstream v1.29.4

… to drainability rules

…ity rules

…lity Convert scale-down checks to drainability rules

Update ec2_instance_types with make generate

- HasNodeGroupStartedScaleUp checks wheter a scale up request exists without checking any upcoming nodes.

Add HasNodeGroupStartedScaleUp to cluster state registry.

jbartosik et al are transitioning off of workload autoscalers (incl vpa and addon-resizer). kwiesmueller is on the new team and has agreed to take on reviewer/approver responsibilities.

Add kwiesmueller to OWNERS

…-fix Add information about provisioning-class-name annotation.

Fix multiple run of informers created in fetcher.go

…on't create secret Signed-off-by: Jonathan Raymond <[email protected]>

Signed-off-by: Jonathan Raymond <[email protected]>

Add mechanism to override drainability status

Initialize default drainability rules

…scale from zero method via environment variable The architecture label in the build generic labels method of the cluster API (CAPI) provider is now populated using the GetDefaultScaleFromZeroArchitecture().Name() method. The method allows CAPI users deploying the cluster-autoscaler to define the default architecture to be used by the cluster-autoscaler for scale up from zero via the env var CAPI_SCALE_ZERO_DEFAULT_ARCH. Amd64 is kept as a fallback for historical reasons. The introduced changes will not take into account the case of nodes heterogeneous in architecture. The labels generation to infer properties like the cpu architecture from the node groups' features should be considered as a CAPI provider specific implementation.

CLAassistant · 2024-09-27T08:52:32Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 15 committers have signed the CLA.

✅ rishabh-11
❌ k8s-ci-robot
❌ MaciekPytel
❌ kdw174
❌ Silvest89
❌ gjtempleton
❌ vadasambar
❌ Shubham82
❌ BigDarkClown
❌ damikag
❌ maksim-paskal
❌ apricote
❌ wenxuan0923
❌ x13n
❌ kmsarabu
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

aaronfern

Looks good in general

In addition to the two changes asked, I have one question, and one more change

Do we not update SYNC-CHANGES with patch versions?
Can you please update the docstring of machine_cloud_provider.GetOptions to the new docstring here

cluster-autoscaler/cloudprovider/mcm/mcm_manager.go

aaronfern · 2024-10-02T18:06:41Z

cluster-autoscaler/main.go

-	// FORK-CHANGE: logging version of g/autoscaler as well
-	gardenerversion, err := os.ReadFile("VERSION")
-	if err != nil {
-		klog.Warningf("Error reading gardener autoscaler version, err: %s", err)
-	} else {
-		klog.V(1).Infof("Gardener Cluster Autoscaler %s", gardenerversion)
-	}
-


This is removed by error ig. Can you please re add this?

Did not remove it by mistake. There is no Version file anymore. So we can either add a version file and then reintroduce this or we can get rid of this.

I checked and it is working fine. It uses the VERSION file at the root of the repo, not the version dir. I have added this piece of code back

rishabh-11 · 2024-10-09T08:10:22Z

Do we not update SYNC-CHANGES with patch versions?

It is not needed IMO as the sync changes are for minor and not patch versions.

Can you please update the docstring of machine_cloud_provider.GetOptions to the new docstring here

The docstring is part of 1.30 and is also not present upstream. I think it is fine for us to keep it like this.

aaronfern · 2024-10-22T08:54:57Z

I think it is fine for us to keep it like this

Okay, fair enough for me then

aaronfern

Thanks for the changes
/lgtm

ROunofF and others added 30 commits October 10, 2023 19:29

Update with make generate

1fee557

Add pdb filtering to remainingPdbTracker

7cb08df

Convert replicated, system, not-safe-to-evict, and local storage pods…

125e9c1

… to drainability rules

Convert scale-down pdb check to drainability rule

d6ee96d

Pass DeleteOptions once during default rule creation

324a33e

Split out custom controller and common checks into separate drainabil…

2fa6c26

…ity rules

Filter out disabled drainability rules during creation

96e67ee

Refactor GetPodsForDeletion logic and tests into simulator

084264c

Fix custom controller drainability rule and add test coverage

9a7459c

Add unit test for long-terminating pod past grace period

33e300f

Merge pull request kubernetes#6164 from artemvmin/scale-down-drainabi…

133fdc7

…lity Convert scale-down checks to drainability rules

Removed node drainer, kept node termination handler

48b481b

Merge pull request kubernetes#6185 from ROunofF/master

5c65c39

Update ec2_instance_types with make generate

Add HasNodeGroupStartedScaleUp to cluster state registry.

833e4cb

- HasNodeGroupStartedScaleUp checks wheter a scale up request exists without checking any upcoming nodes.

Merge pull request kubernetes#6169 from hbostan/master

3065285

Add HasNodeGroupStartedScaleUp to cluster state registry.

Add kwiesmueller to OWNERS

f115964

jbartosik et al are transitioning off of workload autoscalers (incl vpa and addon-resizer). kwiesmueller is on the new team and has agreed to take on reviewer/approver responsibilities.

Merge pull request kubernetes#6198 from rsgowman/rsgowman/owners

3899147

Add kwiesmueller to OWNERS

Add information about provisioning-class-name annotation.

79c1ff4

Merge pull request kubernetes#6197 from kisieland/prov-req-annotation…

cc888a1

…-fix Add information about provisioning-class-name annotation.

Remove redundant if branch

e56c2d8

Merge pull request kubernetes#6157 from mikutas/6156-informer

dab41cc

Fix multiple run of informers created in fetcher.go

Add mechanism to override drainability status

87013c2

Log drainability override

a0d56b3

fix(cluster-autoscaler-chart): if secretKeyRefNameOverride is true, d…

3b70373

…on't create secret Signed-off-by: Jonathan Raymond <[email protected]>

fix: correct version bump

7e0b682

Signed-off-by: Jonathan Raymond <[email protected]>

Merge pull request kubernetes#6196 from artemvmin/drain-blocking-rule

a3a29cf

Add mechanism to override drainability status

Initialize default drainability rules

ab4c5cb

feat: each node pool can now have different init configs

e1408ed

Merge pull request kubernetes#6210 from artemvmin/set-drainability-rules

4103407

Initialize default drainability rules

adjust logs

348cfbb

rishabh-11 requested review from unmarshall and a team as code owners September 27, 2024 08:52

gardener-robot added the needs/review Needs review label Sep 27, 2024

gardener-robot added size/xl Size of pull request is huge (see gardener-robot robot/bots/size.py) needs/second-opinion Needs second review by someone else labels Sep 27, 2024

gardener-robot-ci-1 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Sep 27, 2024

gardener-robot-ci-3 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Sep 27, 2024

aaronfern requested changes Oct 2, 2024

View reviewed changes

gardener-robot added the needs/changes Needs (more) changes label Oct 2, 2024

gardener-robot-ci-2 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 7, 2024

rishabh-11 force-pushed the rel-v1.29 branch from e5dbbf3 to 348cfbb Compare October 21, 2024 05:34

gardener-robot-ci-3 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Oct 21, 2024

rishabh-11 requested a review from aaronfern October 21, 2024 10:35

aaronfern approved these changes Oct 22, 2024

View reviewed changes

gardener-robot added reviewed/lgtm Has approval for merging and removed needs/changes Needs (more) changes needs/review Needs review needs/second-opinion Needs second review by someone else labels Oct 22, 2024

gardener-robot-ci-3 added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Oct 22, 2024

rishabh-11 merged commit e16e855 into gardener:rel-v1.29 Oct 23, 2024
9 of 10 checks passed

gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Oct 23, 2024

rishabh-11 deleted the rel-v1.29 branch October 23, 2024 06:44

rishabh-11 restored the rel-v1.29 branch October 23, 2024 06:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync with upstream `v1.29.4` #327

Sync with upstream `v1.29.4` #327

rishabh-11 commented Sep 27, 2024 •

edited

Loading

CLAassistant commented Sep 27, 2024 •

edited

Loading

aaronfern left a comment

aaronfern Oct 2, 2024

rishabh-11 Oct 7, 2024

rishabh-11 Oct 21, 2024

rishabh-11 commented Oct 9, 2024

aaronfern commented Oct 22, 2024

aaronfern left a comment

Sync with upstream v1.29.4 #327

Sync with upstream v1.29.4 #327

Conversation

rishabh-11 commented Sep 27, 2024 • edited Loading

CLAassistant commented Sep 27, 2024 • edited Loading

aaronfern left a comment

Choose a reason for hiding this comment

aaronfern Oct 2, 2024

Choose a reason for hiding this comment

rishabh-11 Oct 7, 2024

Choose a reason for hiding this comment

rishabh-11 Oct 21, 2024

Choose a reason for hiding this comment

rishabh-11 commented Oct 9, 2024

aaronfern commented Oct 22, 2024

aaronfern left a comment

Choose a reason for hiding this comment

Sync with upstream `v1.29.4` #327

Sync with upstream `v1.29.4` #327

rishabh-11 commented Sep 27, 2024 •

edited

Loading

CLAassistant commented Sep 27, 2024 •

edited

Loading