Skip to content

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

Closed
wking wants to merge 1 commit intoopenshift:masterfrom
wking:v4.17-capability-set
Closed

OCPBUGS-41111: vendor: Update openshift/api to pick up v4.17 and v4.18 capability sets#9002
wking wants to merge 1 commit intoopenshift:masterfrom
wking:v4.17-capability-set

Conversation

@wking
Copy link
Copy Markdown
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
$ go generate ./pkg/types/installconfig.go
$ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

$ go version
go version go1.23.1 linux/amd64

This will allow users to use the new capability sets in their install-config YAML.

@wking wking changed the title OCPBUGS-31111: vendor: Update openshift/api to pick up v4.17 and v4.18 capability sets OCPBUGS-41111: vendor: Update openshift/api to pick up v4.17 and v4.18 capability sets Sep 12, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 12, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@wking: This pull request references Jira Issue OCPBUGS-31111, which is invalid:

  • expected the bug to be open, but it isn't
  • expected the bug to target either version "4.18." or "openshift-4.18.", but it targets "4.16.0" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Closed (Done-Errata) instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

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

Details

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
$ go generate ./pkg/types/installconfig.go
$ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

$ go version
go version go1.22.2 linux/amd64

This will allow users to use the new capability sets in their install-config YAML.

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 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. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 12, 2024
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@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.

Details

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
$ go generate ./pkg/types/installconfig.go
$ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

$ go version
go version go1.22.2 linux/amd64

This will allow users to use the new capability sets in their install-config YAML.

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.

Comment thread go.sum Outdated
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2024
@wking wking force-pushed the v4.17-capability-set branch from 9d1f82a to df2b317 Compare September 13, 2024 21:06
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 13, 2024
Catching up with [1].  Generated with:

  $ go get github.com/openshift/api@master
  $ go mod tidy
  $ go mod vendor
  $ go generate ./pkg/types/installconfig.go
  $ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

  $ go version
  go version go1.23.1 linux/amd64

This will allow users to use the new capability sets in their install-config YAML.

