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.

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

Merge pull request #1656 from flix-tech/asg-tags-resource-override #25

Merged
merged 2 commits into from
Jan 10, 2020

Conversation

muaazsaleem
Copy link

Adding ability to override allocatable resources via ASG tags.

@muaazsaleem
Copy link
Author

👍

@muaazsaleem
Copy link
Author

@szuecs, this is a cherry-pick of kubernetes#1656 so not really "my" code

@mikkeloscar
Copy link

@muaazsaleem I think you cherry-picked the "wrong" commit which is the merge commit. It doesn't correctly attribute the original author. This would be the correct commit: kubernetes@f79a432

@muaazsaleem
Copy link
Author

@mikkeloscar thanks for the catch. Pushed the correct commit.

…ubernetes#1650

# Conflicts:
#	cluster-autoscaler/cloudprovider/aws/aws_manager.go
#	cluster-autoscaler/cloudprovider/aws/aws_manager_test.go
@muaazsaleem
Copy link
Author

👍

1 similar comment
@aermakov-zalando
Copy link

👍

@aermakov-zalando aermakov-zalando merged commit 9239415 into zalando-cluster-autoscaler-1-12 Jan 10, 2020
@aermakov-zalando aermakov-zalando deleted the ephemeral-storage branch January 10, 2020 12:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants