OCPCLOUD-2214,OCPBUGS-17287,OCPBUGS-21642: Bump capi/capi providers/k8s 1.27 by damdo · Pull Request #132 · openshift/cluster-capi-operator

damdo · 2023-10-11T08:47:23Z

Done:

bump k8s dependencies 1.27 (aside from the laggard GCP, handled later)
bump CAPI provider deps to versions compatible to 1.27
bump CAPI core deps to version compatible to 1.27

Warning

This PR needs to be "GREEN BUTTON MERGED" at the same time as the cluster-api-operator PR, as the new code of that operator references a new CRD (deployed by this repo), so to avoid breaking the payload we need to merge them together. (We are planning to fix this, see enhancement)

Todo:

bump providers-list.yaml and rerun make assets (once provider forks rebase PRs have merged)

As part of this process we are also merging Rebase PRs on the CAPI provider forks.
I will track here E2E tests ran from this branch/PR against the rebase PRs in the various CAPI provider repos forks.

I will track here E2E tests ran from this branch/PR against the rebase PRs in the various CAPI provider repos forks (details for E2E runs below).

AWS - test-run
GCP (no PR yet, only master testing) - test-run
IBMCloud - test-run
Vsphere - not testable due to no E2Es yet
Azure - not testable due to no E2Es yet

openshift-ci-robot · 2023-10-11T08:47:28Z

@damdo: This pull request references OCPCLOUD-2214 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

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.

damdo · 2023-10-11T08:47:47Z

/hold
Will need to be green button merged.

openshift-ci-robot · 2023-10-11T08:50:37Z

@damdo: This pull request references OCPCLOUD-2214 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

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.

openshift-ci-robot · 2023-10-11T08:52:35Z

@damdo: This pull request references OCPCLOUD-2214 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

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.

ran: // see https://github.com/kubernetes/client-go/issues/1269#issuecomment-1613565035 - go get k8s.io/kube-openapi@2546d827e515dca59571ec245eef2302e11018e1 && go mod tidy // we need to use a commit hash rather than a point release because // a new 1.5.0 release is not out yet, but 1.4.0 doesn't work with controller-runtime v0.15.z // this will need to change to v1.5.0 once it is released. - go get sigs.k8s.io/cluster-api-provider-gcp@f1ea13261b0f929beca8c65d932046003caa652d && go mod tidy - go mod vendor -

damdo · 2023-10-11T11:51:19Z

/test unit lint vendor images

damdo · 2023-10-11T12:13:01Z

/test unit lint vendor images

damdo · 2023-10-11T15:55:22Z

/test unit lint vendor images

openshift-ci-robot · 2023-10-12T06:52:07Z

@damdo: This pull request references OCPCLOUD-2214 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

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.

openshift-ci-robot · 2023-10-12T10:38:21Z

@damdo: This pull request references OCPCLOUD-2214 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

Details

In response to this:

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.

JoelSpeed · 2023-10-12T11:11:29Z

/test all

openshift-ci-robot · 2023-10-12T13:56:53Z

@JoelSpeed: This pull request references OCPCLOUD-2214 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-17287, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.15.0) matches configured target version for branch (4.15.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

Details

In response to this:

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.

damdo · 2023-10-13T09:29:42Z

/retest-required

damdo · 2023-10-13T14:30:49Z

With a cluster bot cluster built with:

launch openshift/cluster-capi-operator#132,openshift/cluster-api#181,openshift/cluster-api-operator#25 gcp,techpreview

Cluster API Provider GCP manual E2Es passed:

Cluster API GCP MachineSet should be able to run a machine
/Users/ddonati/src/cluster-capi-operator/e2e/gcp_test.go:50
  STEP: Creating core cluster @ 10/13/23 16:14:49.821
  STEP: Creating GCP cluster @ 10/13/23 16:14:50.584
  STEP: Creating GCP machine template @ 10/13/23 16:14:51.049
  STEP: Creating MachineSet "gcp-machineset" @ 10/13/23 16:14:51.266
  STEP: Waiting for MachineSet machines "gcp-machineset" to enter Running phase @ 10/13/23 16:14:51.481
  STEP: Deleting MachineSet "gcp-machineset" @ 10/13/23 16:18:29.601
  STEP: Waiting for MachineSet "gcp-machineset" to be deleted @ 10/13/23 16:18:29.739
  STEP: Deleting /gcp-machine-template @ 10/13/23 16:20:22.937
• [333.243 seconds]
------------------------------

Ran 1 of 3 Specs in 333.827 seconds
SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 2 Skipped
PASS

Ginkgo ran 1 suite in 5m44.051354009s
Test Suite Passed

openshift-ci-robot · 2023-10-13T14:31:34Z

@damdo: This pull request references OCPCLOUD-2214 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-17287, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.15.0) matches configured target version for branch (4.15.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

Details

In response to this:

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.

damdo · 2023-10-16T09:58:43Z

/retest

openshift-ci-robot · 2023-10-16T10:57:27Z

@damdo: This pull request references OCPCLOUD-2214 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

This pull request references Jira Issue OCPBUGS-17287, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.15.0) matches configured target version for branch (4.15.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

This pull request references Jira Issue OCPBUGS-21642, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.15.0) matches configured target version for branch (4.15.0)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

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.