[1]: openshift/api#2022
@wking wking force-pushed the v4.17-capability-set branch from df2b317 to d8fe2d1 Compare September 13, 2024 21:11
wking added a commit to wking/openshift-installer that referenced this pull request Sep 13, 2024
Catching up with [1], and a backport-ish of 9d1f82a8ec (vendor: Update
openshift/api to pick up v4.17 and v4.18 capability sets, 2024-09-12, openshift#9002).
Generated with:

  $ GOPROXY=direct go get github.com/openshift/api@release-4.17
  $ go mod tidy
  $ go mod vendor
  $ go generate ./pkg/types/installconfig.go
  $ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

  $ go version
  go version go1.23.1 linux/amd64

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

  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 will allow users to use the new capability sets in their install-config YAML.

[1]: openshift/api#2023
[2]: https://proxy.golang.org/
@jiajliu
Copy link
Copy Markdown
Contributor

jiajliu commented Sep 14, 2024

//build 4.18.0-0.nightly-2024-09-13-024933, #9002
Trigger ipi installation with above payload while setting baselineCapabilitySet: v4.18 in install-config.yaml, installation succeed.

---
apiVersion: v1
...
capabilities:
  baselineCapabilitySet: v4.18
...

# ./oc get clusterversion
NAME      VERSION                                                AVAILABLE   PROGRESSING   SINCE   STATUS
version   4.18.0-0.test-2024-09-14-034633-ci-ln-0wbzf1b-latest   True        False         16m     Cluster version is 4.18.0-0.test-2024-09-14-034633-ci-ln-0wbzf1b-latest

# ./oc get clusterversion version -ojson|jq .status.capabilities
{
  "enabledCapabilities": [
    "Build",
    "CSISnapshot",
    "CloudControllerManager",
    "CloudCredential",
    "Console",
    "DeploymentConfig",
    "ImageRegistry",
    "Ingress",
    "Insights",
    "MachineAPI",
    "NodeTuning",
    "OperatorLifecycleManager",
    "Storage",
    "baremetal",
    "marketplace",
    "openshift-samples"
  ],
  "knownCapabilities": [
    "Build",
    "CSISnapshot",
    "CloudControllerManager",
    "CloudCredential",
    "Console",
    "DeploymentConfig",
    "ImageRegistry",
    "Ingress",
    "Insights",
    "MachineAPI",
    "NodeTuning",
    "OperatorLifecycleManager",
    "Storage",
    "baremetal",
    "marketplace",
    "openshift-samples"
  ]
}

# ./oc get CustomResourceDefinition clusterversions.config.openshift.io -oyaml|grep baselineCapabilitySet: -A15
                  baselineCapabilitySet:
                    description: baselineCapabilitySet selects an initial set of optional
                      capabilities to enable, which can be extended via additionalEnabledCapabilities.  If
                      unset, the cluster will choose a default, and the default may
                      change over time. The current default is vCurrent.
                    enum:
                    - None
                    - v4.11
                    - v4.12
                    - v4.13
                    - v4.14
                    - v4.15
                    - v4.16
                    - v4.17
                    - v4.18
                    - vCurrent

pre-merge verify pass, cc @jinyunma to confirm if any more test needed from installer side, thanks.

@jinyunma
Copy link
Copy Markdown
Contributor

Thanks @jiajliu , the pre-merge tests you did should be enough from installer perspective.

@jiajliu
Copy link
Copy Markdown
Contributor

jiajliu commented Sep 14, 2024

/label qe-approved

@openshift-ci openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Sep 14, 2024
@patrickdillon
Copy link
Copy Markdown
Contributor

/approve
/lgtm

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

openshift-ci Bot commented Sep 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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 Sep 16, 2024
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 16, 2024
@openshift-merge-robot
Copy link
Copy Markdown
Contributor

PR needs rebase.

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.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 3, 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-single-node 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-aws-ovn-single-node
ci/prow/e2e-external-aws-ccm 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-external-aws-ccm
ci/prow/e2e-aws-ovn-imdsv2 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-aws-ovn-imdsv2
ci/prow/e2e-gcp-ovn-xpn 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-gcp-ovn-xpn
ci/prow/e2e-gcp-ovn-byo-vpc 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-gcp-ovn-byo-vpc
ci/prow/e2e-aws-ovn-edge-zones-manifest-validation 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link true /test e2e-aws-ovn-edge-zones-manifest-validation
ci/prow/e2e-aws-ovn-shared-vpc-edge-zones 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-aws-ovn-shared-vpc-edge-zones
ci/prow/e2e-aws-ovn-shared-vpc-custom-security-groups 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-aws-ovn-shared-vpc-custom-security-groups
ci/prow/e2e-gcp-ovn 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link true /test e2e-gcp-ovn
ci/prow/e2e-gcp-secureboot 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-gcp-secureboot
ci/prow/e2e-aws-ovn-fips 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-aws-ovn-fips
ci/prow/e2e-aws-ovn-heterogeneous 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-aws-ovn-heterogeneous
ci/prow/altinfra-e2e-aws-ovn 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test altinfra-e2e-aws-ovn
ci/prow/e2e-aws-ovn-edge-zones 9d1f82a8ecee799b69f50ebe7555eb1e1b2062c3 link false /test e2e-aws-ovn-edge-zones
ci/prow/verify-codegen d8fe2d1 link unknown /test verify-codegen
ci/prow/yaml-lint d8fe2d1 link unknown /test yaml-lint
ci/prow/e2e-aws-ovn d8fe2d1 link unknown /test e2e-aws-ovn
ci/prow/altinfra-images d8fe2d1 link unknown /test altinfra-images
ci/prow/tf-lint d8fe2d1 link unknown /test tf-lint
ci/prow/aro-unit d8fe2d1 link unknown /test aro-unit
ci/prow/golint d8fe2d1 link unknown /test golint
ci/prow/images d8fe2d1 link unknown /test images
ci/prow/unit d8fe2d1 link unknown /test unit
ci/prow/govet d8fe2d1 link unknown /test govet
ci/prow/artifacts-images d8fe2d1 link unknown /test artifacts-images
ci/prow/gofmt d8fe2d1 link unknown /test gofmt
ci/prow/shellcheck d8fe2d1 link unknown /test shellcheck
ci/prow/okd-verify-codegen d8fe2d1 link unknown /test okd-verify-codegen
ci/prow/okd-unit d8fe2d1 link unknown /test okd-unit
ci/prow/verify-vendor d8fe2d1 link unknown /test verify-vendor
ci/prow/integration-tests-nodejoiner d8fe2d1 link true /test integration-tests-nodejoiner

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.

@wking
Copy link
Copy Markdown
Member Author

wking commented Oct 14, 2024

The change I was trying to pull in got picked up in 6f8d40d (#9067), so we don't need this pull anymore.

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

@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.

Details

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
$ go generate ./pkg/types/installconfig.go
$ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

$ go version
go version go1.23.1 linux/amd64

This will allow users to use the new capability sets in their install-config YAML.

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 added a commit to wking/openshift-installer that referenced this pull request Nov 5, 2024
Catching up with [1], and a backport-ish of 9d1f82a8ec (vendor: Update
openshift/api to pick up v4.17 and v4.18 capability sets, 2024-09-12, openshift#9002).
Generated with:

  $ GOPROXY=direct go get github.com/openshift/api@release-4.17
  $ go mod tidy
  $ go mod vendor
  $ go generate ./pkg/types/installconfig.go
  $ git add -A go.* vendor data/data/install.openshift.io_installconfigs.yaml

all using:

  $ go version
  go version go1.23.1 linux/amd64

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

  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 will allow users to use the new capability sets in their install-config YAML.

[1]: openshift/api#2023
[2]: https://proxy.golang.org/
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/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. lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants