Merge pull request #684 from redhat-marketplace/release/2.17.4

Release/2.17.4
redhat-marketplace · Oct 15, 2024 · ca8bbe7 · ca8bbe7
2 parents 5c44fa3 + 94d5121
commit ca8bbe7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/datareporter/v2/Makefile b/datareporter/v2/Makefile
@@ -1,7 +1,7 @@
 # Current Operator version
 UNAME_S := $(shell uname -s)
 UNAME := $(shell echo `uname` | tr '[:upper:]' '[:lower:]')
-OPENSHIFT_VERSIONS ?= v4.12-v4.16
+OPENSHIFT_VERSIONS ?= v4.12-v4.17
 CHANNELS ?= beta,stable
 DEFAULT_CHANNEL ?= stable
 

diff --git a/v2/Makefile b/v2/Makefile
@@ -1,7 +1,7 @@
 # Current Operator version
 UNAME_S := $(shell uname -s)
 UNAME := $(shell echo `uname` | tr '[:upper:]' '[:lower:]')
-OPENSHIFT_VERSIONS ?= v4.12-v4.16
+OPENSHIFT_VERSIONS ?= v4.12-v4.17
 CHANNELS ?= beta,stable
 DEFAULT_CHANNEL ?= stable
 

diff --git a/v2/controllers/marketplace/clusterregistration_controller.go b/v2/controllers/marketplace/clusterregistration_controller.go
@@ -238,6 +238,12 @@ func (r *ClusterRegistrationReconciler) Reconcile(ctx context.Context, request r
 	var newOptSecretObj *v1.Secret
 	var rhmAccountExists *bool // nil=unknown, true, false
 	var registrationStatusConditions status.Conditions
+
+	// RHMPullSecret always has an account
+	if si.Type == utils.RHMPullSecretName {
+		rhmAccountExists = ptr.Bool(true)
+	}
+
 	if !ptr.ToBool(marketplaceConfig.Spec.IsDisconnected) {
 		//only check registration status, compare pull secret from COS if we are not in a disconnected environment
 
@@ -258,8 +264,6 @@ func (r *ClusterRegistrationReconciler) Reconcile(ctx context.Context, request r
 			} else if cond != nil && cond.IsTrue() { // already found account exists
 				rhmAccountExists = ptr.Bool(true)
 			}
-		} else if si.Type == utils.RHMPullSecretName {
-			rhmAccountExists = ptr.Bool(true)
 		}
 
 		// only check registration and get the secret if RHM account exists

diff --git a/v2/version/version.go b/v2/version/version.go
@@ -14,5 +14,5 @@
 
 package version
 
-const Version = "2.17.3"
-const LastVersion = "2.17.2"
+const Version = "2.17.4"
+const LastVersion = "2.17.3"