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

🌱 Add clusterctl upgrade test #2517

Merged
merged 1 commit into from
Dec 12, 2023
Merged

🌱 Add clusterctl upgrade test #2517

merged 1 commit into from
Dec 12, 2023

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Nov 22, 2023 •
edited
Loading

Fixes #2247

TODO:

  • fix
  • revisit PR-Blocking
  • squash

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

codecov bot commented Nov 22, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (83f9509) 63.59% compared to head (bc75ee1) 63.69%.
Report is 1 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2517      +/-   ##
==========================================
+ Coverage   63.59%   63.69%   +0.10%     
==========================================
  Files         120      120              
  Lines        8685     8685              
==========================================
+ Hits         5523     5532       +9     
+ Misses       2735     2729       -6     
+ Partials      427      424       -3

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

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 22, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 22, 2023
@chrischdi
Copy link
Member Author

/retest

@chrischdi
Copy link
Member Author

This seems to be flaky currently regarding the cluster resource set:

Example:

  • CRS has creationTimestamp: "2023-11-23T11:34:17Z"
  • CRS got into errors for a long time and finished getting applied at lastTransitionTime: "2023-11-23T11:50:36Z"

During that 16 mins the e2e test times out. The test requires the CRS's to get deployed to get CNI and CPI running so the machines get set to Running.

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-main

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 5, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 5, 2023
@chrischdi chrischdi force-pushed the pr-clusterctl-upgrade-test branch 3 times, most recently from 2bd1148 to 6e5d1f1 Compare December 5, 2023 17:37
@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot
Copy link
Contributor

@chrischdi: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-full-main
  • /test pull-cluster-api-provider-vsphere-e2e-main
  • /test pull-cluster-api-provider-vsphere-test-integration-main
  • /test pull-cluster-api-provider-vsphere-test-main
  • /test pull-cluster-api-provider-vsphere-verify-main

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-vsphere-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-vsphere-apidiff-main
  • pull-cluster-api-provider-vsphere-e2e-main
  • pull-cluster-api-provider-vsphere-test-integration-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test help

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.

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 6, 2023
@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 6, 2023
@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@chrischdi
Copy link
Member Author

/retest

@chrischdi
Copy link
Member Author

/retest

@chrischdi
Copy link
Member Author

chrischdi commented Dec 7, 2023 •
edited
Loading

/hold

I think we should first get #2532 in. And afterwards bump sigs.k8s.io/cluster-api/test to a version which contains kubernetes-sigs/cluster-api#9827

Edit: updated the first reference

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 7, 2023
sbueringer
sbueringer reviewed Dec 7, 2023
View reviewed changes
packaging/flavorgen/flavors/patches.go Show resolved Hide resolved
packaging/flavorgen/flavors/clusterclass_generators.go Show resolved Hide resolved
test/e2e/config/vsphere-ci.yaml Outdated Show resolved Hide resolved
test/e2e/config/vsphere-dev.yaml Outdated Show resolved Hide resolved
Makefile Show resolved Hide resolved
test/e2e/data/infrastructure-vsphere/v1.8/cluster-template/kustomization.yaml Outdated Show resolved Hide resolved
test/e2e/data/infrastructure-vsphere/v1.8/topology/kustomization.yaml Outdated
patches:
- target:
kind: VSphereMachineTemplate
path: ../bases/remove-storage-policy.yaml
Copy link
Member

Choose a reason for hiding this comment

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

Do you know why we need this patch? If yes, can we add a comment here & on main?

Copy link
Member Author

Choose a reason for hiding this comment

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

This removes the requirement for the test to have a working storage policy, while it is part of the published yamls so it could get defined.

xref where this removal was introduced: https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/pull/1686/files

Copy link
Member

Choose a reason for hiding this comment

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

Given that we have a working storage policy. Should we drop this patch in a follow-up PR?

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's learn the "why" the hard way :-)

test/e2e/data/infrastructure-vsphere/v1.8/clusterclass/kustomization.yaml Outdated Show resolved Hide resolved
test/e2e/data/infrastructure-vsphere/v1.8/bases/cluster.yaml Outdated Show resolved Hide resolved
test/e2e/data/infrastructure-vsphere/v1.7/bases/cluster-template-topology.yaml Outdated Show resolved Hide resolved
@sbueringer
Copy link
Member

/hold

I think we should first get #2517 in. And afterwards bump sigs.k8s.io/cluster-api/test to a version which contains kubernetes-sigs/cluster-api#9827

Which one? 2517 is the current PR

@chrischdi
Copy link
Member Author

/hold
I think we should first get #2517 in. And afterwards bump sigs.k8s.io/cluster-api/test to a version which contains kubernetes-sigs/cluster-api#9827

Which one? 2517 is the current PR

Oh sorry, meant #2532

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

1 similar comment
@chrischdi
Copy link
Member Author

/test pull-cluster-api-provider-vsphere-e2e-full-main

sbueringer
sbueringer reviewed Dec 12, 2023
View reviewed changes
test/e2e/config/vsphere-ci.yaml Outdated Show resolved Hide resolved
test/e2e/config/vsphere-ci.yaml Outdated Show resolved Hide resolved
test/e2e/config/vsphere-dev.yaml Outdated Show resolved Hide resolved
test/e2e/config/vsphere-dev.yaml Outdated Show resolved Hide resolved
test/e2e/data/infrastructure-vsphere/v1.8/topology/kustomization.yaml Outdated
patches:
- target:
kind: VSphereMachineTemplate
path: ../bases/remove-storage-policy.yaml
Copy link
Member

Choose a reason for hiding this comment

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

Given that we have a working storage policy. Should we drop this patch in a follow-up PR?

@killianmuldoon @chrischdi
Add clusterctl upgrade test
bc75ee1 
Signed-off-by: killianmuldoon <kmuldoon@vmware.com>
@sbueringer
Copy link
Member

Thank you!!

/lgtm
/approve
/test pull-cluster-api-provider-vsphere-e2e-full-main

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

LGTM label has been added.

Git tree hash: f86f34777a903558806d1ac27c188d1b47b4b601

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 Dec 12, 2023
@sbueringer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 12, 2023
@sbueringer
Copy link
Member

/test pull-cluster-api-provider-vsphere-e2e-full-main

@k8s-ci-robot k8s-ci-robot merged commit fdfa834 into kubernetes-sigs:main Dec 12, 2023
18 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Dec 12, 2023
@chrischdi chrischdi mentioned this pull request Dec 22, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbueringer sbueringer sbueringer left review comments

@gab-satchi gab-satchi Awaiting requested review from gab-satchi

@yastij yastij Awaiting requested review from yastij

Assignees

@sbueringer sbueringer

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.9
Development

Successfully merging this pull request may close these issues.

Enable clusterctl upgrade tests
4 participants
@chrischdi @k8s-ci-robot @sbueringer @killianmuldoon