openshift-ci · 2023-10-17T15:12:34Z

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

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-gcp-capi-techpreview	`ec21471`	link	true	`/test e2e-gcp-capi-techpreview`
ci/prow/e2e-gcp-ovn-techpreview	`ec21471`	link	false	`/test e2e-gcp-ovn-techpreview`
ci/prow/e2e-azure-ovn-techpreview	`ec21471`	link	false	`/test e2e-azure-ovn-techpreview`
ci/prow/e2e-aws-capi-techpreview	`ec21471`	link	true	`/test e2e-aws-capi-techpreview`
ci/prow/assets	`ec21471`	link	false	`/test assets`

Full PR test history. Your PR dashboard.

Details

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.

JoelSpeed · 2023-10-18T10:31:54Z

/lgtm
/approve

/hold I would like to see a cluster-bot test to verify that this does indeed work with the paired PR as expected. If we can get green results from cluster bot then I think a green button merge to merge them simultaneously should be safe

openshift-ci · 2023-10-18T10:34:36Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JoelSpeed

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [JoelSpeed]

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

JoelSpeed · 2023-10-18T14:35:45Z

Cluster bot proof in:

https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/release-openshift-origin-installer-launch-aws-modern/1714589819641794560
https://prow.ci.openshift.org/view/gs/origin-ci-test/logs/release-openshift-origin-installer-launch-gcp-modern/1714589887396581376
/hold cancel
/override ci/prow/e2e-aws-ovn-techpreview

JoelSpeed · 2023-10-18T14:41:27Z

/override ci/prow/e2e-aws-ovn-techpreview

openshift-ci · 2023-10-18T14:44:01Z

@JoelSpeed: Overrode contexts on behalf of JoelSpeed: ci/prow/e2e-aws-ovn-techpreview

Details

In response to this:

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.

openshift-ci-robot · 2023-10-18T14:45:46Z

@damdo: Jira Issue OCPBUGS-17287: All pull requests linked via external trackers have merged:

openshift/cluster-capi-operator#132

Jira Issue OCPBUGS-17287 has been moved to the MODIFIED state.

Jira Issue OCPBUGS-21642: All pull requests linked via external trackers have merged:

openshift/cluster-capi-operator#132

Jira Issue OCPBUGS-21642 has been moved to the MODIFIED state.

Details

In response to this:

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.

openshift-ci · 2023-10-18T14:48:35Z

@JoelSpeed: Overrode contexts on behalf of JoelSpeed: ci/prow/e2e-aws-ovn-techpreview

Details

In response to this:

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.

openshift-merge-robot · 2023-10-25T05:27:31Z

Fix included in accepted release 4.15.0-0.nightly-2023-10-24-230302

