Skip to content

chore: Remove old devworkspace controller - #2098

Merged
tolusha merged 7 commits into
mainfrom
removedevworkspacecontroller
Mar 19, 2026
Merged

chore: Remove old devworkspace controller#2098
tolusha merged 7 commits into
mainfrom
removedevworkspacecontroller

Conversation

@tolusha

@tolusha tolusha commented Mar 10, 2026

Copy link
Copy Markdown
Contributor

What does this PR do?

  • Deleted controllers/devworkspace/controller.go — the old DevWorkspace routing controller and its reconciliation logic
  • Moved base domain reconciliation logic into pkg/deploy/server/basedomain_reconciler.go

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

Both controllers called r.client.Status().Update(ctx, cluster) on the same CR. Because Kubernetes uses optimistic concurrency, when both controllers try to update the same object around the same time, one gets a conflict
error (the object has been modified; please apply your changes to the latest version). This leads to unnecessary reconciliation retries, flickering status, and potential race conditions where one controller's status
update overwrites the other's.

How to test this PR?

  1. Deploy the operator:

OpenShift

./build/scripts/olm/test-catalog-from-sources.sh

or

build/scripts/docker-run.sh /bin/bash -c "
  oc login \
    --token=<...> \
    --server=<...> \
    --insecure-skip-tls-verify=true && \
  build/scripts/olm/test-catalog-from-sources.sh
"

on Minikube

./build/scripts/minikube-tests/test-operator-from-sources.sh

Common Test Scenarios

  • Deploy Eclipse Che
  • Start an empty workspace
  • Open terminal and build/run an image
  • Stop a workspace
  • Check operator logs for reconciliation errors or infinite reconciliation loops

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
tolusha added 4 commits March 10, 2026 12:54
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@tolusha

tolusha commented Mar 12, 2026

Copy link
Copy Markdown
Contributor Author

/retest

3 similar comments
@tolusha

tolusha commented Mar 12, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha

tolusha commented Mar 12, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha

tolusha commented Mar 13, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha

tolusha commented Mar 13, 2026

Copy link
Copy Markdown
Contributor Author

ci/prow/v19-devworkspace-happy-path local run:

...
9 passing (6m)

@tolusha

tolusha commented Mar 16, 2026

Copy link
Copy Markdown
Contributor Author

/retest

1 similar comment
@tolusha

tolusha commented Mar 16, 2026

Copy link
Copy Markdown
Contributor Author

/retest

Comment thread pkg/deploy/server/basedomain_reconciler.go
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@tolusha
tolusha force-pushed the removedevworkspacecontroller branch from e6434b9 to 1027a87 Compare March 17, 2026 11:02
Comment thread pkg/deploy/server/basedomain_reconciler.go
Comment thread pkg/deploy/server/basedomain_reconciler_test.go
@tolusha

tolusha commented Mar 17, 2026

Copy link
Copy Markdown
Contributor Author

/retest

6 similar comments
@tolusha

tolusha commented Mar 17, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha

tolusha commented Mar 17, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha

tolusha commented Mar 18, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha

tolusha commented Mar 18, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha

tolusha commented Mar 18, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha

tolusha commented Mar 18, 2026

Copy link
Copy Markdown
Contributor Author

/retest

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
@openshift-ci openshift-ci Bot removed the lgtm label Mar 19, 2026
@openshift-ci

openshift-ci Bot commented Mar 19, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dkwon17, rohanKanojia, tolusha

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tolusha

tolusha commented Mar 19, 2026

Copy link
Copy Markdown
Contributor Author

/retest

@tolusha
tolusha merged commit d138e72 into main Mar 19, 2026
32 of 40 checks passed
@tolusha
tolusha deleted the removedevworkspacecontroller branch March 19, 2026 13:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants