Merge pull request #1434 from jewzaam/version-bump

Bump 4.{5,6}.z, drop 4.3

pkg/monitor/cluster/clusterversions_test.go

@@ -53,20 +53,20 @@ func TestEmitClusterVersion(t *testing.T) {
 				},
 				Status: configv1.ClusterVersionStatus{
 					Desired: configv1.Release{
-						Version: "4.3.3",
+						Version: "4.5.3",
 					},
 					History: []configv1.UpdateHistory{
 						{
 							State:   configv1.PartialUpdate,
-							Version: "4.3.2",
+							Version: "4.5.2",
 						},
 						{
 							State:   configv1.CompletedUpdate,
-							Version: "4.3.1",
+							Version: "4.5.1",
 						},
 						{
 							State:   configv1.CompletedUpdate,
-							Version: "4.3.0",
+							Version: "4.5.0",
 						},
 					},
 				},
@@ -74,10 +74,10 @@ func TestEmitClusterVersion(t *testing.T) {
 			oc: &api.OpenShiftCluster{
 				Properties: api.OpenShiftClusterProperties{},
 			},
-			wantActualVersion:                        "4.3.1",
-			wantDesiredVersion:                       "4.3.3",
+			wantActualVersion:                        "4.5.1",
+			wantDesiredVersion:                       "4.5.3",
 			wantProvisionedByResourceProviderVersion: "",
-			wantAvailableVersion:                     "4.3.40",
+			wantAvailableVersion:                     "4.5.36",
 			wantAvailableRP:                          "unknown",
 		},
 		{
@@ -88,19 +88,19 @@ func TestEmitClusterVersion(t *testing.T) {
 				},
 				Spec: configv1.ClusterVersionSpec{
 					DesiredUpdate: &configv1.Update{
-						Version: "4.3.4",
+						Version: "4.5.4",
 					},
 				},
 				Status: configv1.ClusterVersionStatus{
 					Desired: configv1.Release{
-						Version: "4.3.3",
+						Version: "4.5.3",
 					},
 				},
 			},
 			oc: &api.OpenShiftCluster{
 				Properties: api.OpenShiftClusterProperties{},
 			},
-			wantDesiredVersion:                       "4.3.4",
+			wantDesiredVersion:                       "4.5.4",
 			wantProvisionedByResourceProviderVersion: "",
 			wantAvailableRP:                          "unknown",
 		},
@@ -170,15 +170,15 @@ func TestEmitClusterVersion(t *testing.T) {
 
 func TestBaselineVersion(t *testing.T) {
 	streams := []*version.Stream{
-		{
-			Version: version.NewVersion(4, 3, 18),
-		},
 		{
 			Version: version.NewVersion(4, 4, 38),
 		},
 		{
 			Version: version.NewVersion(4, 5, 2),
 		},
+		{
+			Version: version.NewVersion(4, 6, 17),
+		},
 	}
 
 	for _, tt := range []struct {
@@ -192,12 +192,12 @@ func TestBaselineVersion(t *testing.T) {
 					History: []configv1.UpdateHistory{
 						{
 							State:   configv1.CompletedUpdate,
-							Version: "4.3.2",
+							Version: "4.4.2",
 						},
 					},
 				},
 			},
-			want: "4.3.18",
+			want: "4.4.38",
 		},
 		{
 			cv: configv1.ClusterVersion{
@@ -241,7 +241,7 @@ func TestBaselineVersion(t *testing.T) {
 	} {
 		bVersion := availableVersion(&tt.cv, streams)
 		if bVersion != tt.want {
-			t.Fatalf("Upgrade version does not match: %s\n", bVersion)
+			t.Fatalf("Upgrade version does not match. want==%s, got==%s\n", tt.want, bVersion)
 		}
 	}
 }

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\x34\xe7\x02\x04\x00\x00\xff\xff\xdf\x69\x11\xc7\x07\x00\x00\x00")
+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")
 
 func assets_versionBytes() ([]byte, error) {
 	return bindataRead(

pkg/util/dynamichelper/discovery/cache/assets_version

@@ -1 +1 @@
-4.6.17
+4.6.21

pkg/util/version/const.go

@@ -13,8 +13,8 @@ var GitCommit = "unknown"
 
 // InstallStream describes stream we are defaulting to for all new clusters
 var InstallStream = &Stream{
-	Version:  NewVersion(4, 6, 17),
-	PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:a7b23f38d1e5be975a6b516739689673011bdfa59a7158dc6ca36cefae169c18",
+	Version:  NewVersion(4, 6, 21),
+	PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:6ae80e777c206b7314732aff542be105db892bf0e114a6757cb9e34662b8f891",
 }
 
 // Streams describes list of streams we support for upgrades
@@ -22,17 +22,13 @@ var (
 	Streams = []*Stream{
 		InstallStream,
 		{
-			Version:  NewVersion(4, 5, 31),
-			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:27951dd757d472bf913daaffa548b865e87968831ca6f42c1f6946f7dcf0564e",
+			Version:  NewVersion(4, 5, 36),
+			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:cf535bc369b14350a823490157182e00b658f1b7028e2c80a1be3a6304b20ece",
 		},
 		{
 			Version:  NewVersion(4, 4, 33),
 			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:a035dddd8a5e5c99484138951ef4aba021799b77eb9046f683a5466c23717738",
 		},
-		{
-			Version:  NewVersion(4, 3, 40),
-			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:9ff90174a170379e90a9ead6e0d8cf6f439004191f80762764a5ca3dbaab01dc",
-		},
 	}
 )
 
@@ -43,10 +39,12 @@ func FluentbitImage(acrDomain string) string {
 
 // MdmImage contains the location of the MDM container image
 func MdmImage(acrDomain string) string {
-	return acrDomain + "/genevamdm:master_20210201.2"
+	// for the latest version see https://genevamondocs.azurewebsites.net/collect/references/linuxcontainers.html?q=container
+	return acrDomain + "/genevamdm:master_20210401.1"
 }
 
 // MdsdImage contains the location of the MDSD container image
 func MdsdImage(acrDomain string) string {
-	return acrDomain + "/genevamdsd:master_20210201.2"
+	// for the latest version see https://genevamondocs.azurewebsites.net/collect/references/linuxcontainers.html?q=container
+	return acrDomain + "/genevamdsd:master_20210401.1"
 }