…dating-webhook-configuration The resource was renamed to cluster-capi-operator in 1096d5c (manifests: rename validatingwebhookconfiguration to a more meaningful name, 2023-10-12, openshift#132), and that's a much more specific name for the cluster-scoped resource. However, clusters upating from 4.15.0-ec.1 with the old name should not have two similar-but-not-quite-matching versions of the webhook configuration, or updates can stick with cluster-api ClusterOperator going Degraded=True on SyncingFailed with [1]: Failed to resync for operator: 4.15.0-ec.2 because &{%!e(string=unable to reconcile CoreProvider: unable to create or update CoreProvider: Internal error occurred: failed calling webhook "vcoreprovider.operator.cluster.x-k8s.io": failed to call webhook: the server could not find the requested resource)} This commit adds a deletion manifest [2] to ask the cluster-version operator to remove the resource, to avoid leaking the old resource into new clusters. [1]: https://issues.redhat.com/browse/OCPBUGS-23467 [2]: https://github.com/openshift/enhancements/blob/8a11b7085c69b078690d50958f541d2a817d85df/dev-guide/cluster-version-operator/dev/object-deletion.md

damdo added 5 commits October 11, 2023 10:23

fix: remove all trailing whitespaces for all the metadata.yaml lines

c460ec0

hack/assets: allow specifying cluster-api-operator repo org

019a1dc

bump capi pkg & k8s libs to 1.27

924882b

hack/assets: pin kustomize version due to bug

0d1266f

run make assets

ef66a69

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 11, 2023

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 11, 2023

damdo mentioned this pull request Oct 11, 2023

OCPCLOUD-2215,OCPBUGS-17289,OCPBUGS-21650: Merge https://github.com/kubernetes-sigs/cluster-api-operator:v0.6.0 (a8f5386) into main openshift/cluster-api-operator#25

Merged

openshift-ci Bot requested review from JoelSpeed and odvarkadaniel October 11, 2023 08:49

damdo marked this pull request as draft October 11, 2023 08:54

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 11, 2023

restore branches in providers-list.yaml

8a4550c

damdo force-pushed the bump-capi-providers-and-k8s-1.27 branch from 7559d9c to 8a4550c Compare October 11, 2023 09:00

new linter fixes

a84d502

damdo force-pushed the bump-capi-providers-and-k8s-1.27 branch from efa0804 to 9736988 Compare October 11, 2023 15:54

damdo added 2 commits October 12, 2023 10:00

upgrade cluster-api-operator CRDs to v1alpha2

1002d17

rerun make assets

2e43620

damdo force-pushed the bump-capi-providers-and-k8s-1.27 branch from 9736988 to 2e43620 Compare October 12, 2023 08:01

openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 12, 2023

openshift-ci Bot requested a review from sunzhaohua2 October 12, 2023 13:57

damdo changed the title ~~OCPCLOUD-2214,OCPBUGS-17287: Bump capi/capi providers/k8s 1.27~~ OCPCLOUD-2214,OCPBUGS-17287,OCPBUGS-21642: Bump capi/capi providers/k8s 1.27 Oct 16, 2023

bump golang.org/x/net to v0.17.0

c988723

damdo force-pushed the bump-capi-providers-and-k8s-1.27 branch from 3200a6f to c988723 Compare October 16, 2023 11:11

rerun make assets

ec21471

damdo force-pushed the bump-capi-providers-and-k8s-1.27 branch from 31aa314 to ec21471 Compare October 17, 2023 12:19

openshift-ci Bot assigned JoelSpeed Oct 18, 2023

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2023

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2023

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 18, 2023

JoelSpeed merged commit 3a62d76 into openshift:main Oct 18, 2023

damdo mentioned this pull request Oct 20, 2023

[release-4.14] OCPBUGS-21092: Bump golang.org/x/net to v0.17.0 #134

Merged

wking mentioned this pull request Nov 20, 2023

OCPBUGS-23467: manifests/0000_30_cluster-api_10_webhooks: Deletion manifest for validating-webhook-configuration #145

Merged

Conversation

damdo commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 11, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented Oct 11, 2023

Uh oh!

openshift-ci-robot commented Oct 11, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 11, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented Oct 11, 2023

Uh oh!

damdo commented Oct 11, 2023

Uh oh!

damdo commented Oct 11, 2023

Uh oh!

openshift-ci-robot commented Oct 12, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 12, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JoelSpeed commented Oct 12, 2023

Uh oh!

openshift-ci-robot commented Oct 12, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented Oct 13, 2023

Uh oh!

damdo commented Oct 13, 2023

Uh oh!

openshift-ci-robot commented Oct 13, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented Oct 16, 2023

Uh oh!

openshift-ci-robot commented Oct 16, 2023 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci Bot commented Oct 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JoelSpeed commented Oct 18, 2023

Uh oh!

openshift-ci Bot commented Oct 18, 2023

Uh oh!

JoelSpeed commented Oct 18, 2023

Uh oh!

JoelSpeed commented Oct 18, 2023

Uh oh!

openshift-ci Bot commented Oct 18, 2023

Uh oh!

openshift-ci-robot commented Oct 18, 2023

Uh oh!

openshift-ci Bot commented Oct 18, 2023

Uh oh!

openshift-merge-robot commented Oct 25, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

damdo commented Oct 11, 2023 •

edited

Loading

openshift-ci-robot commented Oct 11, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Oct 11, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Oct 11, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Oct 12, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Oct 12, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Oct 12, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Oct 13, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci-robot commented Oct 16, 2023 •

edited by openshift-ci Bot

Loading

openshift-ci Bot commented Oct 17, 2023 •

edited

Loading