fix vnet in separate resource group #4191

nojnhuh · 2023-10-26T21:10:38Z

What type of PR is this?
/kind cleanup

What this PR does / why we need it:

This PR updates the custom vnet e2e test to use different resource groups for the vnet and the rest of the cluster resources. I was trying to test this same scenario for #3528 and was running into issues that didn't seem related, so I'd like to make sure this scenario works on main first.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

cherry-pick candidate

TODOs:

squashed commits
includes documentation
adds unit tests

Release note:

Fixed a bug where AzureCluster's spec.networkSpec.vnet.resourceGroup was not always properly honored

nojnhuh · 2023-10-26T21:11:11Z

/test pull-cluster-api-provider-azure-e2e-optional

azure/scope/cluster.go

nojnhuh · 2023-10-26T23:28:16Z

/test pull-cluster-api-provider-azure-e2e-optional

nojnhuh · 2023-10-27T16:38:36Z

This should be ready for review!

/retitle use different rg for vnet in custom vnet e2e test

codecov · 2023-10-27T16:56:38Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6987809) 57.86% compared to head (c6531c3) 57.99%.
Report is 30 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4191      +/-   ##
==========================================
+ Coverage   57.86%   57.99%   +0.12%     
==========================================
  Files         187      187              
  Lines       19216    19256      +40     
==========================================
+ Hits        11120    11168      +48     
+ Misses       7468     7458      -10     
- Partials      628      630       +2

Files	Coverage Δ
azure/scope/cluster.go	`60.88% <100.00%> (+0.80%)`	⬆️

... and 3 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

k8s-ci-robot · 2023-10-27T17:23:22Z

