Repository: Azure/ARO-RP
Pull request #1577 (2021-07-05 10:28:47)

Bump install versions
Updates our release versions for Z streams.



Patch:
diff --git a/pkg/util/dynamichelper/discovery/bindata.go b/pkg/util/dynamichelper/discovery/bindata.go
index 33d293d14..6f09482f2 100644
--- a/pkg/util/dynamichelper/discovery/bindata.go
+++ b/pkg/util/dynamichelper/discovery/bindata.go
@@ -340,7 +340,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\xd7\x33\x34\xe2\x02\x04\x00\x00\xff\xff\x2a\xb4\x06\x87\x07\x00\x00\x00")
+var _assets_version = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x32\xd1\x33\xd7\x33\xb4\xe0\x02\x04\x00\x00\xff\xff\xa0\x5c\xe9\x7d\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 aca932939..bdc778938 100644
--- a/pkg/util/dynamichelper/discovery/cache/assets_version
+++ b/pkg/util/dynamichelper/discovery/cache/assets_version
@@ -1,1 +1,1 @@
-4.7.12
+4.7.18
diff --git a/pkg/util/version/const.go b/pkg/util/version/const.go
index 51399af58..3b52873c9 100644
--- a/pkg/util/version/const.go
+++ b/pkg/util/version/const.go
@@ -20,8 +20,8 @@ var GitCommit = "unknown"
 
 // InstallStream describes stream we are defaulting to for all new clusters
 var InstallStream = &Stream{
-	Version:  NewVersion(4, 7, 12),
-	PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:2029c5779202293f23418d47a1a823c4e4c8539c1ab25e8bda30d48335b4892e",
+	Version:  NewVersion(4, 7, 18),
+	PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:afcb309425d45a240de2df8e376f9632e6144052177fd62a0347934657b3573f",
 }
 
 // Streams describes list of streams we support for upgrades
@@ -29,12 +29,12 @@ var (
 	Streams = []*Stream{
 		InstallStream,
 		{
-			Version:  NewVersion(4, 6, 26),
-			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:e867135cd5a09192635b46ccab6ca7543e642378dc72fa22ea54961b05e322f2",
+			Version:  NewVersion(4, 6, 36),
+			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:4205c6709ec4b8523eb18144f7c5bed17a32ba71348fd4c2b6ab43a636cf028e",
 		},
 		{
-			Version:  NewVersion(4, 5, 38),
-			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:688ca8e365fbd4ee4cc8524e2732395560446d2ff90c3d9b8407b159c571ca1c",
+			Version:  NewVersion(4, 5, 39),
+			PullSpec: "quay.io/openshift-release-dev/ocp-release@sha256:c4b9eb565c64df97afe7841bbcc0469daec7973e46ae588739cc30ea9062172b",
 		},
 		{
 			Version:  NewVersion(4, 4, 33),


Test patch:
diff --git a/pkg/monitor/cluster/clusterversions_test.go b/pkg/monitor/cluster/clusterversions_test.go
index a09d664f1..ae3fa6853 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.38",
+			wantAvailableVersion:                     "4.5.39",
 			wantAvailableRP:                          "unknown",
 		},
 		{
diff --git a/test/e2e/operator.go b/test/e2e/operator.go
index c443110ee..f636bf396 100644
--- a/test/e2e/operator.go
+++ b/test/e2e/operator.go
@@ -176,74 +176,6 @@ var _ = Describe("ARO Operator - Geneva Logging", func() {
 	})
 })
 
-var _ = Describe("ARO Operator - Routefix Daemonset", func() {
-	// remove this once the change where the operator manages the routefix
-	// daemonset is in production
-	Specify("routefix DaemonSet must be Ready", func() {
-		dsReady := func() (bool, error) {
-			done, err := ready.CheckDaemonSetIsReady(context.Background(), clients.Kubernetes.AppsV1().DaemonSets("openshift-azure-routefix"), "routefix")()
-			if err != nil {
-				log.Warn(err)
-			}
-			return done, nil // swallow error
-		}
-
-		err := wait.PollImmediate(30*time.Second, 15*time.Minute, dsReady)
-		Expect(err).NotTo(HaveOccurred())
-
-	})
-	Specify("routefix Pods must all be Running before testing DaemonSet deletion", func() {
-		dsReady := func() (bool, error) {
-			clients.Kubernetes.AppsV1().DaemonSets("openshift-azure-routefix")
-			done, err := ready.CheckPodsAreRunning(context.Background(), clients.Kubernetes.CoreV1().Pods("openshift-azure-routefix"), map[string]string{"app": "routefix"})()
-			if err != nil {
-				log.Warn(err)
-			}
-			return done, nil // swallow error
-		}
-
-		err := wait.PollImmediate(30*time.Second, 15*time.Minute, dsReady)
-		Expect(err).NotTo(HaveOccurred())
-
-	})
-	Specify("routefix must be repaired if DaemonSet is deleted", func() {
-		dsReady := func() (bool, error) {
-			done, err := ready.CheckDaemonSetIsReady(context.Background(), clients.Kubernetes.AppsV1().DaemonSets("openshift-azure-routefix"), "routefix")()
-			if err != nil {
-				log.Warn(err)
-			}
-			return done, nil // swallow error
-		}
-
-		err := wait.PollImmediate(30*time.Second, 15*time.Minute, dsReady)
-		Expect(err).NotTo(HaveOccurred())
-
-		// delete the routefix daemonset
-		err = clients.Kubernetes.AppsV1().DaemonSets("openshift-azure-routefix").Delete(context.Background(), "routefix", metav1.DeleteOptions{})
-		Expect(err).NotTo(HaveOccurred())
-
-		// wait for it to be fixed
-		err = wait.PollImmediate(30*time.Second, 15*time.Minute, dsReady)
-		Expect(err).NotTo(HaveOccurred())
-
-		_, err = clients.Kubernetes.AppsV1().DaemonSets("openshift-azure-routefix").Get(context.Background(), "routefix", metav1.GetOptions{})
-		Expect(err).NotTo(HaveOccurred())
-	})
-	Specify("routefix Pods must all be Running after testing DaemonSet deletion", func() {
-		dsReady := func() (bool, error) {
-			clients.Kubernetes.AppsV1().DaemonSets("openshift-azure-routefix")
-			done, err := ready.CheckPodsAreRunning(context.Background(), clients.Kubernetes.CoreV1().Pods("openshift-azure-routefix"), map[string]string{"app": "routefix"})()
-			if err != nil {
-				log.Warn(err)
-			}
-			return done, nil // swallow error
-		}
-
-		err := wait.PollImmediate(30*time.Second, 15*time.Minute, dsReady)
-		Expect(err).NotTo(HaveOccurred())
-	})
-})
-
 var _ = Describe("ARO Operator - Cluster Monitoring ConfigMap", func() {
 	Specify("cluster monitoring configmap should not have persistent volume config", func() {
 		var cm *corev1.ConfigMap