From d93be18e7d8fa2c32556c3969c4cdb1bb44eecdc Mon Sep 17 00:00:00 2001 From: Robert Jacob Date: Fri, 26 Jun 2026 18:32:42 +0200 Subject: [PATCH] openshift-logging: Update Go builders for Loki Operator to 1.26 --- .../config/openshift/loki/openshift-loki-release-6.0.yaml | 2 +- .../config/openshift/loki/openshift-loki-release-6.2.yaml | 2 +- .../config/openshift/loki/openshift-loki-release-6.4.yaml | 8 -------- .../config/openshift/loki/openshift-loki-release-6.5.yaml | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-6.0.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-6.0.yaml index 65f08698dea4e..16cd71e4efbf9 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-6.0.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-6.0.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.23 + tag: rhel-9-golang-1.26-openshift-4.23 use_build_cache: true images: items: diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-6.2.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-6.2.yaml index 9daaea79a5478..cfd5ea5829598 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-6.2.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-6.2.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.23 + tag: rhel-9-golang-1.26-openshift-4.23 use_build_cache: true images: items: diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-6.4.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-6.4.yaml index 75ad3116faa35..2a87a7b993489 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-6.4.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-6.4.yaml @@ -3,10 +3,6 @@ base_images: name: "4.20" namespace: ocp tag: base-rhel9 - go_builder: - name: builder - namespace: ocp - tag: rhel-9-golang-1.26-openshift-4.23 loki: name: loki namespace: logging @@ -30,10 +26,6 @@ images: - context_dir: operator dockerfile_path: Dockerfile from: base - inputs: - go_builder: - as: - - golang:1.26.3 to: loki-operator - dockerfile_literal: | FROM registry.redhat.io/ubi9/go-toolset:latest diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-6.5.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-6.5.yaml index 538306339ba06..4977083515a93 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-6.5.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-6.5.yaml @@ -19,7 +19,7 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-9-golang-1.25-openshift-4.23 + tag: rhel-9-golang-1.26-openshift-4.23 use_build_cache: true images: items: