From 5eb63b776736dbafdc910d92587dc3a3e5d559ec Mon Sep 17 00:00:00 2001 From: David Kwon Date: Mon, 2 Mar 2026 16:57:48 -0500 Subject: [PATCH 1/2] Update to use go 1.25.7 Signed-off-by: David Kwon --- .github/workflows/pr-check.yml | 2 +- build/dockerfiles/controller.Dockerfile | 2 +- build/makefiles/controller.mk | 2 +- go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 1494270..4e2b47d 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -22,7 +22,7 @@ jobs: name: Set up Go 1.x uses: actions/setup-go@v2 with: - go-version: 1.23.6 + go-version: 1.25.7 - name: Check out code into the Go module directory uses: actions/checkout@v4 diff --git a/build/dockerfiles/controller.Dockerfile b/build/dockerfiles/controller.Dockerfile index ac48231..63ccb8d 100644 --- a/build/dockerfiles/controller.Dockerfile +++ b/build/dockerfiles/controller.Dockerfile @@ -10,7 +10,7 @@ # # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9/go-toolset -FROM registry.access.redhat.com/ubi9/go-toolset:1.24.6-1760420453 AS builder +FROM registry.access.redhat.com/ubi9/go-toolset:1.25.7-1772454089 AS builder ENV GOPATH=/go/ USER root diff --git a/build/makefiles/controller.mk b/build/makefiles/controller.mk index 3f48901..bc48692 100644 --- a/build/makefiles/controller.mk +++ b/build/makefiles/controller.mk @@ -31,7 +31,7 @@ compile: ### build_controller_image: Build container image for Web Terminal Operator build_controller_image: - $(DOCKER) build -t $(WTO_IMG) -f build/dockerfiles/controller.Dockerfile . + $(DOCKER) build --platform=linux/amd64 -t $(WTO_IMG) -f build/dockerfiles/controller.Dockerfile . ifneq ($(INITIATOR),CI) ifeq ($(WTO_IMG),quay.io/wto/web-terminal-operator:next) @echo -n "Are you sure you want to push $(WTO_IMG)? [y/N] " && read ans && [ $${ans:-N} = y ] diff --git a/go.mod b/go.mod index 3d53966..f015e7b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/redhat-developer/web-terminal-operator -go 1.23.0 +go 1.25.7 require ( github.com/devfile/api/v2 v2.2.0 From ec12d48d5c522b7de944dc4af63e04294e5172b8 Mon Sep 17 00:00:00 2001 From: David Kwon Date: Mon, 2 Mar 2026 16:58:11 -0500 Subject: [PATCH 2/2] Prepare for WTO 1.16 release Signed-off-by: David Kwon --- CHANGELOG.md | 12 ++++++++++++ build/dockerfiles/Dockerfile | 2 +- build/dockerfiles/controller.Dockerfile | 2 +- build/dockerfiles/devtools.Dockerfile | 2 +- manifests/web-terminal.clusterserviceversion.yaml | 6 +++--- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9619820..4d19a70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +#### 1.16 +- Default tooling versions have been updated: + - oc v4.20.1 -> v4.21.4 + - kubectl 1.33.3 -> 1.34.4 + - kustomize v5.7.1 -> v5.8.1 + - helm v3.17.1 -> v3.17.1 + - knative v1.15.0-6 -> v1.15.0-6 + - tekton v1.20.0 -> v1.20.0 + - rhoas v0.53.0 -> v0.53.0 + - submariner v0.21.0 -> v0.22.1 + - virtctl v1.6.2 -> v1.7.1 + #### 1.15 - Default tooling versions have been updated: - oc v4.19.9 -> v4.20.1 diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index b78129b..d567f48 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -20,7 +20,7 @@ LABEL com.redhat.delivery.operator.bundle=true # This second label tells the pipeline which versions of OpenShift the operator supports (i.e. which version of oc is installed). # This is used to control which index images should include this operator. -LABEL com.redhat.openshift.versions="v4.20" +LABEL com.redhat.openshift.versions="v4.21" # The rest of these labels are copies of the same content in annotations.yaml and are needed by OLM # Note the package name and channels which are very important! diff --git a/build/dockerfiles/controller.Dockerfile b/build/dockerfiles/controller.Dockerfile index 63ccb8d..50c50a3 100644 --- a/build/dockerfiles/controller.Dockerfile +++ b/build/dockerfiles/controller.Dockerfile @@ -30,7 +30,7 @@ COPY . . RUN make compile # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi9-minimal -FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1760515502 +FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1771346502 RUN microdnf -y update && microdnf clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages" WORKDIR / COPY --from=builder /web-terminal-operator/_output/bin/web-terminal-controller /usr/local/bin/web-terminal-controller diff --git a/build/dockerfiles/devtools.Dockerfile b/build/dockerfiles/devtools.Dockerfile index d9addbb..71ae05d 100644 --- a/build/dockerfiles/devtools.Dockerfile +++ b/build/dockerfiles/devtools.Dockerfile @@ -29,7 +29,7 @@ RUN curl -sSLO https://github.com/operator-framework/operator-registry/releases/ chmod +x linux-amd64-opm && \ mv linux-amd64-opm /usr/local/bin/opm -ENV OC_VERSION=4.19 +ENV OC_VERSION=4.21 RUN curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-${OC_VERSION}/openshift-client-linux.tar.gz | \ tar -C /usr/local/bin -xz --no-same-owner && \ chmod +x /usr/local/bin/oc diff --git a/manifests/web-terminal.clusterserviceversion.yaml b/manifests/web-terminal.clusterserviceversion.yaml index e4bef7d..8d37f67 100644 --- a/manifests/web-terminal.clusterserviceversion.yaml +++ b/manifests/web-terminal.clusterserviceversion.yaml @@ -15,7 +15,7 @@ metadata: operatorframework.io/suggested-namespace: openshift-operators repository: https://github.com/redhat-developer/web-terminal-operator/ support: Red Hat, Inc. - name: web-terminal.v1.15.0 + name: web-terminal.v1.16.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -137,5 +137,5 @@ spec: maturity: alpha provider: name: Red Hat - replaces: web-terminal.v1.14.0 - version: 1.15.0 + replaces: web-terminal.v1.15.0 + version: 1.16.0