Skip to content

Commit

Permalink
ci-operator/config/openshift/release: Float 4.10's oldest-supported-c…
Browse files Browse the repository at this point in the history
…redentials-request

Since fc.2, [1,2] landed dropping some:

  include.release.openshift.io/ibm-cloud-managed: "true"

annotations.  ibm-cloud-managed clusters do not run an in-cluster
cloud-credential operator, so they are all manual-mode credential
management.  And ccoctl, the manual management tool, is currently
oblivious to cluster profiles [3].  So there's no functional impact on
anyone to this change, and we'd like to bump the pinned version to
explicitly allow it, while still detecting any future cred changes in
4.10.

Unfortunately, ci-operator does not seem to have a releases entry type
that would allow us to say:

  oldest-supported-credentials-request:
    image: registry.ci.openshift.org/ocp/release:4.10.0-0.ci-2022-01-26-071949

or anything similar.  The supported release types are [4]:

* integration, which seems to be down in the ImageStream level.
* candidate, which gets us to the nightly stream, but which only
  accepts a 'rel' offset, not an explicit release name.
* prerelease, which is looking at 4-stable [5], which does not include
  nightlies.
* release [6], which fetches from the official OpenShift Update
  Service [7], which does not include nightlies.

So instead of pinning a nightly, I'm just floating the "frozen"
version one nightly behind the version being considered.  Once we get
an fc.3 we can pin this back down again.

[1]: openshift/cluster-network-operator#1280
[2]: https://bugzilla.redhat.com/show_bug.cgi?id=2041989
[3]: https://issues.redhat.com/browse/CCO-178
[4]: https://github.com/openshift/ci-tools/blob/87153c5ab0013fe34b7dcf5570920cca9f9454c8/pkg/api/types.go#L218-L278
[5]: https://github.com/openshift/ci-tools/blob/87153c5ab0013fe34b7dcf5570920cca9f9454c8/pkg/release/prerelease/client.go#L19
[6]: https://github.com/openshift/ci-tools/blob/87153c5ab0013fe34b7dcf5570920cca9f9454c8/pkg/api/types.go#L328-L337
[7]: https://github.com/openshift/ci-tools/blob/87153c5ab0013fe34b7dcf5570920cca9f9454c8/pkg/release/official/client.go#L19
  • Loading branch information
wking committed Jan 26, 2022
1 parent 004e47c commit 7d13b70
Showing 1 changed file with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,11 @@ releases:
stream: nightly
version: "4.10"
oldest-supported-credentials-request:
release:
channel: candidate
version: 4.10.0-fc.2
candidate:
product: ocp
relative: 2
stream: nightly
version: "4.10"
oldest-supported-z-rollback:
release:
channel: candidate
Expand Down

0 comments on commit 7d13b70

Please sign in to comment.