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

[wking]

Like 123fa58 (#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-ci-robot]

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

Requesting review from QA contact:
/cc @zhouying7780

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

Details

In response to this:

Like 123fa58 (#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.

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]

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

[LalatenduMohanty]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: LalatenduMohanty, 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 [LalatenduMohanty,wking]

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

[openshift-ci-robot]

@wking: All pull requests linked via external trackers have merged:

• openshift/oc#1346

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

Details

In response to this:

Like 123fa58 (#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.

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]

/cherrypick release-4.12

[openshift-cherrypick-robot]

@wking: new pull request created: #1354

Details

In response to this:

/cherrypick release-4.12

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.