openshift-loki: Bump builder to go1.22 for 5.x releases (#57756)

openshift · Oct 14, 2024 · 9e78cbd · 9e78cbd
1 parent 8838aae
commit 9e78cbd
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 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
@@ -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
@@ -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
@@ -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: