From 5272caeac433e16cb433479b7d21eca08be333a6 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Fri, 11 Oct 2024 14:15:43 +0200 Subject: [PATCH] openshift-loki: Bump builder to go1.22 for 5.x releases --- .../openshift/loki/openshift-loki-release-5.6.yaml | 10 +++++++++- .../openshift/loki/openshift-loki-release-5.8.yaml | 10 +++++++++- .../openshift/loki/openshift-loki-release-5.9.yaml | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-5.6.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-5.6.yaml index 548df0ea836a..08cfc184162f 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-5.6.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-5.6.yaml @@ -11,6 +11,10 @@ base_images: name: mirror-5.y namespace: logging tag: lokistack-gateway + ocp_builder_rhel-8-golang-1.22-builder-multi-openshift-4.17: + name: builder + namespace: ocp + tag: rhel-8-golang-1.22-builder-multi-openshift-4.17 opa-openshift: name: mirror-5.y namespace: logging @@ -19,11 +23,15 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-8-golang-1.21-builder-multi-openshift-4.16 + tag: rhel-8-golang-1.22-builder-multi-openshift-4.17 images: - context_dir: operator dockerfile_path: Dockerfile from: base + inputs: + ocp_builder_rhel-8-golang-1.22-builder-multi-openshift-4.17: + as: + - golang:1.22.8 to: loki-operator operator: bundles: diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-5.8.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-5.8.yaml index 076406d6e84e..b1c32691dd38 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-5.8.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-5.8.yaml @@ -11,6 +11,10 @@ base_images: name: mirror-5.y namespace: logging tag: lokistack-gateway + ocp_builder_rhel-9-golang-1.22-builder-multi-openshift-4.17: + name: builder + namespace: ocp + tag: rhel-9-golang-1.22-builder-multi-openshift-4.17 opa-openshift: name: mirror-5.y namespace: logging @@ -19,11 +23,15 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-8-golang-1.21-builder-multi-openshift-4.16 + tag: rhel-9-golang-1.22-builder-multi-openshift-4.17 images: - context_dir: operator dockerfile_path: Dockerfile from: base + inputs: + ocp_builder_rhel-9-golang-1.22-builder-multi-openshift-4.17: + as: + - golang:1.22.8 to: loki-operator operator: bundles: diff --git a/ci-operator/config/openshift/loki/openshift-loki-release-5.9.yaml b/ci-operator/config/openshift/loki/openshift-loki-release-5.9.yaml index 752b79f67e4f..f2dc85d5b724 100644 --- a/ci-operator/config/openshift/loki/openshift-loki-release-5.9.yaml +++ b/ci-operator/config/openshift/loki/openshift-loki-release-5.9.yaml @@ -11,6 +11,10 @@ base_images: name: mirror-5.y namespace: logging tag: lokistack-gateway + ocp_builder_rhel-9-golang-1.22-builder-multi-openshift-4.17: + name: builder + namespace: ocp + tag: rhel-9-golang-1.22-builder-multi-openshift-4.17 opa-openshift: name: mirror-5.y namespace: logging @@ -19,11 +23,15 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-9-golang-1.21-builder-multi-openshift-4.16 + tag: rhel-9-golang-1.22-builder-multi-openshift-4.17 images: - context_dir: operator dockerfile_path: Dockerfile from: base + inputs: + ocp_builder_rhel-9-golang-1.22-builder-multi-openshift-4.17: + as: + - golang:1.22.8 to: loki-operator operator: bundles: