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.

Sign up for GitHub

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

Jump to bottom

🌱 Supervisor flavorgen and templates #2789

Merged
merged 2 commits into from
Mar 4, 2024
Merged

🌱 Supervisor flavorgen and templates #2789

merged 2 commits into from
Mar 4, 2024

Conversation

fabriziopandini
Copy link
Member

What this PR does / why we need it:
Add supervisor templates to flavor gen and E2E tests

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 4, 2024
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 4, 2024
@codecov Codecov
Copy link

codecov bot commented Mar 4, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.92%. Comparing base (9182e0c) to head (9e14d0f).
Report is 10 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2789      +/-   ##
==========================================
- Coverage   64.04%   63.92%   -0.12%     
==========================================
  Files         160      160              
  Lines        9345     9345              
==========================================
- Hits         5985     5974      -11     
- Misses       2903     2912       +9     
- Partials      457      459       +2

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

chrischdi
chrischdi reviewed Mar 4, 2024
View reviewed changes
Makefile Outdated Show resolved Hide resolved
chrischdi
chrischdi reviewed Mar 4, 2024
View reviewed changes
packaging/flavorgen/flavors/env/envsubts_consts.go
WorkerMachineCountVar = "${WORKER_MACHINE_COUNT}"
ControlPlaneEndpointHostVar = "${CONTROL_PLANE_ENDPOINT_IP}"
ControlPlaneEndpointPortVar = "${CONTROL_PLANE_ENDPOINT_PORT:=6443}"
VSphereMachineClassImageVar = "${VSPHERE_IMAGE_NAME}"
Copy link
Member

Choose a reason for hiding this comment

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

Wondering about what's different from VSPHERE_TEMPLATE to VSPHERE_IMAGE_NAME :think:

Copy link
Member Author

@fabriziopandini fabriziopandini Mar 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Based on my understanding, the first one is an actual VM template (a well defined construct in vCenter), the other is "just a file" in a content library that happens to be an image

test/e2e/data/infrastructure-vsphere-supervisor/main/commons/cluster-network-CIDR.yaml
@@ -0,0 +1,10 @@
apiVersion: cluster.x-k8s.io/v1beta1
Copy link
Member

Choose a reason for hiding this comment

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

Wondering if we could keep a commons directory for both (govmomi and supervisor) 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

I think we should avoid this optimization at this stage and prefer a clean directory structure.
We can eventually revisit this later when tests are working and possibly already stable

@fabriziopandini fabriziopandini force-pushed the supervisor-flavorgen-and-templates branch from 89d44e1 to a4124e8 Compare March 4, 2024 14:50
@fabriziopandini fabriziopandini force-pushed the supervisor-flavorgen-and-templates branch from a4124e8 to 9e14d0f Compare March 4, 2024 15:11
chrischdi
chrischdi reviewed Mar 4, 2024
View reviewed changes
Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 4, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 311e18e5ab05c7e23c538b5270cec1f1356d1681

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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:

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 k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2024
@k8s-ci-robot k8s-ci-robot merged commit d937afa into kubernetes-sigs:main Mar 4, 2024
18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.10 milestone Mar 4, 2024
@fabriziopandini fabriziopandini deleted the supervisor-flavorgen-and-templates branch March 25, 2024 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrischdi chrischdi chrischdi left review comments

@zhanggbj zhanggbj Awaiting requested review from zhanggbj

Assignees

@chrischdi chrischdi

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.10
Development

Successfully merging this pull request may close these issues.
3 participants
@fabriziopandini @k8s-ci-robot @chrischdi