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.

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

OCPBUGS-41111: vendor: Update openshift/api to pick up v4.17 and v4.18 capability sets #1875

Closed
wants to merge 1 commit into from

Conversation

wking
Copy link
Member

@wking wking commented Sep 12, 2024

Catching up with openshift/api#2022. Generated with:

$ go get github.com/openshift/api@master
$ go mod tidy
$ go mod vendor
$ git add -A go.* vendor

all using:

$ go version
go version go1.22.2 linux/amd64

This addresses OCPBUGS-41111:

$ cat v4.17-basecap.yaml
---
apiVersion: v1
platform:
  gcp:
    foo: bar
capabilities:
  baselineCapabilitySet: v4.17
$ ./oc adm release extract --install-config v4.17-basecap.yaml --included --credentials-requests --from quay.io/openshift-release-dev/ocp-release:4.17.0-rc.1-x86_64 --to /tmp/test
  error: unrecognized baselineCapabilitySet "v4.17"

because pkg/cli/admin/release/extract_tools.go uses the vendored openshift/api/config/v1 to unpack capabilities.

Catching up with [1].  Generated with:

  $ go get github.com/openshift/api@master
  $ go mod tidy
  $ go mod vendor
  $ git add -A go.* vendor

all using:

  $ go version
  go version go1.22.2 linux/amd64

This addresses [2]:

  $ cat v4.17-basecap.yaml
  ---
  apiVersion: v1
  platform:
    gcp:
      foo: bar
  capabilities:
    baselineCapabilitySet: v4.17
  $ ./oc adm release extract --install-config v4.17-basecap.yaml --included --credentials-requests --from quay.io/openshift-release-dev/ocp-release:4.17.0-rc.1-x86_64 --to /tmp/test
  error: unrecognized baselineCapabilitySet "v4.17"

because pkg/cli/admin/release/extract_tools.go uses the vendored
openshift/api/config/v1 to unpack capabilities.

[1]: openshift/api#2022
[2]: https://issues.redhat.com/browse/OCPBUGS-41111
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Sep 12, 2024
@openshift-ci-robot
Copy link

@wking: This pull request references Jira Issue OCPBUGS-41111, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @jiajliu

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

In response to this:

Catching up with openshift/api#2022. Generated with:

$ go get github.com/openshift/api@master
$ go mod tidy
$ go mod vendor
$ git add -A go.* vendor

all using:

$ go version
go version go1.22.2 linux/amd64

This addresses OCPBUGS-41111:

$ cat v4.17-basecap.yaml
---
apiVersion: v1
platform:
 gcp:
   foo: bar
capabilities:
 baselineCapabilitySet: v4.17
$ ./oc adm release extract --install-config v4.17-basecap.yaml --included --credentials-requests --from quay.io/openshift-release-dev/ocp-release:4.17.0-rc.1-x86_64 --to /tmp/test
 error: unrecognized baselineCapabilitySet "v4.17"

because pkg/cli/admin/release/extract_tools.go uses the vendored openshift/api/config/v1 to unpack capabilities.

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.

Copy link
Contributor

openshift-ci bot commented Sep 12, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: wking
Once this PR has been reviewed and has the lgtm label, please assign ardaguclu for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@jiajliu
Copy link

jiajliu commented Sep 12, 2024

pre-merge verify pass

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Sep 12, 2024
@ardaguclu
Copy link
Member

https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_oc/1875/pull-ci-openshift-oc-master-e2e-aws-ovn/1834034427999555584 failure is real and there is an issue after this openshift/api#2017. As far as I understand, this PR is opened due to more targeting to have another backport PR for 4.17?.

I'm investigating the failure now as it will have an impact on rebasing of oc.

@ardaguclu
Copy link
Member

ardaguclu commented Sep 12, 2024

Since rebasing process hasn't been completed yet, this version of openshift/api hasn't been vendored in other required pieces (especially openshift-apiserver openshift/openshift-apiserver#444). Failing test points out the implications caused by this PR because now oc has new openshift/api and all the commands such as create, run, etc. will send resources with this new metadata field for our internal resources in OCP. However, API server will print out a warning just like in the test and that would cause unseen failures in CI (because it hasn't had new metadata field yet).

But as far as I understand, the primary goal is to bump 4.17 and there shouldn't be any problem in there. I think, it is better to directly open a PR against release-4.17 and get valid-bug label from staff engineers.

Copy link
Contributor

openshift-ci bot commented Sep 12, 2024

@wking: 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-aws-ovn a230573 link true /test e2e-aws-ovn
ci/prow/e2e-metal-ipi-ovn-ipv6 a230573 link false /test e2e-metal-ipi-ovn-ipv6

Full PR test history. Your PR dashboard.

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.

wking added a commit to wking/oc that referenced this pull request Sep 12, 2024
Catching up with [1], and a backport-ish of 45ab914729 (vendor: Update
openshift/api to pick up the v4.17 capability sets, 2024-09-11, openshift#1875),
which may or may not land due to conflicts with the Kubernetes rebase
[2].  Generated with:

  $ GOPROXY=direct go get github.com/openshift/api@release-4.17
  $ go mod tidy
  $ go mod vendor
  $ git add -A go.* vendor

all using:

  $ go version
  go version go1.22.2 linux/amd64

where GOPROXY=direct avoids a caching delay [3]:

  I committed a new change (or released a new version) to a
  repository, why isn't it showing up when I run go get -u or go list
  -m --versions?

  In order to improve our services' caching and serving latencies, new
  versions may not show up right away. If you want new code to be
  immediately available in the mirror, then first make sure there is a
  semantically versioned tag for this revision in the underlying
  source repository. Then explicitly request that version via go get
  module@version. The new version should be available within one
  minute. Note that if someone requested the version before the tag
  was pushed, it may take up to 30 minutes for the mirror's cache to
  expire and fresh data about the version to become available. If the
  version is still not available after 30 minutes, please file an
  issue.

This addresses [4]:

  $ cat v4.17-basecap.yaml
  ---
  apiVersion: v1
  platform:
    gcp:
      foo: bar
  capabilities:
    baselineCapabilitySet: v4.17
  $ ./oc adm release extract --install-config v4.17-basecap.yaml --included --credentials-requests --from quay.io/openshift-release-dev/ocp-release:4.17.0-rc.1-x86_64 --to /tmp/test
  error: unrecognized baselineCapabilitySet "v4.17"

because pkg/cli/admin/release/extract_tools.go uses the vendored
openshift/api/config/v1 to unpack capabilities.

[1]: openshift/api#2023
[2]: openshift#1875 (comment)
[3]: https://proxy.golang.org/
[4]: https://issues.redhat.com/browse/OCPBUGS-41111
@wking
Copy link
Member Author

wking commented Oct 14, 2024

The vendor bump I was adding here made it into the development branch via eac0d7d (#1877).

@wking wking closed this Oct 14, 2024
@openshift-ci-robot
Copy link

@wking: This pull request references Jira Issue OCPBUGS-41111. The bug has been updated to no longer refer to the pull request using the external bug tracker.

In response to this:

Catching up with openshift/api#2022. Generated with:

$ go get github.com/openshift/api@master
$ go mod tidy
$ go mod vendor
$ git add -A go.* vendor

all using:

$ go version
go version go1.22.2 linux/amd64

This addresses OCPBUGS-41111:

$ cat v4.17-basecap.yaml
---
apiVersion: v1
platform:
 gcp:
   foo: bar
capabilities:
 baselineCapabilitySet: v4.17
$ ./oc adm release extract --install-config v4.17-basecap.yaml --included --credentials-requests --from quay.io/openshift-release-dev/ocp-release:4.17.0-rc.1-x86_64 --to /tmp/test
 error: unrecognized baselineCapabilitySet "v4.17"

because pkg/cli/admin/release/extract_tools.go uses the vendored openshift/api/config/v1 to unpack capabilities.

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 wking deleted the v4.17-capability-set branch October 14, 2024 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants