openshift · BraeTroutman · Jun 24, 2026 · Jul 1, 2026
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.25-openshift-4.23
+  tag: rhel-9-release-golang-1.26-openshift-4.23
diff --git a/.github/workflows/lint-reusable.yaml b/.github/workflows/lint-reusable.yaml
@@ -23,9 +23,19 @@ jobs:
       - name: Use pre-built lint tools
         run: |
           if [ -d /opt/lint-tools ]; then
-            mkdir -p hack/tools/bin
-            cp /opt/lint-tools/golangci-lint hack/tools/bin/
-            cp /opt/lint-tools/kube-api-linter.so hack/tools/bin/
-            touch hack/tools/bin/golangci-lint hack/tools/bin/kube-api-linter.so
+            # Extract the Go version the project targets from go.mod
+            PROJECT_GO_VERSION=$(grep '^go ' go.mod | awk '{print $2}')
+            # Extract the Go version golangci-lint was built with
+            LINT_GO_VERSION=$(/opt/lint-tools/golangci-lint version --short 2>&1 | grep -oP 'go\K[0-9]+\.[0-9]+' || echo "unknown")
+            PROJECT_GO_MINOR=$(echo "$PROJECT_GO_VERSION" | cut -d. -f1-2)
+            if [ "$LINT_GO_VERSION" != "unknown" ] && [ "$(printf '%s\n' "$PROJECT_GO_MINOR" "$LINT_GO_VERSION" | sort -V | tail -1)" = "$LINT_GO_VERSION" ]; then
+              echo "Pre-built golangci-lint (Go $LINT_GO_VERSION) is compatible with project Go $PROJECT_GO_VERSION"
+              mkdir -p hack/tools/bin
+              cp /opt/lint-tools/golangci-lint hack/tools/bin/
+              cp /opt/lint-tools/kube-api-linter.so hack/tools/bin/
+              touch hack/tools/bin/golangci-lint hack/tools/bin/kube-api-linter.so
+            else
+              echo "Pre-built golangci-lint (Go $LINT_GO_VERSION) is incompatible with project Go $PROJECT_GO_VERSION, will rebuild from source"
+            fi
           fi
       - run: make lint
diff --git a/Containerfile.cli b/Containerfile.cli
@@ -1,4 +1,4 @@
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.25 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.26 AS builder
 ARG COMMIT_HASH
 
 WORKDIR /hypershift

diff --git a/Containerfile.control-plane b/Containerfile.control-plane
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.25.9-1778054913 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.26.4-1782736563 AS builder
 ARG COMMIT_HASH
 
 WORKDIR /hypershift
@@ -8,7 +8,7 @@ COPY --chown=default . .
 RUN make control-plane-operator \
   && make control-plane-pki-operator
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1777857961
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1782191395
 COPY --from=builder /hypershift/bin/control-plane-operator /usr/bin/control-plane-operator
 COPY --from=builder /hypershift/bin/control-plane-pki-operator /usr/bin/control-plane-pki-operator
 

diff --git a/Containerfile.operator b/Containerfile.operator
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/go-toolset:1.25.9-1778054913 AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:1.26.4-1782736563 AS builder
 ARG COMMIT_HASH
 
 WORKDIR /hypershift
@@ -9,7 +9,7 @@ RUN make hypershift \
   && make hypershift-operator \
   && make karpenter-operator
 
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1777857961
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1782191395
 COPY --from=builder /hypershift/bin/hypershift \
   /hypershift/bin/hypershift-operator \
   /hypershift/bin/karpenter-operator \

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.23 AS builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.26-openshift-4.23 AS builder
 ARG COMMIT_HASH
 
 WORKDIR /hypershift

diff --git a/Dockerfile.control-plane b/Dockerfile.control-plane
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.23 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-4.23 AS builder
 ARG COMMIT_HASH
 
 WORKDIR /hypershift

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -1,7 +1,7 @@
 # Disclaimer: The purpose of this Dockerfile is to simplify development tasks by building a container image with all-in-one binaries.
 # The control-plane-operator should not be included in the Hypershift operator image because it is already part of the OpenShift payload.
 
-FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.23 AS builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.26-openshift-4.23 AS builder
 ARG COMMIT_HASH
 
 WORKDIR /hypershift

diff --git a/Dockerfile.e2e b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.23 AS builder
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.26-openshift-4.23 AS builder
 ARG COMMIT_HASH
 
 WORKDIR /hypershift
@@ -9,7 +9,7 @@ RUN make e2e hypershift e2ev2-create-guests e2ev2-run-tests e2ev2-destroy-guests
 
 # Reuse the same image as builder because we need go command in ci-test-e2e.sh
 # Multi-stage build lets us drop the source code and build cache from the final image
-FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.23
+FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.26-openshift-4.23
 
 WORKDIR /hypershift
 

diff --git a/Dockerfile.github-actions-runner b/Dockerfile.github-actions-runner
@@ -19,7 +19,7 @@ RUN apt-get update && \
     && rm -rf /var/lib/apt/lists/*
 
 ARG TARGETARCH
-ARG GO_VERSION=1.25.7
+ARG GO_VERSION=1.26.4
 RUN curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -xz
 
 RUN OCP_ARCH=$([ "$TARGETARCH" = "amd64" ] && echo "x86_64" || echo "aarch64") && \

diff --git a/api/go.mod b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/hypershift/api
 
-go 1.25.7
+go 1.26.4
 
 require (
 	github.com/openshift/api v0.0.0-20260416105050-3c6b218b8a80

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/hypershift
 
-go 1.25.7
+go 1.26.4
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.22.0

diff --git a/hack/tools/go.mod b/hack/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/hypershift/hack/tools
 
-go 1.25.7
+go 1.26.4
 
 require (
 	github.com/ahmetb/gen-crd-api-reference-docs v0.3.0

diff --git a/hack/workspace/go.work b/hack/workspace/go.work
@@ -1,4 +1,4 @@
-go 1.25.7
+go 1.26.4
 
 use (
 	./hypershift

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1134,7 +1134,7 @@ github.com/openshift/cluster-node-tuning-operator/pkg/performanceprofile/control
 ## explicit; go 1.12
 github.com/openshift/custom-resource-status/conditions/v1
 # github.com/openshift/hypershift/api v0.0.0-20250724113115-0281b49cc465 => ./api
-## explicit; go 1.25.7
+## explicit; go 1.26.4
 github.com/openshift/hypershift/api/auditlogpersistence
 github.com/openshift/hypershift/api/auditlogpersistence/v1alpha1
 github.com/openshift/hypershift/api/certificates