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

🌱 Fill up supervisor e2e test - clusterctl upgrades using ClusterClass #3024

Merged
merged 1 commit into from
Jul 5, 2024
Merged

🌱 Fill up supervisor e2e test - clusterctl upgrades using ClusterClass #3024

merged 1 commit into from
Jul 5, 2024

Conversation

zhanggbj
Copy link
Contributor

What this PR does / why we need it:

  • Enable test "When testing clusterctl upgrades using ClusterClass"

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

@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 24, 2024
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 24, 2024
@sbueringer sbueringer mentioned this pull request May 24, 2024
Closed
16 tasks
@zhanggbj
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

@zhanggbj
Copy link
Contributor Author

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

@zhanggbj
Copy link
Contributor Author

Test result indicated there's no CRD of AvailabilityZone, but I think this PR didn't touch AvailabilityZone or VMOperatorDependencies. Retry it...

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

  [FAILED] Failed to reconcile VMOperatorDependencies
  Unexpected error:
      <*errors.withStack | 0xc000620810>: 
      failed to get AvailabilityZone cluster-1: no matches for kind "AvailabilityZone" in version "topology.tanzu.vmware.com/v1alpha1"
      {
          error: <*errors.withMessage | 0xc000bab300>{
              cause: <*meta.NoKindMatchError | 0xc0011cc0c0>{
                  GroupKind: {
                      Group: "topology.tanzu.vmware.com",
                      Kind: "AvailabilityZone",
                  },
                  SearchedVersions: ["v1alpha1"],
              },
              msg: "failed to get AvailabilityZone cluster-1",
          },
          stack: [0x243e45b, 0xea9f32, 0xea9d87, 0xeaa238, 0x2438676, 0x249acfc, 0x228e8c7, 0xbac733, 0xbc07cd, 0x4741c1],
      }
  occurred
  In [It] at: /home/prow/go/src/sigs.k8s.io/cluster-api-provider-vsphere/test/e2e/e2e_setup_test.go:310 @ 05/27/24 06:11:19.972

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 25, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 25, 2024
@zhanggbj
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

@chrischdi
Copy link
Member

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

@zhanggbj
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

@zhanggbj
Copy link
Contributor Author

