Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix fallback for aws cloudprovider #4873

Merged
merged 2 commits into from
Jun 3, 2022
Merged

Fix fallback for aws cloudprovider #4873

merged 2 commits into from
Jun 3, 2022

Conversation

tzneal
Copy link
Contributor

@tzneal tzneal commented May 9, 2022

Which component this PR applies to?

cluster-autoscaler

What type of PR is this?

/kind bug

What this PR does / why we need it:

If instance type listing fails, the autoscaler would fail to work. This change modifies behavior so that it falls back
to the static list of instance types.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 9, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @tzneal!

It looks like this is your first PR to kubernetes/autoscaler 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/autoscaler has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 9, 2022
@jaypipes
Copy link
Contributor

jaypipes commented May 9, 2022

/assign @jaypipes

jaypipes
jaypipes reviewed May 9, 2022
View reviewed changes
Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @tzneal! Couple little comments inline but overall, looks good to me.

cluster-autoscaler/cloudprovider/aws/aws_cloud_provider_test.go Outdated
@@ -17,6 +17,8 @@ limitations under the License.
package aws

import (
"k8s.io/autoscaler/cluster-autoscaler/config"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: move this import to the block below for 3rd party/local imports...

cluster-autoscaler/cloudprovider/aws/aws_cloud_provider_test.go
Comment on lines +125 to +128
// This test ensures that no klog.Fatalf calls occur when constructing the AWS cloud provider. Specifically it is
// intended to ensure that instance type fallback works correctly in the event of an error enumerating instance
// types.
_ = BuildAWS(opts, do, resourceLimiter)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAICT, this test is only testing the happy path, though, right? If we passed in a non-existent AWS region, like "us-south-42", for instance, would that trigger an error being returned from GenerateEC2InstanceTypes and therefore trigger the fallback mechanism?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, I tested with no credentials set locally, I assumed there were no credentials in the test environment. I'll fix it.

tzneal added 2 commits May 9, 2022 14:28
@tzneal
fix instance type fallback
ccc3ce0 
Instead of logging a fatal error, log a standard error and fall back to
loading instance types from the static list.
@tzneal
fix variadic log messages
fde836c
@tzneal tzneal force-pushed the fix-fallback-for-aws-cloudprovider branch from 3dc6f39 to fde836c Compare May 9, 2022 19:28
jaypipes
jaypipes approved these changes May 9, 2022
View reviewed changes
Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks @tzneal! :)

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jaypipes, tzneal

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 9, 2022
@mwielgus mwielgus requested review from gjtempleton and removed request for aleksandra-malinowska May 12, 2022 11:58
@gjtempleton
Copy link
Member

Thanks for this @tzneal !
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 3, 2022
@k8s-ci-robot k8s-ci-robot merged commit 46d7964 into kubernetes:master Jun 3, 2022
@tzneal tzneal deleted the fix-fallback-for-aws-cloudprovider branch June 3, 2022 13:48
This was referenced Jun 4, 2022
Merged
Merged
Merged
navinjoy pushed a commit to navinjoy/autoscaler that referenced this pull request Oct 26, 2022
@k8s-ci-robot
Merge pull request kubernetes#4873 from tzneal/fix-fallback-for-aws-c…
cbca548 
…loudprovider

Fix fallback for aws cloudprovider
@tzneal tzneal mentioned this pull request Feb 10, 2023
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jaypipes jaypipes jaypipes approved these changes

@feiskyer feiskyer Awaiting requested review from feiskyer

@gjtempleton gjtempleton Awaiting requested review from gjtempleton

Assignees

@jaypipes jaypipes

@gjtempleton gjtempleton

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/cluster-autoscaler cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tzneal @k8s-ci-robot @jaypipes @gjtempleton @jbartosik