OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates #1360

openshift-cherrypick-robot · 2023-03-02T04:27:13Z

This is an automated cherry-pick of #1354

/assign wking

…ates Like 123fa58 (pkg/cli/admin/upgrade: Use PATCH instead of POST for spec updates, 2022-04-14, openshift#1111), but for the 'channel' subcommand. 123fa58 described the general risk of using POST/Update when the local 'oc' client may not be aware of some new spec properties. For the 'channel' subcommand specifically, it was added in 4.9: $ git ls-tree -r origin/release-4.8 -- pkg/cli/admin/upgrade 100644 blob 578fa80 pkg/cli/admin/upgrade/OWNERS 100644 blob e2418c1 pkg/cli/admin/upgrade/upgrade.go 100644 blob 581af58 pkg/cli/admin/upgrade/upgrade_test.go $ git ls-tree -r origin/release-4.9 -- pkg/cli/admin/upgrade 100644 blob 578fa80 pkg/cli/admin/upgrade/OWNERS 100644 blob b427176 pkg/cli/admin/upgrade/channel/channel.go 100644 blob 2bbf9da pkg/cli/admin/upgrade/upgrade.go 100644 blob 581af58 pkg/cli/admin/upgrade/upgrade_test.go And between 4.9 and the present, ClusterVersion spec grew the 'capabilities' property: $ git diff origin/release-4.9..origin/master -- vendor/github.com/openshift/api/config/v1/types_cluster_version.go | grep -v // | grep -A10 Spec @@ -45,8 +45,17 @@ type ClusterVersionSpec struct { @@ -68,6 +77,12 @@ type ClusterVersionSpec struct { Channel string `json:"channel,omitempty"` + Capabilities *ClusterVersionCapabilitiesSpec `json:"capabilities,omitempty"` + @@ -113,6 +128,9 @@ type ClusterVersionStatus struct { ... That property landed in 4.11: $ git --no-pager grep -c ClusterVersionCapabilitiesSpec origin/release-4.10 vendor/github.com/openshift/api/config/v1/types_cluster_version.go ...no hits... $ git --no-pager grep -c ClusterVersionCapabilitiesSpec origin/release-4.11 vendor/github.com/openshift/api/config/v1/types_cluster_version.go origin/release-4.11:vendor/github.com/openshift/api/config/v1/types_cluster_version.go:3 So I suspect 4.9 and 4.10 oc calls to 'oc adm upgrade channel ...' for 4.11+ clusters would clear spec.capabilities. Not all that many clusters try to restrict capabilities, but folks will need to bump their channel for at least every other minor (if their using EUS channels), and while we recommend folks use an oc from the 4.y they're heading towards, we don't have anything in place to enforce that.

openshift-ci-robot · 2023-03-02T04:27:23Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-7960 has been cloned as Jira Issue OCPBUGS-8205. Retitling PR to link against new bug.
/retitle [release-4.11] OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates

Details

In response to this:

This is an automated cherry-pick of #1354

/assign wking

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-03-02T04:27:37Z

@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

[release-4.11] OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates

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-03-02T04:27:40Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-8205, which is invalid:

expected dependent Jira Issue OCPBUGS-7960 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ON_QA 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:

This is an automated cherry-pick of #1354

/assign wking

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.

wking

/retitle OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates
/lgtm

openshift-ci · 2023-03-02T04:28:18Z

@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Details

In response to this:

OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates

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-03-02T04:28:43Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, 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:

~~pkg/cli/admin/upgrade/OWNERS~~ [wking]

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

ingvagabund · 2023-03-02T10:03:47Z

/label backport-risk-assessed

wking · 2023-03-04T02:43:00Z

/jira refresh

openshift-ci-robot · 2023-03-04T02:43:05Z

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

expected dependent Jira Issue OCPBUGS-7960 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but it is ON_QA 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:

/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 kubernetes/test-infra repository.

wking · 2023-03-06T06:36:52Z

/jira refresh

openshift-ci-robot · 2023-03-06T06:36:59Z

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

6 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.11.z) matches configured target version for branch (4.11.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
dependent bug Jira Issue OCPBUGS-7960 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
dependent Jira Issue OCPBUGS-7960 targets the "4.12.z" version, which is one of the valid target versions: 4.12.0, 4.12.z
bug has dependents

Requesting review from QA contact:
/cc @zhouying7780

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 kubernetes/test-infra repository.

kasturinarra · 2023-03-07T06:36:40Z

/label cherry-pick-approved

openshift-ci-robot · 2023-03-07T06:57:02Z

/retest-required

Remaining retests: 0 against base HEAD 1928ac4 and 2 for PR HEAD 0aba3de in total

openshift-ci-robot · 2023-03-20T18:42:32Z

/retest-required

Remaining retests: 0 against base HEAD 1928ac4 and 2 for PR HEAD 0aba3de in total

openshift-ci · 2023-03-20T20:48:33Z

@openshift-cherrypick-robot: 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/test-infra repository. I understand the commands that are listed here.

openshift-ci-robot · 2023-03-20T20:55:29Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-8205: All pull requests linked via external trackers have merged:

openshift/oc#1360

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

Details

In response to this:

This is an automated cherry-pick of #1354

/assign wking

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.

wking · 2023-03-23T05:52:28Z

/cherrypick release-4.10

openshift-cherrypick-robot · 2023-03-23T05:53:15Z

@wking: new pull request created: #1379

Details

In response to this:

/cherrypick release-4.10

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-cherrypick-robot mentioned this pull request Mar 2, 2023

OCPBUGS-7960: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates #1354

Merged

openshift-cherrypick-robot assigned wking Mar 2, 2023

openshift-ci bot changed the title ~~[release-4.11] OCPBUGS-7960: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates~~ [release-4.11] OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates Mar 2, 2023

openshift-ci bot requested review from deads2k and soltysh March 2, 2023 04:27

wking approved these changes Mar 2, 2023

View reviewed changes

openshift-ci bot changed the title ~~[release-4.11] OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates~~ OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates Mar 2, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 2, 2023

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 2, 2023

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 2, 2023

openshift-ci bot assigned evakhoni, kasturinarra, xingxingxia and zhouying7780 Mar 2, 2023

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Mar 6, 2023

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

openshift-ci bot requested a review from zhouying7780 March 6, 2023 06:37

openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 7, 2023

openshift-merge-robot merged commit 21e80cd into openshift:release-4.11 Mar 20, 2023

openshift-cherrypick-robot mentioned this pull request Mar 23, 2023

OCPBUGS-10750: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates #1379

Merged

OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates #1360

OCPBUGS-8205: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates #1360

Uh oh!

Conversation

openshift-cherrypick-robot commented Mar 2, 2023

Uh oh!

openshift-ci-robot commented Mar 2, 2023

Uh oh!

openshift-ci bot commented Mar 2, 2023

Uh oh!

openshift-ci-robot commented Mar 2, 2023

Uh oh!

wking left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Mar 2, 2023

Uh oh!

openshift-ci bot commented Mar 2, 2023

Uh oh!

ingvagabund commented Mar 2, 2023

Uh oh!

wking commented Mar 4, 2023

Uh oh!

openshift-ci-robot commented Mar 4, 2023

Uh oh!

wking commented Mar 6, 2023

Uh oh!

openshift-ci-robot commented Mar 6, 2023

Uh oh!

kasturinarra commented Mar 7, 2023

Uh oh!

openshift-ci-robot commented Mar 7, 2023

Uh oh!

openshift-ci-robot commented Mar 20, 2023

Uh oh!

openshift-ci bot commented Mar 20, 2023

Uh oh!

openshift-ci-robot commented Mar 20, 2023

Uh oh!

wking commented Mar 23, 2023

Uh oh!

openshift-cherrypick-robot commented Mar 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants