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

Allow node_pool and enable_autopilot together for custom service account and oauth scopes #6611

Closed

Conversation

modax
Copy link

@modax modax commented Sep 28, 2022

Reverts #4894 for node_config and implements workaround in a similar fashion for google_container_cluster node_pool attribute

Fixes hashicorp/terraform-provider-google#9505

I was unable to run acceptance tests. As of current base commit, linter was only complaining about files I did not modify.

If this PR is for Terraform, I acknowledge that I have:

  • Searched through the issue tracker for an open issue that this either resolves or contributes to, commented on it to claim it, and written "fixes {url}" or "part of {url}" in this PR description. If there were no relevant open issues, I opened one and commented that I would like to work on it (not necessary for very small changes).
  • Generated Terraform, and ran make test and make lint to ensure it passes unit and linter tests.
  • Ensured that all new fields I added that can be set by a user appear in at least one example (for generated resources) or third_party test (for handwritten resources or update tests).
  • Ran relevant acceptance tests (If the acceptance tests do not yet pass or you are unable to run them, please let your reviewer know).
  • Read the Release Notes Guide before writing my release note below.

Release Note Template for Downstream PRs (will be copied)

container: allowed setting `node_pool.node_config.service_account` and `node_pool.node_config.oauth_scopes` at the same time as `enable_autopilot = true` for `google_container_cluster`. Respectively disallowed `node_config` as it does not work.

This allows to specify custom service account and oauth scopes for
Autopilot clusters
@google-cla
Copy link

google-cla bot commented Sep 28, 2022

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@modular-magician
Copy link
Collaborator

Hello! I am a robot who works on Magic Modules PRs.

I've detected that you're a community contributor. @melinath, a repository maintainer, has been assigned to assist you and help review your changes.

❓ First time contributing? Click here for more details

Your assigned reviewer will help review your code by:

  • Ensuring it's backwards compatible, covers common error cases, etc.
  • Summarizing the change into a user-facing changelog note.
  • Passes tests, either our "VCR" suite, a set of presubmit tests, or with manual test runs.

You can help make sure that review is quick by running local tests and ensuring they're passing in between each push you make to your PR's branch. Also, try to leave a comment with each push you make, as pushes generally don't generate emails.

If your reviewer doesn't get back to you within a week after your most recent change, please feel free to leave a comment on the issue asking them to take a look! In the absence of a dedicated review dashboard most maintainers manage their pending reviews through email, and those will sometimes get lost in their inbox.


@modular-magician
Copy link
Collaborator

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform GA: Diff ( 2 files changed, 20 insertions(+), 2 deletions(-))
Terraform Beta: Diff ( 2 files changed, 20 insertions(+), 2 deletions(-))
TF Validator: Diff ( 2 files changed, 3 insertions(+), 3 deletions(-))

@modular-magician
Copy link
Collaborator

Tests analytics

Total tests: 2183
Passed tests 1943
Skipped tests: 239
Failed tests: 1

Action taken

Triggering VCR tests in RECORDING mode for the tests that failed during VCR. Click here to see the failed tests
TestAccComputeInstance_soleTenantNodeAffinities

@modular-magician
Copy link
Collaborator

Tests failed during RECORDING mode:
TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]

Please fix these to complete your PR
View the build log or the debug log for each test

@modax
Copy link
Author

modax commented Sep 28, 2022

Tests failed during RECORDING mode: TestAccComputeInstance_soleTenantNodeAffinities[Error message] [Debug log]

Please fix these to complete your PR View the build log or the debug log for each test

I did not touch any code related to this test. Maybe some accidental flake? I will sign CLA as soon as you confirm this PR might get merged eventually

Copy link
Member

@melinath melinath left a comment

Choose a reason for hiding this comment

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

TestAccComputeInstance_soleTenantNodeAffinities is currently failing on all PRs; however, because container cluster and the related node resources are fairly complicated, you will definitely need to (at a minimum) add a test to make sure that the proposed config actually works.

I don't see any particular reason this wouldn't be merged at this time.

@modax
Copy link
Author

modax commented Sep 29, 2022

TestAccComputeInstance_soleTenantNodeAffinities is currently failing on all PRs; however, because container cluster and the related node resources are fairly complicated, you will definitely need to (at a minimum) add a test to make sure that the proposed config actually works.

Sure, I will try to implement a test soon and come back.

I don't see any particular reason this wouldn't be merged at this time.

Great, thanks!

@@ -1064,8 +1066,7 @@ func resourceContainerCluster() *schema.Resource {
Elem: &schema.Resource{
Schema: schemaNodePool,
},
Description: `List of node pools associated with this cluster. See google_container_node_pool for schema. Warning: node pools defined inside a cluster can't be changed (or added/removed) after cluster creation without deleting and recreating the entire cluster. Unless you absolutely need the ability to say "these are the only node pools associated with this cluster", use the google_container_node_pool resource instead of this property.`,
ConflictsWith: []string{"enable_autopilot"},
Copy link
Member

Choose a reason for hiding this comment

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

This is not really how we have to do this. The right field to use is cluster_autoscaling.auto_provisioning_defaults.service_account

Copy link
Author

Choose a reason for hiding this comment

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

Ok, fair enough. Closing this PR in the hopes of #6733 being merged eventually

@modax
Copy link
Author

modax commented Oct 22, 2022

As written above, closing this PR in the hopes of #6733 being merged eventually

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants