Bump CAPI with rebased contents by jeffwubj · Pull Request #3772 · vmware-tanzu/tanzu-framework

jeffwubj · 2022-10-27T08:36:06Z

What this PR does / why we need it

Which issue(s) this PR fixes

Fixes #
Bump Cluster API and providers, forked from #3699 with pipeline fix

Describe testing done for PR

upstream pipelines all passed
downstream install-azure, install-vc, multi-version vc passed
install-aws failed as expected, pipeline needs a re-work to align with new CAPA behaviour

Release note

Additional information

Special notes for your reviewer

jeffwubj · 2022-10-27T08:36:15Z

//usebom:sandbox/v1.7.0-zshippable/431703182511446831/tkg-compatibility:v12

github-actions · 2022-10-27T09:06:09Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3772/20221027090607/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

codecov · 2022-10-27T09:36:04Z

Codecov Report

Merging #3772 (006af5a) into main (485f0ce) will decrease coverage by 0.88%.
The diff coverage is 66.66%.

@@            Coverage Diff             @@
##             main    #3772      +/-   ##
==========================================
- Coverage   46.58%   45.69%   -0.89%     
==========================================
  Files         400      425      +25     
  Lines       39722    41278    +1556     
==========================================
+ Hits        18504    18863     +359     
- Misses      19519    20700    +1181     
- Partials     1699     1715      +16

Impacted Files	Coverage Δ
tkg/client/init.go	`0.00% <0.00%> (ø)`
tkg/client/machine_deployment.go	`61.86% <ø> (ø)`
tkg/client/upgrade_cluster.go	`44.62% <66.66%> (ø)`
tkg/clusterclient/clusterclient.go	`49.34% <85.71%> (ø)`
cmd/cli/plugin/cluster/scale.go	`17.85% <0.00%> (ø)`
cmd/cli/plugin/cluster/delete_node_pool.go	`16.66% <0.00%> (ø)`
.../cli/plugin/cluster/set_machinehealthcheck_node.go	`23.33% <0.00%> (ø)`
cmd/cli/plugin/cluster/set_node_pool.go	`14.63% <0.00%> (ø)`
cmd/cli/plugin/cluster/list.go	`9.52% <0.00%> (ø)`
cmd/cli/plugin/cluster/delete.go	`12.50% <0.00%> (ø)`
... and 20 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

wjun

LGTM!

Signed-off-by: Sagar Muchhal <[email protected]>

Signed-off-by: Ashutosh Kumar <[email protected]>

This patch changes the overlays to include the customization of the subnets for cluster creation only when using a custom VPC. The overlays now check for the presence of the VPC ID and the public/private subnet ID, before including those blocks for cluster YAML creation. Since, the public/private subnets can be used only when using a custom VPC. Otherwise we leave the AWSCluster.spec.network.subnets slice empty and let CAPA handle the creation of the resources. Signed-off-by: Sagar Muchhal <[email protected]>

github-actions · 2022-10-28T06:43:49Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3772/20221028064346/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2022-10-28T06:49:48Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3772/20221028064945/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2022-10-28T12:06:59Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3772/20221028120658/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

github-actions · 2022-10-28T12:49:49Z

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3772/20221028124948/clustergen.diff.txt
Author/reviewers:
Please review to verify that the effects on the generated cluster configurations are exactly what the PR intended, and give a thumbs-up if so.

* Bump CAPI to v1.2.3 * Bump CAPA to v2.0.0-beta.1 (v1beta2) * Bump CAPV to v1.4.1 Signed-off-by: Sagar Muchhal <[email protected]> * update go modules * bump capz to v1.5.2 Signed-off-by: Ashutosh Kumar <[email protected]> * update CAPI yamls to v1.2.4 * update CAPI go deps to v1.2.4 * bump capz to v1.5.3 Signed-off-by: Ashutosh Kumar <[email protected]> * fix packages * update UT with new aws IAM * modify AWS provider * rename provider of aws and vsphere to pickup changes * revert folder name back to latest ones * Fixes custom AWS VPC configuration This patch changes the overlays to include the customization of the subnets for cluster creation only when using a custom VPC. The overlays now check for the presence of the VPC ID and the public/private subnet ID, before including those blocks for cluster YAML creation. Since, the public/private subnets can be used only when using a custom VPC. Otherwise we leave the AWSCluster.spec.network.subnets slice empty and let CAPA handle the creation of the resources. Signed-off-by: Sagar Muchhal <[email protected]> * update go.mod and go.sum after rebase Signed-off-by: Sagar Muchhal <[email protected]> Signed-off-by: Ashutosh Kumar <[email protected]> Co-authored-by: Yuvaraj Kakaraparthi <[email protected]> Co-authored-by: Sedef Savas <[email protected]> Co-authored-by: Sagar Muchhal <[email protected]> Co-authored-by: Ashutosh Kumar <[email protected]>

vuil · 2022-10-31T20:59:12Z

@jeffwubj please follow the PR template and provide some details on what the change is about, what tests were run, etc.
Not sure if it is just temporary, but looks like this change broke some workflows on main.

jeffwubj · 2022-11-01T02:06:35Z

@jeffwubj please follow the PR template and provide some details on what the change is about, what tests were run, etc. Not sure if it is just temporary, but looks like this change broke some workflows on main.

hi @vuil : description updated. this is not temporary but the CAP* bump PR, I have re-run all tests in #3604 to see the latest status, seems all pipelines are still passed, feel free to let me know if anything has been found

jeffwubj requested a review from a team as a code owner October 27, 2022 08:36

jeffwubj requested a review from a team October 27, 2022 08:36

jeffwubj requested a review from prkalle as a code owner October 27, 2022 08:36

jeffwubj requested review from a team October 27, 2022 08:36

jeffwubj requested a review from a team as a code owner October 27, 2022 08:36

vmwclabot added the cla-not-required label Oct 27, 2022

jeffwubj force-pushed the topic/jeffwubj/bump-capi-and-providers-rebased branch from 5ac0f1e to 3fab37c Compare October 27, 2022 08:49

wjun approved these changes Oct 27, 2022

View reviewed changes

wjun added the ok-to-merge PRs should be labelled with this before merging label Oct 27, 2022

Yuvaraj Kakaraparthi and others added 14 commits October 28, 2022 06:18

Bump CAPI to v1.2.3

f73161c

Bump CAPA to v2.0.0-beta.1 (v1beta2)

b7f97f4

Bump CAPV to v1.4.1

c245721

Signed-off-by: Sagar Muchhal <[email protected]>

update go modules

fcb92d5

bump capz to v1.5.2

7a2b405

Signed-off-by: Ashutosh Kumar <[email protected]>

update CAPI yamls to v1.2.4

5d46e50

update CAPI go deps to v1.2.4

6ee02dc

bump capz to v1.5.3

228b1a4

Signed-off-by: Ashutosh Kumar <[email protected]>

fix packages

ebae96c

update UT with new aws IAM

6e6a4f8

modify AWS provider

e8eeda9

rename provider of aws and vsphere to pickup changes

5d9b68f

revert folder name back to latest ones

2fac9e2

jeffwubj force-pushed the topic/jeffwubj/bump-capi-and-providers-rebased branch from 3fab37c to 80b89f4 Compare October 28, 2022 06:28

jeffwubj force-pushed the topic/jeffwubj/bump-capi-and-providers-rebased branch from 3d86c51 to 6285a86 Compare October 28, 2022 11:57

update go.mod and go.sum after rebase

006af5a

jeffwubj force-pushed the topic/jeffwubj/bump-capi-and-providers-rebased branch from 6285a86 to 006af5a Compare October 28, 2022 12:36

jeffwubj merged commit f0091f7 into main Oct 31, 2022

jeffwubj deleted the topic/jeffwubj/bump-capi-and-providers-rebased branch October 31, 2022 10:18

jeffwubj restored the topic/jeffwubj/bump-capi-and-providers-rebased branch October 31, 2022 10:18

jeffwubj deleted the topic/jeffwubj/bump-capi-and-providers-rebased branch November 4, 2022 01:55

marckhouzam mentioned this pull request Nov 4, 2022

Bump Cobra from 1.5.0 to 1.6.1 #3695

Closed

ykakarap mentioned this pull request Nov 7, 2022

Bump Cluster API and providers #3699

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump CAPI with rebased contents#3772

Bump CAPI with rebased contents#3772
jeffwubj merged 15 commits intomainfrom
topic/jeffwubj/bump-capi-and-providers-rebased

jeffwubj commented Oct 27, 2022 •

edited

Loading

Uh oh!

jeffwubj commented Oct 27, 2022

Uh oh!

github-actions Bot commented Oct 27, 2022

Uh oh!

codecov Bot commented Oct 27, 2022 •

edited

Loading

Uh oh!

wjun left a comment

Uh oh!

github-actions Bot commented Oct 28, 2022

Uh oh!

github-actions Bot commented Oct 28, 2022

Uh oh!

github-actions Bot commented Oct 28, 2022

Uh oh!

github-actions Bot commented Oct 28, 2022

Uh oh!

vuil commented Oct 31, 2022

Uh oh!

jeffwubj commented Nov 1, 2022 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

jeffwubj commented Oct 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What this PR does / why we need it

Which issue(s) this PR fixes

Describe testing done for PR

Release note

Additional information

Special notes for your reviewer

Uh oh!

jeffwubj commented Oct 27, 2022

Uh oh!

github-actions Bot commented Oct 27, 2022

Uh oh!

codecov Bot commented Oct 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

wjun left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Oct 28, 2022

Uh oh!

github-actions Bot commented Oct 28, 2022

Uh oh!

github-actions Bot commented Oct 28, 2022

Uh oh!

github-actions Bot commented Oct 28, 2022

Uh oh!

vuil commented Oct 31, 2022

Uh oh!

jeffwubj commented Nov 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

jeffwubj commented Oct 27, 2022 •

edited

Loading

codecov Bot commented Oct 27, 2022 •

edited

Loading

jeffwubj commented Nov 1, 2022 •

edited

Loading