Looks like the test failed due to missing StorageClass CRD, I didn't find out who's responsible for creating it. @chrischdi would you please help to take a look, thanks!

  �[38;5;9m[FAILED] Failed to reconcile VMOperatorDependencies
  Unexpected error:
      <*errors.withStack | 0xc002889938>: 
      failed to get vm-operator StorageClass test-storageclass: no kind is registered for the type v1.StorageClass in scheme "pkg/runtime/scheme.go:100"
      {
          error: <*errors.withMessage | 0xc000461220>{
              cause: <*runtime.notRegisteredErr | 0xc002a88de0>{
                  schemeName: "pkg/runtime/scheme.go:100",
                  gvk: {Group: "", Version: "", Kind: ""},
                  target: nil,
                  t: <*reflect.rtype | 0x2f070a0>{
                      t: {Size_: 0x168, PtrBytes: 0x158, Hash: 4276623934, TFlag: 7, Align_: 8, FieldAlign_: 8, Kind_: 25, Equal: nil, GCData: 85, Str: 252249, PtrToThis: 10592864},
                  },
              },
              msg: "failed to get vm-operator StorageClass test-storageclass",
          },
          stack: [0x25997df, 0xf2ad12, 0xf2ab6d, 0xf2b025, 0x2592548, 0x2602105, 0x23de878, 0xc27db3, 0xc3bf6d, 0x47b361],
      }
  occurred�[0m
  �[38;5;9mIn �[1m[It]�[0m�[38;5;9m at: �[1m/home/prow/go/src/sigs.k8s.io/cluster-api-provider-vsphere/test/e2e/e2e_setup_test.go:331�[0m �[38;5;243m@ 06/26/24 08:21:09.139�[0m

@chrischdi chrischdi mentioned this pull request Jun 27, 2024
Merged
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 28, 2024
@zhanggbj
Copy link
Contributor Author

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main

@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6cb3bc05a996ca67a1816bab3499c0755a6badb2

@zhanggbj
Copy link
Contributor Author

zhanggbj commented Jul 3, 2024

Many thanks to @chrischdi for your help and great work on this!

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

Needs a rebase :D

chrischdi
chrischdi reviewed Jul 3, 2024
View reviewed changes
Makefile Show resolved Hide resolved
Makefile Show resolved Hide resolved
@sbueringer
Copy link
Member

We should probably also squash the commits when we rebase. I think merge commits in PRs were not good (I don't remember the reason)

sbueringer
sbueringer reviewed Jul 4, 2024
View reviewed changes
test/e2e/config/vsphere.yaml
@@ -271,6 +275,9 @@ variables:
EXP_NODE_ANTI_AFFINITY: "true"
CAPI_DIAGNOSTICS_ADDRESS: ":8080"
CAPI_INSECURE_DIAGNOSTICS: "true"
# Required to be set to install capv-supervisor <= v1.10, but getting created.
Copy link
Member

Choose a reason for hiding this comment

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

Not sure I understand what "but getting created" means

Copy link
Member

Choose a reason for hiding this comment

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

It is required to install CAPV in supervisor mode to a management cluster for versions <= v1.10.

Copy link
Member

Choose a reason for hiding this comment

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

Yup that makes sense. I just can't parse the last part of the sentence :D

Copy link
Member

Choose a reason for hiding this comment

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

Fine to address in a follow-up

test/e2e/clusterctl_upgrade_test.go Show resolved Hide resolved
test/go.mod Outdated Show resolved Hide resolved
Makefile Show resolved Hide resolved
@chrischdi chrischdi mentioned this pull request Jul 4, 2024
Merged
@zhanggbj zhanggbj force-pushed the fillup_e2e_cluster_upgrade branch from e6d3ec5 to 5e20d4b Compare July 5, 2024 08:37
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 5, 2024
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 5, 2024
@zhanggbj zhanggbj force-pushed the fillup_e2e_cluster_upgrade branch from 5e20d4b to d75d4f3 Compare July 5, 2024 08:42
@zhanggbj @chrischdi
Fill up supervisor e2e test
7682c5b 
- Enable test "When testing clusterctl upgrades using ClusterClass"
- Use infrastructure-components-supervisor.yaml for supervisor tests of old versions
- vsphere.yaml: add variables for serviceaccount configmap, necessary to install old versions
- add net-operator for supervisor tests on separate kind cluster
- disable capv image preload because we are using kind
- fix templates used in old supervisor e2e tests
- fix kind clusterproxy scheme

Co-authored-by: Christian Schlotter <[email protected]>
Co-authored-by: Gong Zhang <[email protected]>
@zhanggbj zhanggbj force-pushed the fillup_e2e_cluster_upgrade branch from d75d4f3 to 7682c5b Compare July 5, 2024 08:44
@sbueringer
Copy link
Member

/retest

@sbueringer
Copy link
Member

/test ?

@k8s-ci-robot
Copy link
Contributor

@sbueringer: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-main
  • /test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-main
  • /test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
  • /test pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main
  • /test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-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
  • /test pull-cluster-api-provider-vsphere-janitor-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-govmomi-blocking-main
  • pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main
  • pull-cluster-api-provider-vsphere-test-main
  • pull-cluster-api-provider-vsphere-verify-main

In response to this:

/test ?

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-sigs/prow repository.

@sbueringer
Copy link
Member

/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-govmomi-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-ci-latest-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-conformance-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-main
/test pull-cluster-api-provider-vsphere-e2e-supervisor-upgrade-1-30-1-31-main
/test pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main
/test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main

@sbueringer
Copy link
Member

@chrischdi Let's merge once tests are green

/lgtm
/approve

/hold

@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 Jul 5, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 5, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5edc17e517eb5615c63dfacb7b0c2a3d2239fc34

@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 Jul 5, 2024
@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 Jul 5, 2024
@k8s-ci-robot k8s-ci-robot merged commit bd84534 into kubernetes-sigs:main Jul 5, 2024
26 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jul 5, 2024
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

@chrischdi chrischdi Awaiting requested review from chrischdi

Assignees

@chrischdi chrischdi

@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. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.
4 participants
@zhanggbj @chrischdi @k8s-ci-robot @sbueringer