🌱 Bump vm-operator to v1.8.6 #2914

fabriziopandini · 2024-04-18T11:24:01Z

What this PR does / why we need it:
Also picking up latest github.com/vmware-tanzu/net-operator-api

sbueringer · 2024-04-18T11:38:08Z

Changes look good so far, pending linter & verify

sbueringer · 2024-04-18T11:38:12Z

/cherry-pick release-1.10

k8s-infra-cherrypick-robot · 2024-04-18T11:38:14Z

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

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.

pkg/services/vmoperator/vmopmachine_test.go

fabriziopandini · 2024-04-18T11:55:33Z

/test

k8s-ci-robot · 2024-04-18T11:55:36Z

@fabriziopandini: The /test command needs one or more targets.
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-29-1-30-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-29-1-30-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-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-govmomi-blocking-main
pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-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

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.

fabriziopandini · 2024-04-18T11:55:56Z

/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-29-1-30-main
/test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main

chrischdi · 2024-04-18T11:58:51Z

/lgtm

k8s-ci-robot · 2024-04-18T11:58:56Z

LGTM label has been added.

Git tree hash: d694499bae45082873a547259c38fb3744803764

chrischdi · 2024-04-18T12:04:09Z

Needs a make generate*... :-)

fabriziopandini · 2024-04-18T12:07:14Z

/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-29-1-30-main
/test pull-cluster-api-provider-vsphere-e2e-vcsim-supervisor-main

sbueringer · 2024-04-18T12:34:38Z

config/deployments/integration-tests/crds/vmoperator.vmware.com_virtualmachineclasses.yaml

@@ -14,7 +14,7 @@ spec:
    shortNames:
    - vmclass
    singular: virtualmachineclass
-  scope: Cluster
+  scope: Namespaced


I wonder if that's the thing that breaks the integration tests.

IIRC Namespaced is the correct case, so we should adapt integration tests accordingly?

@fabriziopandini ^^

I'm guessing we use different CRDs for e2e tests? That would be not ideal

🤷‍♂️

I don't have historical context on integration tests, it is on my list to look into them and if possible get rid of them now that we have proper supervisor tests

For now, I have updated the local copy of CRDs to see if I can get them back to green

Yup definitely a follow-up

pkg/services/vmoperator/vmopmachine_test.go

fabriziopandini · 2024-04-18T14:34:10Z

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

k8s-ci-robot · 2024-04-18T18:13:34Z

@fabriziopandini: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-vsphere-test-integration-main	`6ad4c49`	link	true	`/test pull-cluster-api-provider-vsphere-test-integration-main`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

fabriziopandini · 2024-04-18T18:20:56Z

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

sbueringer · 2024-04-18T20:48:07Z

...ig/deployments/integration-tests/crds/vmoperator.vmware.com_clustervirtualmachineimages.yaml

@@ -220,8 +220,14 @@ spec:
                  type: object
                type: array


