From 965781ad4584be630b3877ea3a40cc6f1a5230f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 17 Aug 2023 12:23:44 -0400 Subject: [PATCH] version: Remove DefaultInstalStreams DefaultInstallStream will remain for now, but it's ONLY for use by local development mode until we can come up with a better solution. --- pkg/util/version/const.go | 46 ++++++--------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/pkg/util/version/const.go b/pkg/util/version/const.go index a3d57852d57..bfc696eb140 100644 --- a/pkg/util/version/const.go +++ b/pkg/util/version/const.go @@ -25,50 +25,18 @@ const ( var GitCommit = "unknown" -// DefaultMinorVersion describes the minor OpenShift version to default to -var DefaultMinorVersion = 11 - -// DefaultInstallStreams describes the latest version of our supported streams -var DefaultInstallStreams = map[int]*Stream{ - 10: { - Version: NewVersion(4, 10, 63), - PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:340091aefa0bba06bbb99cc58cb1f2b73404c832f72b83c526b8e7677efbecef", - }, - 11: { - Version: NewVersion(4, 11, 44), - PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:52cbfbbeb9cc03b49c2788ac7333e63d3dae14673e01a9d8e59270f3a8390ed3", - }, - 12: { - Version: NewVersion(4, 12, 25), - PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:5a4fb052cda1d14d1e306ce87e6b0ded84edddaa76f1cf401bcded99cef2ad84", - }, -} - -// DefaultInstallStream describes stream we are defaulting to for all new clusters -var DefaultInstallStream = DefaultInstallStreams[DefaultMinorVersion] - -var HiveInstallStreams = []*Stream{ - DefaultInstallStreams[10], - { - Version: NewVersion(4, 10, 54), - PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:7e44fa5f6aa15f9492341c4714bba4dc5089c968f2bf77fb8d4cdf189634f8f5", - }, - { - Version: NewVersion(4, 10, 40), - PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:b9fad814fb4442e7e852b0614d9bb4e2ebc5e1a2fa51623aa838b4ee0e4a5369", - }, - DefaultInstallStreams[11], - { - Version: NewVersion(4, 11, 26), - PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:1c3913a65b0a10b4a0650f54e545fe928360a94767acea64c0bd10faa52c945a", - }, - DefaultInstallStreams[12], +// Install stream data for production and INT has moved to RP-Config. +// This default is left here ONLY for use by local development mode, +// until we can come up with a better solution. +var DefaultInstallStream = Stream{ + Version: NewVersion(4, 11, 44), + PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:52cbfbbeb9cc03b49c2788ac7333e63d3dae14673e01a9d8e59270f3a8390ed3", } // UpgradeStreams describes list of streams we support for upgrades var ( UpgradeStreams = []*Stream{ - DefaultInstallStream, + &DefaultInstallStream, { Version: NewVersion(4, 9, 28), PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:4084d94969b186e20189649b5affba7da59f7d1943e4e5bc7ef78b981eafb7a8",