From 7857e30be21fb4eee056ca327a752a9178663586 Mon Sep 17 00:00:00 2001 From: Rakshitha-Kamath Date: Wed, 6 Aug 2025 17:11:20 +0530 Subject: [PATCH 1/4] Update the submodule loki --- loki | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loki b/loki index a404e09..b4f7181 160000 --- a/loki +++ b/loki @@ -1 +1 @@ -Subproject commit a404e09f13fd2dfa4330f62cbfa8b15401434b4d +Subproject commit b4f7181c7aa9484e66976e8a933111a9b85ea8c2 From 5428e2c064865bc05a3fcab9525320cee3a5ae30 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 7 Aug 2025 11:44:23 -0500 Subject: [PATCH 2/4] konflux: build for all supported archs Signed-off-by: Andrew Schoen --- .tekton/promtail-8-1-pull-request.yaml | 2 ++ .tekton/promtail-8-1-push.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.tekton/promtail-8-1-pull-request.yaml b/.tekton/promtail-8-1-pull-request.yaml index 8acfe8a..5de39dc 100644 --- a/.tekton/promtail-8-1-pull-request.yaml +++ b/.tekton/promtail-8-1-pull-request.yaml @@ -30,6 +30,8 @@ spec: - name: build-platforms value: - linux/x86_64 + - linux/ppc64le + - linux/s390x - name: dockerfile value: Dockerfile - name: path-context diff --git a/.tekton/promtail-8-1-push.yaml b/.tekton/promtail-8-1-push.yaml index 2e6982e..81d47a0 100644 --- a/.tekton/promtail-8-1-push.yaml +++ b/.tekton/promtail-8-1-push.yaml @@ -27,6 +27,8 @@ spec: - name: build-platforms value: - linux/x86_64 + - linux/ppc64le + - linux/s390x - name: dockerfile value: Dockerfile - name: path-context From aa9e835fab92ce0e2cc881332bc7d3f3fbea32dc Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 7 Aug 2025 11:45:52 -0500 Subject: [PATCH 3/4] konflux: use quay.io/rhceph-ci Signed-off-by: Andrew Schoen --- .tekton/promtail-8-1-pull-request.yaml | 2 +- .tekton/promtail-8-1-push.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.tekton/promtail-8-1-pull-request.yaml b/.tekton/promtail-8-1-pull-request.yaml index 5de39dc..fdb3f7d 100644 --- a/.tekton/promtail-8-1-pull-request.yaml +++ b/.tekton/promtail-8-1-pull-request.yaml @@ -24,7 +24,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/rhceph-dev/promtail:on-pr-{{revision}} + value: quay.io/rhceph-ci/promtail:on-pr-{{revision}} - name: image-expires-after value: 5d - name: build-platforms diff --git a/.tekton/promtail-8-1-push.yaml b/.tekton/promtail-8-1-push.yaml index 81d47a0..b9579ff 100644 --- a/.tekton/promtail-8-1-push.yaml +++ b/.tekton/promtail-8-1-push.yaml @@ -23,7 +23,7 @@ spec: - name: revision value: '{{revision}}' - name: output-image - value: quay.io/rhceph-dev/promtail:{{revision}} + value: quay.io/rhceph-ci/promtail:{{revision}} - name: build-platforms value: - linux/x86_64 From 3621e9a5d9a9f776cdee3ae94ec93e27dc164213 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Thu, 7 Aug 2025 12:26:48 -0500 Subject: [PATCH 4/4] Dockerfile: use golang builder 1.23 Signed-off-by: Andrew Schoen --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eb688ab..8539fa7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ #FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.21 AS builder -FROM quay.io/projectquay/golang:1.24 AS builder +FROM quay.io/projectquay/golang:1.23 AS builder COPY loki loki WORKDIR loki RUN make clean && make BUILD_IN_CONTAINER=false promtail