Skip to content

refactor cs-operator to enable common-service controller #2364

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

Merged
ibm-ci-bot merged 12 commits into from
Feb 12, 2025
Merged

refactor cs-operator to enable common-service controller #2364

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e8218b4
cs-operator refactor for no olm
qpdpQ Feb 4, 2025
9c1df04
add deployment status check
qpdpQ Feb 4, 2025
754c7cb
update status check
qpdpQ Feb 4, 2025
64ec7ff
revert unused changes
qpdpQ Feb 4, 2025
8fd7fa1
add comment
qpdpQ Feb 4, 2025
5f9bb3c
update returned error message
qpdpQ Feb 4, 2025
d1c7468
typo in check condition
qpdpQ Feb 4, 2025
49319ff
change forceupdate to true
qpdpQ Feb 6, 2025
3dfe950
add else condition
qpdpQ Feb 6, 2025
f66c020
add error condition
qpdpQ Feb 6, 2025
7f744c3
Merge branch 'master' into non-olm-stage2
qpdpQ Feb 12, 2025
d5cb86e
lint issue
qpdpQ Feb 12, 2025
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
Prev Previous commit
Next Next commit
Merge branch 'master' into non-olm-stage2
  • Loading branch information
@qpdpQ
qpdpQ authored Feb 12, 2025
commit 7f744c3b6abff387273b78bb0c5dda42314e53f9
2 changes: 1 addition & 1 deletion controllers/commonservice_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (r *CommonServiceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
if !instance.Spec.License.Accept {
klog.Error("Accept license by changing .spec.license.accept to true in the CommonService CR. Operator will not proceed until then")
}

// If the CommonService CR is not paused, continue to reconcile
if !r.reconcilePauseRequest(instance) {
if r.checkNamespace(req.NamespacedName.String()) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.