Skip to content

OPRUN-3588: Update openshift/api to pick up OLM V1 v4.18 capability sets#1108

Merged
openshift-merge-bot[bot] merged 3 commits intoopenshift:masterfrom
LalatenduMohanty:add_olmv1_capability_api
Nov 13, 2024
Merged

OPRUN-3588: Update openshift/api to pick up OLM V1 v4.18 capability sets#1108
openshift-merge-bot[bot] merged 3 commits intoopenshift:masterfrom
LalatenduMohanty:add_olmv1_capability_api

Conversation

@LalatenduMohanty
Copy link
Copy Markdown
Member

@LalatenduMohanty LalatenduMohanty commented Nov 11, 2024

Catching up with [1]. Generated with:

$ go get github.com/openshift/api@a2817b89f7e0989016967055a142d5e88bed18de
$ go get github.com/openshift/client-go@923091dd2b1a3d6fe75a06cc4f45972a3ddf84c2
$ go get github.com/openshift/library-go@0064ad7bd060b9fd52f7840972c1d3e72186d0f0
$ go mod tidy
$ go mod vendor
$ git add -A go.* vendor

$ go version
go version go1.22.5 linux/amd64

[1] openshift/api/pull/2066

@openshift-ci openshift-ci Bot requested review from petr-muller and wking November 11, 2024 18:37
@LalatenduMohanty
Copy link
Copy Markdown
Member Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 11, 2024
@LalatenduMohanty LalatenduMohanty force-pushed the add_olmv1_capability_api branch 6 times, most recently from ef43722 to fd1aad4 Compare November 11, 2024 23:16
@LalatenduMohanty
Copy link
Copy Markdown
Member Author

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 11, 2024
@LalatenduMohanty LalatenduMohanty force-pushed the add_olmv1_capability_api branch 6 times, most recently from 7088817 to d6ee596 Compare November 12, 2024 19:01
}

func (c testSyncContext) Queue() workqueue.RateLimitingInterface {
func (c testSyncContext) Queue() workqueue.RateLimitingInterface { //nolint:staticcheck
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I could not change the RateLimitingInterface here as library-go still uses old version of API and it wont accept new change

@LalatenduMohanty LalatenduMohanty changed the title vendor: Update openshift/api to pick up OLM V1 v4.18 capability sets OPRUN-3588 : Update openshift/api to pick up OLM V1 v4.18 capability sets Nov 12, 2024
Catching up with [1].  Generated with:

  $ go get github.com/openshift/api@a2817b89f7e0989016967055a142d5e88bed18de
  $ go get github.com/openshift/client-go@923091dd2b1a3d6fe75a06cc4f45972a3ddf84c2
  $ go get github.com/openshift/library-go@0064ad7bd060b9fd52f7840972c1d3e72186d0f0
  $ go mod tidy
  $ go mod vendor
  $ git add -A go.* vendor

  $ go version
  go version go1.22.5 linux/amd64

[1] openshift/api/pull/2066

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
As we need to update the test after adding a new capability

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
Use DefaultTypedControllerRateLimiter instead of workqueue.DefaultControllerRateLimiter

Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>
@grokspawn
Copy link
Copy Markdown

Hey @LalatenduMohanty , any concern that this update includes a bump to k8s 1.31?

@wking
Copy link
Copy Markdown
Member

wking commented Nov 12, 2024

..., any concern that this update includes a bump to k8s 1.31?

4.18 uses Kube 1.31, e.g. 4.18.0-ec.3:

Components
Kubectl 1.31.1
Kubernetes upgraded from 1.31.1 to 1.31.2
Kubernetes Tests upgraded from 1.30.0 to 1.31.1
...

and openshift/kubernetes#2092, so should be fine for us to use Kube 1.31 clients, right? I guess that gives us a very brief window where an incoming 4.18 CVO is using 1.31 clients before the Kube API server has had time to update to 1.31, but 🤷, the CVO doesn't do fancy things with cutting edge Kube API types during that window, and hopefully 1.31 client code is backwards-compatible with 1.30 Kube API servers to bridge that kind of skew.

@wking
Copy link
Copy Markdown
Member

wking commented Nov 12, 2024

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@wking: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@wking
Copy link
Copy Markdown
Member

wking commented Nov 12, 2024

Drop the pre-colon space to make the bots happy

/retitle OPRUN-3588: Update openshift/api to pick up OLM V1 v4.18 capability sets

@openshift-ci openshift-ci Bot changed the title OPRUN-3588 : Update openshift/api to pick up OLM V1 v4.18 capability sets OPRUN-3588: Update openshift/api to pick up OLM V1 v4.18 capability sets Nov 12, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 12, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Nov 12, 2024

@LalatenduMohanty: This pull request references OPRUN-3588 which is a valid jira issue.

Details

In response to this:

Catching up with [1]. Generated with:

$ go get github.com/openshift/api@a2817b89f7e0989016967055a142d5e88bed18de
$ go get github.com/openshift/client-go@923091dd2b1a3d6fe75a06cc4f45972a3ddf84c2
$ go get github.com/openshift/library-go@0064ad7bd060b9fd52f7840972c1d3e72186d0f0
$ go mod tidy
$ go mod vendor
$ git add -A go.* vendor

$ go version
go version go1.22.5 linux/amd64

[1] openshift/api/pull/2066

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 openshift-eng/jira-lifecycle-plugin repository.

@wking
Copy link
Copy Markdown
Member

wking commented Nov 12, 2024

This pull looks good to me, although CI is still running, and I'm waiting that out before adding the lgtm label. Talking through some of the context:

/hold for OLM to lift when they're ready for this to merge.

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 12, 2024
@wking
Copy link
Copy Markdown
Member

wking commented Nov 12, 2024

e2e-agnostic-operator failures look like infra, and unrelated to this pull request, so retest that:

/test e2e-agnostic-operator

$ curl -s https://storage.googleapis.com/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1108/pull-ci-openshift-cluster-version-operator-master-e2e-agnostic-operator/1856432680753696768/build-log.txt | grep 'Install attempt\|failed to create cluster\|Installer exit with code'
Install attempt 1 of 3
level=error msg=failed to fetch Cluster: failed to generate asset "Cluster": failed to create cluster: failed to provision control-plane machines within 15m0s: client rate limiter Wait returned an error: context deadline exceeded
Installer exit with code 4
Install attempt 2 of 3
level=error msg=failed to fetch Cluster: failed to generate asset "Cluster": failed to create cluster: failed provisioning resources after infrastructure ready: failed to finish creating gallery image version 418.94.20241009: GET https://management.azure.com/subscriptions/d38f1e38-4bed-438e-b227-833f997adf6a/providers/Microsoft.Compute/locations/eastus/capsOperations/6c0764d1-d60d-4fd3-aa18-cc8a856a794b
Installer exit with code 4
Install attempt 3 of 3
level=error msg=failed to fetch Cluster: failed to generate asset "Cluster": failed to create cluster: failed provisioning resources after infrastructure ready: failed to finish creating gallery image version 418.94.20241009: GET https://management.azure.com/subscriptions/d38f1e38-4bed-438e-b227-833f997adf6a/providers/Microsoft.Compute/locations/eastus/capsOperations/ae6c5228-cebd-4952-858b-ec73ed4a54ef
Installer exit with code 4

@LalatenduMohanty
Copy link
Copy Markdown
Member Author

ci/prow/e2e-agnostic-ovn-upgrade-out-of-change

This failure does not seem related to the PR. @wking what are we going to do for hypershift test failures?

@petr-muller
Copy link
Copy Markdown
Member

My bet is that the out-of-change failure is related to the PR but is actually expected and we'll need to override.

It's a update timeout:

INFO[2024-11-12T22:03:41Z] Running step e2e-agnostic-ovn-upgrade-out-of-change-openshift-e2e-test. 
{"component":"entrypoint","file":"sigs.k8s.io/prow/pkg/entrypoint/run.go:169","func":"sigs.k8s.io/prow/pkg/entrypoint.Options.ExecuteProcess","level":"error","msg":"Process did not finish before 4h0m0s timeout","severity":"error","time":"2024-11-13T00:23:59Z"} 

It is not possible to update from the version that knows the new capability to the version without that capability.

@LalatenduMohanty
Copy link
Copy Markdown
Member Author

Looks like hypershift tests have passed now.

@wking @petr-muller can we get a lgtm on this PR and I will remove the hold when we are ready

@petr-muller
Copy link
Copy Markdown
Member

I will remove the hold when we are ready

Can we get this tested? (by OLM or OTA QE?). Capability PRs are hard to revert when problematic. We block CVO merges on QE approval (or explicit decision that pre-merge testing is not necessary or desirable for some reason).

Copy link
Copy Markdown
Member

@wking wking left a comment

Choose a reason for hiding this comment

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

Yup, once we confirm that's the only issue with the upgrade-out-of-change job, we:

/override ci/prow/e2e-agnostic-ovn-upgrade-out-of-change

we could get better visibility with openshift/api#1624, but I haven't been able to get that prioritized.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 13, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Nov 13, 2024

@wking: Overrode contexts on behalf of wking: ci/prow/e2e-agnostic-ovn-upgrade-out-of-change

Details

In response to this:

Yup, once we confirm that's the only issue with the upgrade-out-of-change job, we:

/override ci/prow/e2e-agnostic-ovn-upgrade-out-of-change

we could get better visibility with openshift/api#1624, but I haven't been able to get that prioritized.

/lgtm

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Nov 13, 2024

@LalatenduMohanty: all tests passed!

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Nov 13, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, wking

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:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 13, 2024
@joelanford
Copy link
Copy Markdown
Member

Manually adding qe-approved. We have performed pre-merge testing that gives high confidence this PR is ready to merge. See https://issues.redhat.com/browse/OPRUN-3588?focusedId=26070118&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-26070118

@joelanford
Copy link
Copy Markdown
Member

/label qe-approved

@joelanford
Copy link
Copy Markdown
Member

/hold cancel

@openshift-ci openshift-ci Bot added qe-approved Signifies that QE has signed off on this PR and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Nov 13, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

openshift-ci-robot commented Nov 13, 2024

@LalatenduMohanty: This pull request references OPRUN-3588 which is a valid jira issue.

Details

In response to this:

Catching up with [1]. Generated with:

$ go get github.com/openshift/api@a2817b89f7e0989016967055a142d5e88bed18de
$ go get github.com/openshift/client-go@923091dd2b1a3d6fe75a06cc4f45972a3ddf84c2
$ go get github.com/openshift/library-go@0064ad7bd060b9fd52f7840972c1d3e72186d0f0
$ go mod tidy
$ go mod vendor
$ git add -A go.* vendor

$ go version
go version go1.22.5 linux/amd64

[1] openshift/api/pull/2066

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Copy Markdown
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cluster-version-operator
This PR has been included in build cluster-version-operator-container-v4.19.0-202411140108.p0.gb0eddfe.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants