Repository: Azure/ARO-RP
Pull request #1473 (2021-05-03 15:04:26)

Bump to OCP 4.6.26
### Which issue this PR addresses:

Bumps OCP version to latest 4.6.26 to catch more upgrades in next RP release.

### What this PR does / why we need it:

For custom DNS bug fix we need to roll all nodes.  Upgrade is one way to do this.  By bumping OCP version we should catch more clusters in upgrade next RP round.

### Test plan for issue:

Existing tests.

### Is there any documentation that needs to be updated for this PR?

No.


Patch:
diff --git a/pkg/util/dynamichelper/discovery/bindata.go b/pkg/util/dynamichelper/discovery/bindata.go
index e07d73c39..a8cf7306e 100644
--- a/pkg/util/dynamichelper/discovery/bindata.go
+++ b/pkg/util/dynamichelper/discovery/bindata.go
@@ -334,7 +334,7 @@ func aroOpenshiftIoV1alpha1ServerresourcesJson() (*asset, error) {
 	return a, nil
 }
 
-var _assets_version = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x32\xd1\x33\xd3\x33\x32\xe4\x02\x04\x00\x00\xff\xff\x00\x70\x0d\x93\x07\x00\x00\x00")
+var _assets_version = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x32\xd1\x33\xd3\x33\x32\xe3\x02\x04\x00\x00\xff\xff\xc7\xe6\x4c\xdc\x07\x00\x00\x00")
 
 func assets_versionBytes() ([]byte, error) {
 	return bindataRead(
diff --git a/pkg/util/dynamichelper/discovery/cache/assets_version b/pkg/util/dynamichelper/discovery/cache/assets_version
index 1529b5150..521bb4f37 100644
--- a/pkg/util/dynamichelper/discovery/cache/assets_version
+++ b/pkg/util/dynamichelper/discovery/cache/assets_version
@@ -1,1 +1,1 @@
-4.6.21
+4.6.26
diff --git a/pkg/util/version/const.go b/pkg/util/version/const.go
index b8a2be1f9..321f700ef 100644
--- a/pkg/util/version/const.go
+++ b/pkg/util/version/const.go
@@ -18,8 +18,8 @@ var GitCommit = "unknown"
 
 // InstallStream describes stream we are defaulting to for all new clusters
 var InstallStream = &Stream{
-	Version:  NewVersion(4, 6, 21),
-	PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:6ae80e777c206b7314732aff542be105db892bf0e114a6757cb9e34662b8f891",
+	Version:  NewVersion(4, 6, 26),
+	PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:e867135cd5a09192635b46ccab6ca7543e642378dc72fa22ea54961b05e322f2",
 }
 
 // Streams describes list of streams we support for upgrades
@@ -27,8 +27,8 @@ var (
 	Streams = []*Stream{
 		InstallStream,
 		{
-			Version:  NewVersion(4, 5, 36),
-			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:cf535bc369b14350a823490157182e00b658f1b7028e2c80a1be3a6304b20ece",
+			Version:  NewVersion(4, 5, 38),
+			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:688ca8e365fbd4ee4cc8524e2732395560446d2ff90c3d9b8407b159c571ca1c",
 		},
 		{
 			Version:  NewVersion(4, 4, 33),


Test patch:
diff --git a/pkg/monitor/cluster/clusterversions_test.go b/pkg/monitor/cluster/clusterversions_test.go
index d0fd1d279..a09d664f1 100644
--- a/pkg/monitor/cluster/clusterversions_test.go
+++ b/pkg/monitor/cluster/clusterversions_test.go
@@ -77,7 +77,7 @@ func TestEmitClusterVersion(t *testing.T) {
 			wantActualVersion:                        "4.5.1",
 			wantDesiredVersion:                       "4.5.3",
 			wantProvisionedByResourceProviderVersion: "",
-			wantAvailableVersion:                     "4.5.36",
+			wantAvailableVersion:                     "4.5.38",
 			wantAvailableRP:                          "unknown",
 		},
 		{