OCPBUGS-7960: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates #1354
Conversation
…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 578fa80a8162d0cdfc6cb277e7b09c3bbad81444 pkg/cli/admin/upgrade/OWNERS 100644 blob e2418c1a0b931f4d444154a6b180855431bba72d pkg/cli/admin/upgrade/upgrade.go 100644 blob 581af58611b0b4c11d5a6a2fbb9e14796e869ce4 pkg/cli/admin/upgrade/upgrade_test.go $ git ls-tree -r origin/release-4.9 -- pkg/cli/admin/upgrade 100644 blob 578fa80a8162d0cdfc6cb277e7b09c3bbad81444 pkg/cli/admin/upgrade/OWNERS 100644 blob b427176401a5ec5973468dc569442fed04701744 pkg/cli/admin/upgrade/channel/channel.go 100644 blob 2bbf9da0afe7cfca1cc5d7317e6b99dc374e5328 pkg/cli/admin/upgrade/upgrade.go 100644 blob 581af58611b0b4c11d5a6a2fbb9e14796e869ce4 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-cherrypick-robot: Jira Issue OCPBUGS-7780 has been cloned as Jira Issue OCPBUGS-7960. Retitling PR to link against new bug. In response to this:
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
bot
changed the title
|
@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request. In response to this:
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
added
jira/severity-moderate
|
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-7960, which is valid. The bug has been moved to the POST state. 6 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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. |
|
/retitle OCPBUGS-7960: pkg/cli/admin/upgrade/channel: Use PATCH instead of POST for spec updates |
openshift-ci
bot
changed the title
|
@openshift-cherrypick-robot: No Bugzilla bug is referenced in the title of this pull request. Retaining the bugzilla/valid-bug label as it was manually added. In response to this:
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. |
|
[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
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
/label backport-risk-assessed |
openshift-ci
bot
added
the
backport-risk-assessed
|
/label cherry-pick-approved |
openshift-ci
bot
added
the
cherry-pick-approved
|
@openshift-cherrypick-robot: all tests passed! 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/test-infra repository. I understand the commands that are listed here. |
|
@openshift-cherrypick-robot: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-7960 has been moved to the MODIFIED state. In response to this:
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. |
|
/cherry-pick release-4.11 |
|
@wking: new pull request created: #1360 In response to this:
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. |
This is an automated cherry-pick of #1346
/assign wking