@nojnhuh: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-azure-conformance-ipv6-with-ci-artifacts	`c6531c3`	link	false	`/test pull-cluster-api-provider-azure-conformance-ipv6-with-ci-artifacts`
pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts	`c6531c3`	link	false	`/test pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

nojnhuh · 2023-10-27T18:01:33Z

/test pull-cluster-api-provider-azure-test

CecileRobertMichon · 2023-10-30T18:26:33Z

test/e2e/azure_test.go

@@ -155,6 +156,7 @@ var _ = Describe("Workload cluster creation", func() {
 				clusterName = getClusterName(clusterNamePrefix, "public-custom-vnet")
 				By("Creating a custom virtual network", func() {
 					Expect(os.Setenv(AzureCustomVNetName, "custom-vnet")).To(Succeed())
+					Expect(os.Setenv(AzureCustomVnetResourceGroup, clusterName+"-vnetrg")).To(Succeed())


is everything getting cleaned up as it should now that we're using a separate RG?

Not sure, but I'll check

Yep, I don't see any extra resource groups around after running the test locally.

nojnhuh · 2023-10-30T18:34:23Z

/test pull-cluster-api-provider-azure-e2e-optional

CecileRobertMichon

/lgtm
/approve

k8s-ci-robot · 2023-10-30T20:09:05Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon

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:

~~OWNERS~~ [CecileRobertMichon]

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 · 2023-10-30T20:09:05Z

LGTM label has been added.

Git tree hash: 2292c477e5f8ad41d78337af9525e0f5aef7bed4

nojnhuh · 2023-10-30T20:19:27Z

/cherry-pick release-1.11
/cherry-pick release-1.10

k8s-infra-cherrypick-robot · 2023-10-30T20:19:29Z

@nojnhuh: once the present PR merges, I will cherry-pick it on top of release-1.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.11
/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

nojnhuh · 2023-10-30T20:24:15Z

/retitle fix vnet in separate resource group
/release-note-edit

Fixed a bug where AzureCluster's spec.networkSpec.vnet.resourceGroup was not always properly honored

/remove-kind cleanup
/kind bug

k8s-infra-cherrypick-robot · 2023-10-30T23:12:35Z

@nojnhuh: new pull request created: #4205

In response to this:

/cherry-pick release-1.11
/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

k8s-infra-cherrypick-robot · 2023-10-30T23:13:10Z

@nojnhuh: new pull request created: #4207

In response to this:

/cherry-pick release-1.11
/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

nawazkh · 2023-10-31T21:43:27Z

lgtm++. Nice fix!

k8s-ci-robot requested review from jsturtevant and willie-yao October 26, 2023 21:10

nojnhuh commented Oct 26, 2023

View reviewed changes

azure/scope/cluster.go Show resolved Hide resolved

nojnhuh force-pushed the custom-vnet-rg branch from c44cd84 to a9a27a4 Compare October 26, 2023 23:27

use different rg for vnet in custom vnet e2e test

c6531c3

nojnhuh force-pushed the custom-vnet-rg branch from a9a27a4 to c6531c3 Compare October 27, 2023 16:37

k8s-ci-robot changed the title ~~[WIP] use different rg for vnet in custom vnet e2e test~~ use different rg for vnet in custom vnet e2e test Oct 27, 2023

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 27, 2023

CecileRobertMichon reviewed Oct 30, 2023

View reviewed changes

k8s-ci-robot assigned CecileRobertMichon Oct 30, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 30, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 30, 2023

k8s-ci-robot changed the title ~~use different rg for vnet in custom vnet e2e test~~ fix vnet in separate resource group Oct 30, 2023

k8s-ci-robot merged commit 72939d6 into kubernetes-sigs:main Oct 30, 2023
26 of 29 checks passed

k8s-ci-robot added this to the v1.12 milestone Oct 30, 2023

k8s-infra-cherrypick-robot mentioned this pull request Oct 30, 2023

[release-1.11] fix vnet in separate resource group #4205

Merged

k8s-infra-cherrypick-robot mentioned this pull request Oct 30, 2023

[release-1.10] fix vnet in separate resource group #4207

Merged

nojnhuh deleted the custom-vnet-rg branch October 30, 2023 23:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix vnet in separate resource group #4191

fix vnet in separate resource group #4191

nojnhuh commented Oct 26, 2023 •

edited by k8s-ci-robot

Loading

nojnhuh commented Oct 26, 2023

nojnhuh commented Oct 26, 2023

nojnhuh commented Oct 27, 2023

codecov bot commented Oct 27, 2023 •

edited

Loading

k8s-ci-robot commented Oct 27, 2023 •

edited

Loading

nojnhuh commented Oct 27, 2023

CecileRobertMichon Oct 30, 2023

nojnhuh Oct 30, 2023

nojnhuh Oct 30, 2023

nojnhuh commented Oct 30, 2023

CecileRobertMichon left a comment

k8s-ci-robot commented Oct 30, 2023

k8s-ci-robot commented Oct 30, 2023

nojnhuh commented Oct 30, 2023

k8s-infra-cherrypick-robot commented Oct 30, 2023

nojnhuh commented Oct 30, 2023

k8s-infra-cherrypick-robot commented Oct 30, 2023

k8s-infra-cherrypick-robot commented Oct 30, 2023

nawazkh commented Oct 31, 2023

fix vnet in separate resource group #4191

fix vnet in separate resource group #4191

Conversation

nojnhuh commented Oct 26, 2023 • edited by k8s-ci-robot Loading

nojnhuh commented Oct 26, 2023

nojnhuh commented Oct 26, 2023

nojnhuh commented Oct 27, 2023

codecov bot commented Oct 27, 2023 • edited Loading

Codecov Report

k8s-ci-robot commented Oct 27, 2023 • edited Loading

nojnhuh commented Oct 27, 2023

CecileRobertMichon Oct 30, 2023

Choose a reason for hiding this comment

nojnhuh Oct 30, 2023

Choose a reason for hiding this comment

nojnhuh Oct 30, 2023

Choose a reason for hiding this comment

nojnhuh commented Oct 30, 2023

CecileRobertMichon left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Oct 30, 2023

k8s-ci-robot commented Oct 30, 2023

nojnhuh commented Oct 30, 2023

k8s-infra-cherrypick-robot commented Oct 30, 2023

nojnhuh commented Oct 30, 2023

k8s-infra-cherrypick-robot commented Oct 30, 2023

k8s-infra-cherrypick-robot commented Oct 30, 2023

nawazkh commented Oct 31, 2023

nojnhuh commented Oct 26, 2023 •

edited by k8s-ci-robot

Loading

codecov bot commented Oct 27, 2023 •

edited

Loading

k8s-ci-robot commented Oct 27, 2023 •

edited

Loading