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

fix: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior #1562

Conversation

Aurelian-Shuttleworth
Copy link
Contributor

Changes introduced in feat: add nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts when using total limits.

Currently, google_container_node_pool resource states that total and per zone limits can't be used together.

To address this issue and maintain the current behaviour where min and max values for a node pool are set by default, this fix strays from standard behaviour where the value is set to null. Please advise if this is acceptable.
If this is not, I have prepared a second fix where the values are nulled. fix: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Change default behavior to null

@apeabody
Copy link
Collaborator

apeabody commented Feb 9, 2023

/gcbrun

@Aurelian-Shuttleworth
Copy link
Contributor Author

@apeabody Can you share the results of the terraform-google-kubernetes-engine-int-trigger test?

thank you ^_^

@apeabody
Copy link
Collaborator

apeabody commented Feb 9, 2023

@apeabody Can you share the results of the terraform-google-kubernetes-engine-int-trigger test?

thank you ^_^

It was a timeout, I re-triggered as it could be transient.

@ericyz
Copy link
Collaborator

ericyz commented Feb 12, 2023

/gcbrun

1 similar comment
@ericyz
Copy link
Collaborator

ericyz commented Feb 13, 2023

/gcbrun

@Aurelian-Shuttleworth
Copy link
Contributor Author

@ericyz can you check if the check failed due to timeout again or if an issue has poped up?

Thank you.

@ericyz
Copy link
Collaborator

ericyz commented Feb 15, 2023

/gcbrun

@ericyz
Copy link
Collaborator

ericyz commented Feb 15, 2023

It timed out. I re-triggered it and will post any error logs.

@ericyz
Copy link
Collaborator

ericyz commented Feb 15, 2023

/gcbrun

@Aurelian-Shuttleworth
Copy link
Contributor Author

@ericyz and @apeabody, can either of you advise me on how I should handle rebases more effectively?

I have noticed every time I need to rebase on the default branch, /gcbrun needs to be run and often, due to timeouts and permissions, a new rebase needed by the time /gcbrun can return a pass.

Please let me know if I can do anything to make the PR process easier for both of you ^_^

@apeabody
Copy link
Collaborator

/gcbrun

1 similar comment
@ericyz
Copy link
Collaborator

ericyz commented Feb 16, 2023

/gcbrun

ericyz
ericyz previously approved these changes Feb 17, 2023
@ericyz
Copy link
Collaborator

ericyz commented Feb 17, 2023

/gcbrun

@ericyz ericyz dismissed their stale review February 17, 2023 22:10

Sorry, looked at wrong PR and will approve after review

@ericyz
Copy link
Collaborator

ericyz commented Feb 18, 2023

/gcbrun

1 similar comment
@ericyz
Copy link
Collaborator

ericyz commented Feb 18, 2023

/gcbrun

@ericyz
Copy link
Collaborator

ericyz commented Feb 18, 2023

Hi @Aurelian-Shuttleworth , thanks for your contribution.

@ericyz
Copy link
Collaborator

ericyz commented Feb 18, 2023

/gcbrun

@ericyz ericyz changed the title fix: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior !fix: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior Feb 18, 2023
@ericyz
Copy link
Collaborator

ericyz commented Feb 18, 2023

@Aurelian-Shuttleworth - I prefer to setting to null like the second fix you proposed. We would like to minimise the logic handling the conflict properties and surface the error when users set both min_count and total_min_count.

@bharathkkb - We can include this change as an break change. Do you see other implications on this?

@ericyz ericyz changed the title !fix: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior BREAKING CHANGE: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior Feb 18, 2023
@ericyz
Copy link
Collaborator

ericyz commented Feb 18, 2023

/gcbrun

@ericyz ericyz changed the title BREAKING CHANGE: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior fix!: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior Feb 18, 2023
@Aurelian-Shuttleworth
Copy link
Contributor Author

@ericyz I figured that would be the presence ^_^

I will look at the tests and what can be updated in my alternative PR.

@Aurelian-Shuttleworth
Copy link
Contributor Author

@ericyz Having a look around the test suite, I can only test changes by spinning it up, and I can't afford the cloud costs at the moment.

I believe all that needs to be done to allow my other PR to succeed is to add the node pool settings that would otherwise be set by the default variable values.

Can one of the code maintainers add those values and confirm?

@ericyz
Copy link
Collaborator

ericyz commented Feb 20, 2023

Hi @Aurelian-Shuttleworth , your understanding is correct, but please hold for a moment. I will confirm the direction and get back to you

@ericyz ericyz changed the title fix!: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior fix: nodepool autoscaling vars avail in GKE 1.24.1 result in conflicts. Preserve default behavior Feb 22, 2023
@ericyz ericyz self-assigned this Feb 22, 2023
Copy link
Collaborator

@ericyz ericyz left a comment

Choose a reason for hiding this comment

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

LGTM

@ericyz
Copy link
Collaborator

ericyz commented Feb 22, 2023

Hi @Aurelian-Shuttleworth , please raise another PR for your alternative suggested solution if you are alright. We will include it in the next breaking release. I can help you on the test cases

@ericyz
Copy link
Collaborator

ericyz commented Feb 22, 2023

@apeabody - could you please peer review and merged when ready? Thank you

@apeabody
Copy link
Collaborator

@ericyz and @apeabody, can either of you advise me on how I should handle rebases more effectively?

I have noticed every time I need to rebase on the default branch, /gcbrun needs to be run and often, due to timeouts and permissions, a new rebase needed by the time /gcbrun can return a pass.

Please let me know if I can do anything to make the PR process easier for both of you ^_^

Thanks @Aurelian-Shuttleworth - Unfortunately at this time one of us will need to add a /gcbrun after each commit to trigger the CI.

@apeabody apeabody self-assigned this Feb 22, 2023
Copy link
Collaborator

@apeabody apeabody left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution @Aurelian-Shuttleworth!

@apeabody
Copy link
Collaborator

The INT failure appears unrelated, but we'll need to get it to clear.

@bharathkkb bharathkkb merged commit 98e8dc3 into terraform-google-modules:master Feb 23, 2023
CPL-markus pushed a commit to WALTER-GROUP/terraform-google-kubernetes-engine that referenced this pull request Jul 15, 2024
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