Are these files still used? (Wondering because there's integration test in the name)

Fine to follow up in a separate PR if we still use it for e2e

I think we should be able to drop them. E2E tests install these CRDs via the vm-operator's manifest.

Just on my phone. But I think at least controller unit tests are using them

I'm definitely fine with moving on with this PR. Maybe a follow up would be nice.

Although integration test might be appropriate as a folder name

Those CRD are still used by supervisor's controller tests using envetest
I have opened #2922 to start improving how do we manage those CRDs, but I don't think we can drop them now

Got it, they are referenced at

cluster-api-provider-vsphere/controllers/vmware/test/controllers_suite_test.go

Line 81 in b99561a

filepath.Join(root, "config", "deployments", "integration-tests", "crds"),

sbueringer · 2024-04-18T20:49:30Z

One question. Up to you

/lgtm
/approve

/hold

k8s-ci-robot · 2024-04-18T20:49:36Z

LGTM label has been added.

Git tree hash: 500dd5a3eeb9bfbb636655b7678bf80824e3bb00

chrischdi · 2024-04-19T08:44:51Z

/approve

/hold cancel

k8s-ci-robot · 2024-04-19T08:44:57Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi, 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:

~~OWNERS~~ [chrischdi,sbueringer]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-infra-cherrypick-robot · 2024-04-19T08:50:03Z

@sbueringer: #2914 failed to apply on top of branch "release-1.10":

Applying: Bump vm-operator to v1.8.6
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	test/go.mod
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
CONFLICT (content): Merge conflict in test/go.sum
Auto-merging test/go.mod
CONFLICT (content): Merge conflict in test/go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump vm-operator to v1.8.6
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.10

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.

fabriziopandini · 2024-04-19T09:29:10Z

/cherry-pick release-1.10

k8s-infra-cherrypick-robot · 2024-04-19T09:29:46Z

@fabriziopandini: new pull request created: #2925

In response to this:

/cherry-pick release-1.10

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.

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 18, 2024

k8s-ci-robot requested review from yastij and zhanggbj April 18, 2024 11:24

k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 18, 2024

fabriziopandini mentioned this pull request Apr 18, 2024

🌱 Bump github.com/vmware-tanzu/vm-operator/api from 1.8.5 to 1.8.6 in /test #2900

Closed

fabriziopandini commented Apr 18, 2024

View reviewed changes

pkg/services/vmoperator/vmopmachine_test.go Show resolved Hide resolved

fabriziopandini added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Apr 18, 2024

k8s-ci-robot assigned chrischdi Apr 18, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 18, 2024

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 18, 2024

k8s-ci-robot requested a review from chrischdi April 18, 2024 12:06

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 18, 2024

sbueringer reviewed Apr 18, 2024

View reviewed changes

pkg/services/vmoperator/vmopmachine_test.go Show resolved Hide resolved

fabriziopandini added 4 commits April 18, 2024 20:09

Bump vm-operator to v1.8.6

e8d2e9a

Fix CI lint

701178f

Fix generated CRD for integration tests

365db05

Update vm-operator CRD

095b205

Make generate manifests

b99561a

fabriziopandini force-pushed the bump-vm-operator-to-v1.8.6 branch from 6ad4c49 to b99561a Compare April 18, 2024 18:11

sbueringer reviewed Apr 18, 2024

View reviewed changes

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 18, 2024

k8s-ci-robot assigned sbueringer Apr 18, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 18, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 18, 2024

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 19, 2024

k8s-ci-robot merged commit 53119f5 into kubernetes-sigs:main Apr 19, 2024
16 checks passed

k8s-ci-robot added this to the v1.11 milestone Apr 19, 2024

k8s-infra-cherrypick-robot mentioned this pull request Apr 19, 2024

[release-1.10] 🌱 Bump vm-operator to v1.8.6 #2925

Merged

fabriziopandini deleted the bump-vm-operator-to-v1.8.6 branch May 9, 2024 14:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌱 Bump vm-operator to v1.8.6 #2914

🌱 Bump vm-operator to v1.8.6 #2914

fabriziopandini commented Apr 18, 2024

sbueringer commented Apr 18, 2024

sbueringer commented Apr 18, 2024

k8s-infra-cherrypick-robot commented Apr 18, 2024

fabriziopandini commented Apr 18, 2024

k8s-ci-robot commented Apr 18, 2024

fabriziopandini commented Apr 18, 2024

chrischdi commented Apr 18, 2024

k8s-ci-robot commented Apr 18, 2024

chrischdi commented Apr 18, 2024

fabriziopandini commented Apr 18, 2024

sbueringer Apr 18, 2024

sbueringer Apr 18, 2024

sbueringer Apr 18, 2024

fabriziopandini Apr 18, 2024 •

edited

Loading

sbueringer Apr 18, 2024

fabriziopandini commented Apr 18, 2024

k8s-ci-robot commented Apr 18, 2024 •

edited

Loading

fabriziopandini commented Apr 18, 2024

sbueringer Apr 18, 2024

chrischdi Apr 19, 2024

sbueringer Apr 19, 2024

sbueringer Apr 19, 2024

fabriziopandini Apr 19, 2024 •

edited

Loading

chrischdi Apr 19, 2024

sbueringer commented Apr 18, 2024

k8s-ci-robot commented Apr 18, 2024

chrischdi commented Apr 19, 2024

k8s-ci-robot commented Apr 19, 2024

k8s-infra-cherrypick-robot commented Apr 19, 2024

fabriziopandini commented Apr 19, 2024

k8s-infra-cherrypick-robot commented Apr 19, 2024

🌱 Bump vm-operator to v1.8.6 #2914

🌱 Bump vm-operator to v1.8.6 #2914

Conversation

fabriziopandini commented Apr 18, 2024

sbueringer commented Apr 18, 2024

sbueringer commented Apr 18, 2024

k8s-infra-cherrypick-robot commented Apr 18, 2024

fabriziopandini commented Apr 18, 2024

k8s-ci-robot commented Apr 18, 2024

fabriziopandini commented Apr 18, 2024

chrischdi commented Apr 18, 2024

k8s-ci-robot commented Apr 18, 2024

chrischdi commented Apr 18, 2024

fabriziopandini commented Apr 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabriziopandini Apr 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabriziopandini commented Apr 18, 2024

k8s-ci-robot commented Apr 18, 2024 • edited Loading

fabriziopandini commented Apr 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fabriziopandini Apr 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sbueringer commented Apr 18, 2024

k8s-ci-robot commented Apr 18, 2024

chrischdi commented Apr 19, 2024

k8s-ci-robot commented Apr 19, 2024

k8s-infra-cherrypick-robot commented Apr 19, 2024

fabriziopandini commented Apr 19, 2024

k8s-infra-cherrypick-robot commented Apr 19, 2024

fabriziopandini Apr 18, 2024 •

edited

Loading

k8s-ci-robot commented Apr 18, 2024 •

edited

Loading

fabriziopandini Apr 19, 2024 •

edited

Loading