chore: sync dev-workspace-container-build CRB on every reconcile loop by tolusha · Pull Request #2000 · eclipse-che/che-operator

tolusha · 2025-05-29T13:27:55Z

What does this PR do?

snc dev-workspace-container-build CRB on every reconcile loop

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

eclipse-che/che#23400

How to test this PR?

Prepare a patch file if needed:

cat > /tmp/cr-patch.yaml <<EOF
apiVersion: org.eclipse.che/v2
kind: CheCluster
spec: {}
EOF

Deploy the operator:

OpenShift

./build/scripts/olm/test-catalog-from-sources.sh --cr-patch-yaml /tmp/cr-patch.yaml

on Minikube

./build/scripts/minikube-tests/test-operator-from-sources.sh --cr-patch-yaml /tmp/cr-patch.yaml

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>

openshift-ci · 2025-05-29T13:28:07Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: 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:

OWNERS

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

Copilot

Pull Request Overview

This PR ensures that the dev-workspace-container-build CRB is synced on every reconcile loop. Key changes include:

Replacing ServiceAccount objects with Pod objects in tests to simulate the devworkspace operator.
Updating logic in getDevWorkspaceServiceAccountNamespace to list pods by labels.
Adding new constants for controller and operator names.

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
pkg/deploy/container-build/container_build_test.go	Changed tests to use Pod instead of ServiceAccount with updated labels and spec.
pkg/deploy/container-build/container_build.go	Updated getDevWorkspaceServiceAccountNamespace to select pods using labels.
pkg/common/constants/constants.go	Added new constants for DevWorkspaceControllerName and DevWorkspaceOperatorName.

Copilot · 2025-05-30T07:26:36Z

pkg/deploy/container-build/container_build_test.go

@@ -33,17 +33,24 @@ import (
 )

 func TestContainerBuildReconciler(t *testing.T) {


Ensure that using a Pod to simulate the devworkspace operator in tests is intentional and documented, as this differs from the usual ServiceAccount object usage.

Suggested change

func TestContainerBuildReconciler(t *testing.T) {

func TestContainerBuildReconciler(t *testing.T) {

// The following Pod is used to simulate the devworkspace operator in this test.

// This approach is intentional to test specific behaviors related to Pod-based

// configurations. Normally, a ServiceAccount would be used in production scenarios.

Copilot · 2025-05-30T07:26:37Z

pkg/deploy/container-build/container_build.go

+	}
+
+	for _, pod := range pods.Items {
+		if pod.Spec.ServiceAccountName == constants.DevWorkspaceServiceAccountName {


Document that this function returns the namespace of the first matching pod, and consider whether multiple matches should be handled or clarified in the function's behavior.

devspacesbuild · 2025-05-30T09:02:15Z

Build 3.22 :: operator_3.x/462: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:04:36Z

Build 3.22 :: sync-to-downstream_3.x/9345: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:05:14Z

Build 3.22 :: get-sources-rhpkg-container-build_3.x/9492: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:26:40Z

Build 3.22 :: push-latest-container-to-quay_3.x/5187: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:28:36Z

Build 3.22 :: get-sources-rhpkg-container-build_3.x/9492:

devspaces-operator : 3.x :: Build 67774073 : quay.io/devspaces/devspaces-rhel9-operator:3.22-4
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/5187 triggered

devspacesbuild · 2025-05-30T09:28:38Z

Build 3.22 :: update-digests_3.x/9302: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:28:39Z

Build 3.22 :: operator_3.x/462:

Upstream sync done; /DS_CI/sync-to-downstream_3.x/9345 triggered

devspacesbuild · 2025-05-30T09:29:24Z

Build 3.22 :: operator-bundle_3.x/4917: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:32:13Z

Build 3.22 :: sync-to-downstream_3.x/9346: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:32:54Z

Build 3.22 :: get-sources-rhpkg-container-build_3.x/9493: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:43:10Z

Build 3.22 :: push-latest-container-to-quay_3.x/5188: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:50:48Z

Build 3.22 :: get-sources-rhpkg-container-build_3.x/9493:

devspaces-operator-bundle : 3.x :: Build 67774265 : quay.io/devspaces/devspaces-operator-bundle:3.22-19
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/5188 triggered;
Bundle CSV related images:
- quay.io/devspaces-tech-preview/idea-rhel9:
- quay.io/devspaces-tech-preview/jetbrains-ide-rhel9:
- quay.io/devspaces/code-rhel9:3.22-5
- quay.io/devspaces/configbump-rhel9:3.22-3
- quay.io/devspaces/dashboard-rhel9:3.22-7
- quay.io/devspaces/devspaces-rhel9-operator:3.22-4
- quay.io/devspaces/pluginregistry-rhel9:3.22-2
- quay.io/devspaces/server-rhel9:3.22-6
- quay.io/devspaces/traefik-rhel9:3.22-1
- quay.io/devspaces/udi-rhel9:3.22-3
= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.14.0-202504220036.p0.gb8b8259.assembly.stream.el8
= registry.redhat.io/openshift4/ose-oauth-proxy:v4.14.0-202504220036.p0.ga4a2f27.assembly.stream.el8
= registry.redhat.io/ubi8/ubi-minimal:8.8-1072.1697626218

devspacesbuild · 2025-05-30T09:50:51Z

Build 3.22 :: sync-to-downstream_3.x/9346:

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/9493 triggered; /job/DS_CI/job/dsc_3.x triggered;

devspacesbuild · 2025-05-30T09:50:52Z

Build 3.22 :: operator-bundle_3.x/4917:

Upstream sync done; /DS_CI/sync-to-downstream_3.x/9346 triggered

devspacesbuild · 2025-05-30T09:50:53Z

Build 3.22 :: copyIIBsToQuay/3005: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:51:54Z

Build 3.22 :: dsc_3.x/2063: Console, Changes, Git Data

devspacesbuild · 2025-05-30T09:53:29Z

Build 3.22 :: update-digests_3.x/9302:

Detected new images: rebuild operator-bundle
* devspaces-operator; /DS_CI/operator-bundle_3.x/4917 triggered

devspacesbuild · 2025-05-30T09:58:07Z

Build 3.22 :: dsc_3.x/2063:

3.22.0-CI

devspacesbuild · 2025-06-03T10:37:54Z

Build 3.22 :: operator-bundle_3.x/4918: Console, Changes, Git Data

devspacesbuild · 2025-06-03T10:41:56Z

Build 3.22 :: sync-to-downstream_3.x/9349: Console, Changes, Git Data

devspacesbuild · 2025-06-03T10:42:39Z

Build 3.22 :: get-sources-rhpkg-container-build_3.x/9496: Console, Changes, Git Data

devspacesbuild · 2025-06-03T11:16:31Z

Build 3.22 :: push-latest-container-to-quay_3.x/5190: Console, Changes, Git Data

devspacesbuild · 2025-06-03T11:24:39Z

Build 3.22 :: get-sources-rhpkg-container-build_3.x/9496:

devspaces-operator-bundle : 3.x :: Build 67806960 : quay.io/devspaces/devspaces-operator-bundle:3.22-20
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/5190 triggered;
Bundle CSV related images:
- quay.io/devspaces-tech-preview/idea-rhel9:
- quay.io/devspaces-tech-preview/jetbrains-ide-rhel9:
- quay.io/devspaces/code-rhel9:3.22-5
- quay.io/devspaces/configbump-rhel9:3.22-3
- quay.io/devspaces/dashboard-rhel9:3.22-7
- quay.io/devspaces/devspaces-rhel9-operator:3.22-4
- quay.io/devspaces/pluginregistry-rhel9:3.22-3
- quay.io/devspaces/server-rhel9:3.22-6
- quay.io/devspaces/traefik-rhel9:3.22-1
- quay.io/devspaces/udi-rhel9:3.22-3
= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.14.0-202504220036.p0.gb8b8259.assembly.stream.el8
= registry.redhat.io/openshift4/ose-oauth-proxy:v4.14.0-202504220036.p0.ga4a2f27.assembly.stream.el8
= registry.redhat.io/ubi8/ubi-minimal:8.8-1072.1697626218

devspacesbuild · 2025-06-03T11:24:41Z

Build 3.22 :: copyIIBsToQuay/3006: Console, Changes, Git Data

devspacesbuild · 2025-06-03T11:24:42Z

Build 3.22 :: sync-to-downstream_3.x/9349:

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/9496 triggered; /job/DS_CI/job/dsc_3.x triggered;

devspacesbuild · 2025-06-03T11:24:43Z

Build 3.22 :: operator-bundle_3.x/4918:

Upstream sync done; /DS_CI/sync-to-downstream_3.x/9349 triggered

devspacesbuild · 2025-06-03T11:26:07Z

Build 3.22 :: dsc_3.x/2064: Console, Changes, Git Data

devspacesbuild · 2025-06-03T11:36:01Z

Build 3.22 :: dsc_3.x/2064:

3.22.0-CI

chore: sync dev-workspace-container-build CRB on every reconcile loop

e79e55a

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

tolusha requested review from SDawley, ibuziuk and mkuznyetsov as code owners May 29, 2025 13:27

tolusha requested review from Copilot and removed request for SDawley, ibuziuk and mkuznyetsov May 30, 2025 07:26

Copilot AI reviewed May 30, 2025

View reviewed changes

tolusha merged commit 8094056 into main May 30, 2025
23 of 24 checks passed

tolusha deleted the 23400 branch May 30, 2025 09:02

		@@ -33,17 +33,24 @@ import (
		)

		func TestContainerBuildReconciler(t *testing.T) {

-func TestContainerBuildReconciler(t *testing.T) {
+func TestContainerBuildReconciler(t *testing.T) {
+	// The following Pod is used to simulate the devworkspace operator in this test.
+	// This approach is intentional to test specific behaviors related to Pod-based
+	// configurations. Normally, a ServiceAccount would be used in production scenarios.

Conversation

tolusha commented May 29, 2025

What does this PR do?

Screenshot/screencast of this PR

What issues does this PR fix or reference?

How to test this PR?

OpenShift

on Minikube

PR Checklist

Reviewers

Uh oh!

openshift-ci bot commented May 29, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI May 30, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 30, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented May 30, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025

Uh oh!

devspacesbuild commented Jun 3, 2025