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-33983: vendor: Update openshift/api to pick up zz_generated.crd-manifests #1045

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

wking
Copy link
Member

@wking wking commented Apr 30, 2024

Catching up with the YAML getting shifted into a subdirectory (openshift/api#1814). I followed the new docs to create pkg/dependencymagnet, and then:

$ emacs pkg/featuregates/featuregates.go pkg/featuregates/featurechangestopper_test.go # configv1.FeatureGateUpgradeStatus -> features.FeatureGateUpgradeStatus
$ go get github.com/openshift/api@master github.com/openshift/library-go@master
$ go mod tidy
$ go mod vendor
$ sed -i 's|config/v1/0000_00_cluster-version-operator|config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator|g' $(git grep -l 0000_00_cluster-version-operator)
$ git add -A Dockerfile* hack/test-prerequisites.go pkg/dependencymagnet go.* vendor

all using:

$ go version
go version go1.22.2 linux/amd64

A few points on the invocation:

  • I usually use go get -u ..., e.g. in a98232f (OTA-917: pkg/customsignaturestore: Implement signatureStores customization #994), but in this case, that would pull in k8s.io/api@v0.30.0, and we want to stick with 0.29 until our release-4.16 branch stops following this development branch.

  • I'm explicitly bumping library-go, because if I don't, builds fail on:

    Building github.com/openshift/cluster-version-operator (v1.0.0-1203-g258de3f7-dirty)
    # github.com/openshift/library-go/pkg/manifest
    vendor/github.com/openshift/library-go/pkg/manifest/manifest.go:32:35: undefined: configv1.FeatureSets
    # github.com/openshift/cluster-version-operator/pkg/featuregates
    pkg/featuregates/featuregates.go:92:32: undefined: configv1.FeatureGateUpgradeStatus
    pkg/featuregates/featuregates.go:97:33: undefined: configv1.FeatureGateUpgradeStatus
    

    If I had been able to use -u, library-go would have automatically floated to the tip commit anyway. But either way, I still needed to make manual changes to keep up with NO-JIRA: move featuregate definitions to a new package api#1821 moving to the new openshift/api/features package.

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 30, 2024

@wking: This pull request references OTA-1282 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 story to target the "4.16.0" version, but no target version was set.

In response to this:

Catching up with the YAML getting shifted into a subdirectory (openshift/api#1814). I followed the new docs to create pkg/dependencymagnet, and then:

$ go get -u github.com/openshift/api@master
$ go mod tidy
$ go mod vendor
$ sed -i 's|config/v1/0000_00_cluster-version-operator|config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator|g' $(git grep -l 0000_00_cluster-version-operator)
$ git add -A Dockerfile* hack/test-prerequisites.go pkg/dependencymagnet go.* vendor

all using:

$ go version
go version go1.22.2 linux/amd64

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-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 30, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 30, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 30, 2024

@wking: This pull request references OTA-1282 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 story to target the "4.16.0" version, but no target version was set.

In response to this:

Catching up with the YAML getting shifted into a subdirectory (openshift/api#1814). I followed the new docs to create pkg/dependencymagnet, and then:

$ go get github.com/openshift/api@master
$ go mod tidy
$ go mod vendor
$ sed -i 's|config/v1/0000_00_cluster-version-operator|config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator|g' $(git grep -l 0000_00_cluster-version-operator)
$ git add -A Dockerfile* hack/test-prerequisites.go pkg/dependencymagnet go.* vendor

all using:

$ go version
go version go1.22.2 linux/amd64

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 force-pushed the api-bump-move-crds branch 2 times, most recently from 4f7c3d1 to f995620 Compare April 30, 2024 20:21
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 30, 2024

@wking: This pull request references OTA-1282 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 story to target the "4.16.0" version, but no target version was set.

In response to this:

Catching up with the YAML getting shifted into a subdirectory (openshift/api#1814). I followed the new docs to create pkg/dependencymagnet, and then:

$ emacs pkg/featuregates/featuregates.go pkg/featuregates/featurechangestopper_test.go # configv1.FeatureGateUpgradeStatus -> features.FeatureGateUpgradeStatus
$ go get github.com/openshift/api@master github.com/openshift/library-go@master
$ go mod tidy
$ go mod vendor
$ sed -i 's|config/v1/0000_00_cluster-version-operator|config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator|g' $(git grep -l 0000_00_cluster-version-operator)
$ git add -A Dockerfile* hack/test-prerequisites.go pkg/dependencymagnet go.* vendor

all using:

$ go version
go version go1.22.2 linux/amd64

A few points on the invocation:

  • I usually use go get -u ..., e.g. in a98232f (OTA-917: pkg/customsignaturestore: Implement signatureStores customization #994), but in this case, that would pull in k8s.io/api@v0.30.0, and we want to stick with 0.29 until our release-4.16 branch stops following this development branch.

  • I'm explicitly bumping library-go, because if I don't, builds fail on:

    Building github.com/openshift/cluster-version-operator (v1.0.0-1203-g258de3f7-dirty)
    # github.com/openshift/library-go/pkg/manifest
    vendor/github.com/openshift/library-go/pkg/manifest/manifest.go:32:35: undefined: configv1.FeatureSets
    # github.com/openshift/cluster-version-operator/pkg/featuregates
    pkg/featuregates/featuregates.go:92:32: undefined: configv1.FeatureGateUpgradeStatus
    pkg/featuregates/featuregates.go:97:33: undefined: configv1.FeatureGateUpgradeStatus
    

    If I had been able to use -u, library-go would have automatically floated to the tip commit anyway. But either way, I still needed to make manual changes to keep up with NO-JIRA: move featuregate definitions to a new package api#1821 moving to the new openshift/api/features package.

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.

Catching up with the YAML getting shifted into a subdirectory [1].  I
followed the new docs from [2] to create pkg/dependencymagnet, and
then:

  $ emacs pkg/featuregates/featuregates.go pkg/featuregates/featurechangestopper_test.go # configv1.FeatureGateUpgradeStatus -> features.FeatureGateUpgradeStatus
  $ go get github.com/openshift/api@master github.com/openshift/library-go@master
  $ go mod tidy
  $ go mod vendor
  $ sed -i 's|config/v1/0000_00_cluster-version-operator|config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator|g' $(git grep -l 0000_00_cluster-version-operator)
  $ git add -A Dockerfile* hack/test-prerequisites.go pkg/dependencymagnet go.* vendor

all using:

  $ go version
  go version go1.22.2 linux/amd64

A few points on the invocation:

* I usually use 'go get -u ...', e.g. a98232f (vendor: Bump
  openshift/api to pick up signatureStores, 2023-12-04, openshift#994), but in
  this case, that would pull in k8s.io/api@v0.30.0, and we want to
  stick with 0.29 until our release-4.16 branch stops following this
  development branch.

* I'm explicitly bumping library-go, because if I don't, builds fail on [3]:

    Building github.com/openshift/cluster-version-operator (v1.0.0-1203-g258de3f7-dirty)
    # github.com/openshift/library-go/pkg/manifest
    vendor/github.com/openshift/library-go/pkg/manifest/manifest.go:32:35: undefined: configv1.FeatureSets
    # github.com/openshift/cluster-version-operator/pkg/featuregates
    pkg/featuregates/featuregates.go:92:32: undefined: configv1.FeatureGateUpgradeStatus
    pkg/featuregates/featuregates.go:97:33: undefined: configv1.FeatureGateUpgradeStatus

  If I had been able to use -u, library-go would have automatically
  floated to the tip commit anyway.  But either way, I still needed to
  make manual changes to keep up with [4] moving to the new
  openshift/api/features package.

[1]: openshift/api#1814
[2]: openshift/api@06baaa4#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R211
[3]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_cluster-version-operator/1045/pull-ci-openshift-cluster-version-operator-master-images/1785396933666279424#1:build-log.txt%3A74-79
[4]: openshift/api#1821
@wking
Copy link
Member Author

wking commented May 1, 2024

OSProvisioningTimedOut is just Azure being slow, and it's orthogonal to my change:

/retest-required

@PratikMahajan
Copy link
Contributor

LGTM

Copy link
Member

@petr-muller petr-muller left a comment

Choose a reason for hiding this comment

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

/retest-required

@wking
Copy link
Member Author

wking commented May 2, 2024

Still pointing at last-Tuesday's run?

/retest-required

@wking
Copy link
Member Author

wking commented May 8, 2024

/retest-required

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2024
Copy link
Contributor

openshift-ci bot commented May 8, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: petr-muller, wking

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

@wking
Copy link
Member Author

wking commented May 10, 2024

/retest-required

@shellyyang1989
Copy link
Contributor

/retest

@petr-muller
Copy link
Member

/retest-required

@petr-muller
Copy link
Member

/retest

Copy link
Contributor

openshift-ci bot commented May 15, 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-agnostic-operator 855432b link true /test e2e-agnostic-operator
ci/prow/e2e-agnostic-ovn 855432b link true /test e2e-agnostic-ovn
ci/prow/e2e-agnostic-ovn-upgrade-out-of-change 855432b link true /test e2e-agnostic-ovn-upgrade-out-of-change

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.

@petr-muller
Copy link
Member

OK now it starts to be weirdly persistent: we get OSProvisioningTimedOut consistently over a week, across three different jobs. search.ci shows shows hits only on this PR. But I really do not see how could a PR in our repository cause this 🤔

I had two hypotheses but I had to rule them out:

@wking
Copy link
Member Author

wking commented May 20, 2024

I moved the Jira ticket to a bug, now that we'll need to backport this to 4.16 (to set the ground for any other 4.16 bugs that need an API-repo vendor bump).

/retitle OCPBUGS-33983: vendor: Update openshift/api to pick up zz_generated.crd-manifests

@openshift-ci openshift-ci bot changed the title OTA-1282: vendor: Update openshift/api to pick up zz_generated.crd-manifests OCPBUGS-33983: vendor: Update openshift/api to pick up zz_generated.crd-manifests May 20, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label May 20, 2024
@openshift-ci-robot
Copy link
Contributor

@wking: This pull request references Jira Issue OCPBUGS-33983, 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.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

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

In response to this:

Catching up with the YAML getting shifted into a subdirectory (openshift/api#1814). I followed the new docs to create pkg/dependencymagnet, and then:

$ emacs pkg/featuregates/featuregates.go pkg/featuregates/featurechangestopper_test.go # configv1.FeatureGateUpgradeStatus -> features.FeatureGateUpgradeStatus
$ go get github.com/openshift/api@master github.com/openshift/library-go@master
$ go mod tidy
$ go mod vendor
$ sed -i 's|config/v1/0000_00_cluster-version-operator|config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator|g' $(git grep -l 0000_00_cluster-version-operator)
$ git add -A Dockerfile* hack/test-prerequisites.go pkg/dependencymagnet go.* vendor

all using:

$ go version
go version go1.22.2 linux/amd64

A few points on the invocation:

  • I usually use go get -u ..., e.g. in a98232f (OTA-917: pkg/customsignaturestore: Implement signatureStores customization #994), but in this case, that would pull in k8s.io/api@v0.30.0, and we want to stick with 0.29 until our release-4.16 branch stops following this development branch.

  • I'm explicitly bumping library-go, because if I don't, builds fail on:

    Building github.com/openshift/cluster-version-operator (v1.0.0-1203-g258de3f7-dirty)
    # github.com/openshift/library-go/pkg/manifest
    vendor/github.com/openshift/library-go/pkg/manifest/manifest.go:32:35: undefined: configv1.FeatureSets
    # github.com/openshift/cluster-version-operator/pkg/featuregates
    pkg/featuregates/featuregates.go:92:32: undefined: configv1.FeatureGateUpgradeStatus
    pkg/featuregates/featuregates.go:97:33: undefined: configv1.FeatureGateUpgradeStatus
    

    If I had been able to use -u, library-go would have automatically floated to the tip commit anyway. But either way, I still needed to make manual changes to keep up with NO-JIRA: move featuregate definitions to a new package api#1821 moving to the new openshift/api/features package.

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.

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-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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants