Skip to content
This repository has been archived by the owner on Oct 10, 2023. It is now read-only.

Support prodcc plan on vSphere classy cluster #3605

Merged
merged 6 commits into from
Oct 21, 2022
Merged

Support prodcc plan on vSphere classy cluster #3605

merged 6 commits into from
Oct 21, 2022

Conversation

ydp
Copy link

@ydp ydp commented Oct 10, 2022 •
edited
Loading

What this PR does / why we need it

  • The overlay in pkg/v1/providers/infrastructure-vsphere/yttcc/vsphere-overlay.yaml miss run.tanzu.vmware.com/resolve-os-image annotation and is duplicate with overlay in pkg/v1/providers/infrastructure-vsphere/v1.3.1/yttcc/overlay.yaml. Missing run.tanzu.vmware.com/resolve-os-image annotation will cause tkr/os-image resolve error, adding it will make it duplicate with existing overlay, so just remove it. The data.values.WORKER_MACHINE_COUNT_0 logic is moved to pkg/v1/providers/infrastructure-vsphere/v1.3.1/yttcc/overlay.yaml.
  • Set default control plane machine count and worker machine count when its variable is not set in CC mode
  • Install kapp-controller right after control plane is available (means API server is ready to receive requests), because control plane scaling up depends on CPI setting providerID for node, and CPI can only be installed after kapp-controller is installed, so the kapp-controller needs to be deployed as soon as API Server is available to speed up the cluster creation process. This only affects management cluster creation, since addon-controller will install kapp-controller for workload cluster after its control plane is available.
  • Distribute md workers for vSphere to keep consistent with AWS/Azure and also legacy mode
  • Added a function to check whether current plan is prod

Which issue(s) this PR fixes

Fixes #3601
Fixes #3701

Describe testing done for PR

Manual create vSphere classy cluster with prodcc plan, for both management and workload cluster.

Release note

Support prodcc plan on vSphere classy cluster

Additional information

Special notes for your reviewer

@ydp ydp requested review from a team as code owners October 10, 2022 11:36
@github-actions
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221010114725/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
Copy link

codecov bot commented Oct 10, 2022 •
edited
Loading

Codecov Report

Merging #3605 (04bca92) into main (0f0df6f) will decrease coverage by 0.88%.
The diff coverage is 46.93%.

@@            Coverage Diff             @@
##             main    #3605      +/-   ##
==========================================
- Coverage   46.22%   45.33%   -0.89%     
==========================================
  Files         400      425      +25     
  Lines       39620    41198    +1578     
==========================================
+ Hits        18316    18679     +363     
- Misses      19617    20812    +1195     
- Partials     1687     1707      +20
Impacted Files Coverage Δ
tkg/client/init.go 0.00% <0.00%> (ø)
tkg/tkgctl/create_cluster.go 60.36% <0.00%> (ø)
tkg/client/validate.go 58.67% <41.66%> (+0.18%) ⬆️
tkg/client/cluster.go 14.14% <44.44%> (+0.51%) ⬆️
tkg/client/utils.go 36.10% <100.00%> (+0.31%) ⬆️
tkg/clusterclient/clusterclient.go 48.79% <100.00%> (+0.48%) ⬆️
addons/controllers/clusterbootstrap_controller.go 63.26% <0.00%> (-1.61%) ⬇️
cmd/cli/plugin/cluster/get_node_pools.go 10.52% <0.00%> (ø)
cmd/cli/plugin/cluster/get_machinehealthcheck.go 11.42% <0.00%> (ø)
... and 28 more

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

@ydp ydp force-pushed the topic/dingpingy/prodcc_overlay branch from c524119 to 6145049 Compare October 11, 2022 03:38
@github-actions
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221011034927/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
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221011125031/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.

@ydp ydp force-pushed the topic/dingpingy/prodcc_overlay branch from 763262b to 0c7e9c0 Compare October 15, 2022 04:28
@github-actions
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221015044133/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
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221019082455/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.

@ydp ydp force-pushed the topic/dingpingy/prodcc_overlay branch from 298d123 to 07044ca Compare October 19, 2022 13:58
@github-actions
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221019140750/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.

@ydp ydp changed the title Remove incorrect and duplicate worker overlay in prodcc plan for CC vSphere Support prodcc plan on cc vSphere Oct 19, 2022
@ydp ydp changed the title Support prodcc plan on cc vSphere Support prodcc plan on vSphere classy cluster Oct 19, 2022
@ydp ydp force-pushed the topic/dingpingy/prodcc_overlay branch from 07044ca to b11bba9 Compare October 20, 2022 00:58
@github-actions
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221020010742/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
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221020045341/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.

@ydp ydp force-pushed the topic/dingpingy/prodcc_overlay branch from 2e6620b to f1202d3 Compare October 20, 2022 06:15
@github-actions
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221020062329/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.

@ydp ydp force-pushed the topic/dingpingy/prodcc_overlay branch from f1202d3 to 2a6608e Compare October 20, 2022 09:26
@github-actions
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221020093542/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
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221021043320/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.

@ydp ydp force-pushed the topic/dingpingy/prodcc_overlay branch from 65b48e7 to 04bca92 Compare October 21, 2022 04:54
@github-actions
Copy link

Cluster Generation A/B Results:
https://storage.googleapis.com/tkg-clustergen/3605/20221021050144/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.

@wjun wjun added the ok-to-merge PRs should be labelled with this before merging label Oct 21, 2022
wjun
wjun approved these changes Oct 21, 2022
View reviewed changes
Copy link
Contributor

@wjun wjun left a comment

Choose a reason for hiding this comment

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

LGTM.

@wjun wjun merged commit 863aba1 into main Oct 21, 2022
@wjun wjun deleted the topic/dingpingy/prodcc_overlay branch October 21, 2022 10:59
lubronzhan pushed a commit to lubronzhan/tanzu-framework that referenced this pull request Oct 21, 2022
@lubronzhan
Support prodcc plan on vSphere classy cluster (vmware-tanzu#3605)
3fd19c1 
Remove incorrect and duplicate worker overlay in prodcc plan for CC vSphere
Set default count for prodcc
Install kapp-controller in mgmt cluster once control plane is available
Distribute md workers for vSphere
Fix test case and retry message
Change the expected nodes number to 6 when prod plan
jeffwubj pushed a commit that referenced this pull request Oct 24, 2022
@jeffwubj
Support prodcc plan on vSphere classy cluster (#3605)
acf9ac3 
Remove incorrect and duplicate worker overlay in prodcc plan for CC vSphere
Set default count for prodcc
Install kapp-controller in mgmt cluster once control plane is available
Distribute md workers for vSphere
Fix test case and retry message
Change the expected nodes number to 6 when prod plan
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@wjun wjun wjun approved these changes

@DanielXiao DanielXiao DanielXiao approved these changes

Assignees
No one assigned
Labels
cla-not-required ok-to-merge PRs should be labelled with this before merging
Projects
None yet
Milestone
No milestone
4 participants
@ydp @wjun @DanielXiao @vmwclabot