Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/2.17.4 #684

Merged
merged 6 commits into from
Oct 15, 2024
Merged

Release/2.17.4 #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dea9eb4
Merge pull request #682 from redhat-marketplace/master
dacleyra Oct 3, 2024
99a87d1
fix: rhmAccountExists always for RHMPullSecretName
dacleyra Oct 11, 2024
8fcb844
Merge pull request #683 from redhat-marketplace/bugfix/accountExists
dacleyra Oct 11, 2024
d3b282c
release 2.17.4
dacleyra Oct 11, 2024
dd9fb43
openshift 4.17 support
dacleyra Oct 14, 2024
94d5121
openshift 4.17 support
dacleyra Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datareporter/v2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion v2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 6 additions & 2 deletions v2/controllers/marketplace/clusterregistration_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions v2/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading