Merge branch 'main' into fix-macos-arm64-issues

Signed-off-by: Oleksii Kurinnyi <[email protected]>

# Conflicts:
#	build/Dockerfile
#	deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml
#	deploy/templates/components/csv/clusterserviceversion.yaml

Author: akurinnoy

.github/workflows/code-coverage.yml

@@ -14,7 +14,7 @@ jobs:
       name: Set up Go 1.x
       uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
-        go-version: 1.23.6
+        go-version: 1.24.6
     -
       name: Set up Python 3.11
       uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa # v4.8.0

.github/workflows/pr.yml

@@ -15,7 +15,7 @@ jobs:
       name: Set up Go 1.x
       uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
-        go-version: 1.23.6
+        go-version: 1.24.6
     -
       name: Set up Python 3.11
       uses: actions/setup-python@b64ffcaf5b410884ad320a9cfac8866006a109aa # v4.8.0

CHANGELOG.md

@@ -1,5 +1,40 @@
 # DevWorkspace Operator Changelog
 
+# v0.37.0
+## Features
+### Add hostUsers field to DWOC [#1493](https://github.com/devfile/devworkspace-operator/issues/1493)
+The DevWorkspace pod's `spec.hostUsers` field can now be set in the DevWorkspaceOperatorConfig:
+```
+apiVersion: controller.devfile.io/v1alpha1
+kind: DevWorkspaceOperatorConfig
+metadata:
+  name: devworkspace-operator-config
+config:
+  workspace:
+    hostUsers: false
+``` 
+Setting the `spec.hostUsers` field to `false` is useful when leveraging user-namespaces for pods.
+
+**Note:** This field is only respected when the UserNamespacesSupport feature is enabled in the cluster. If the feature is disabled, setting hostUsers: false may lead to an endless workspace start loop.
+
+### Provide timeout for postStart events [#1496](https://github.com/devfile/devworkspace-operator/issues/1496)
+A timeout can now be configured for postStart events to prevent workspace pods from being stuck in a terminating state:
+```
+apiVersion: controller.devfile.io/v1alpha1
+kind: DevWorkspaceOperatorConfig
+metadata:
+  name: devworkspace-operator-config
+config:
+  workspace:
+    postStartTimeout: 30 
+```
+By default, this timeout is disabled.
+
+## Bug Fixes & Improvements
+- Add E2E test to verify that DevWorkspace contents are persisted during restarts [#1467](https://github.com/devfile/devworkspace-operator/issues/1467)
+- make run fails on m4 MacBook [#1494](https://github.com/devfile/devworkspace-operator/issues/1494)
+- Upgrade Go toolchain to 1.24.6 [#1509](https://github.com/devfile/devworkspace-operator/issues/1509)
+
 # v0.36.0
 ## Bug Fixes & Improvements
 ### Remove `kube-rbac-proxy` from the controller Deployment [#1437](https://github.com/devfile/devworkspace-operator/pull/1437)

build/Dockerfile

@@ -15,7 +15,7 @@
 
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9/go-toolset
 # Use BUILDPLATFORM to ensure the builder always runs natively on the host machine
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.24.4-1753853351 AS builder
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9/go-toolset:1.24.6-1758501173 AS builder
 
 # Accept TARGETARCH and TARGETPLATFORM, which are automatically passed by the builder
 ARG TARGETARCH

build/bin/user_setup

@@ -6,8 +6,7 @@ mkdir -p ${HOME}
 chown ${USER_UID}:0 ${HOME}
 chmod ug+rwx ${HOME}
 
-# runtime user will need to be able to self-insert in /etc/passwd
-chmod g+rw /etc/passwd
+chmod g-w /etc/passwd
 
 # no need for this script to remain in the image after running
 rm $0

deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml

@@ -7,7 +7,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.7.1+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     operators.operatorframework.io/internal-objects: '["devworkspaceroutings.controller.devfile.io"]'
-  name: devworkspace-operator.v0.37.0-dev
+  name: devworkspace-operator.v0.38.0-dev
   labels:
     operatorframework.io/arch.amd64: supported
     operatorframework.io/arch.arm64: supported
@@ -98,7 +98,7 @@ spec:
   provider:
     name: Devfile
     url: https://devfile.io
-  version: 0.37.0-dev
+  version: 0.38.0-dev
   relatedImages:
     - image: quay.io/devfile/devworkspace-controller:next
       name: devworkspace_webhook_server

deploy/templates/components/csv/clusterserviceversion.yaml

@@ -2,7 +2,7 @@ module github.com/devfile/devworkspace-operator
 
 go 1.24.0
 
-toolchain go1.24.4
+toolchain go1.24.6
 
 require (
 	github.com/devfile/api/v2 v2.3.1-alpha.0.20250521155908-5c3d7b99d252

go.mod

@@ -15,7 +15,7 @@
 
 # Build the manager binary
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9/go-toolset
-FROM registry.access.redhat.com/ubi9/go-toolset:1.24.4-1753853351 as builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6-1758501173 as builder
 ARG TARGETARCH
 ARG TARGETOS
 ENV GOPATH=/go/

project-clone/Dockerfile

@@ -17,7 +17,7 @@ package version
 
 var (
 	// Version is the operator version
-	Version = "v0.37.0-dev"
+	Version = "v0.38.0-dev"
 	// Commit is the commit hash corresponding to the code that was built. Can be suffixed with `-dirty`
 	Commit string = "unknown"
 	// BuildTime is the time of build of the binary