promtail-8.1: This PR contains the following changes,

[1] Config changes to support multi-arch build
[2] Additonal tag to differentiate between the ceph versions
[3] Replace rhceph-dev to rhceph-ci

Signed-off-by: Rakshitha-Kamath <[email protected]>

Author: Rakshitha-Kamath

.tekton/promtail-8-1-pull-request.yaml

@@ -24,12 +24,15 @@ 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-v8.1-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
     value:
     - linux/x86_64
+    - linux/arm64
+    - linux/s390x
+    - linux/ppc64le
   - name: dockerfile
     value: Dockerfile
   - name: path-context
@@ -554,6 +557,11 @@ spec:
         value: $(tasks.build-image-index.results.IMAGE_URL)
       - name: IMAGE_DIGEST
         value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+      - name: ADDITIONAL_TAGS
+        value:
+          - "pull-request-{{pull_request_number}}"
+          - "from-branch-{{source_branch}}"
+          - "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
       runAfter:
       - build-image-index
       taskRef:

.tekton/promtail-8-1-push.yaml

@@ -23,10 +23,13 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/rhceph-dev/promtail:{{revision}}
+    value: quay.io/rhceph-ci/promtail:v8.1-{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
+    - linux/arm64
+    - linux/s390x
+    - linux/ppc64le
   - name: dockerfile
     value: Dockerfile
   - name: path-context
@@ -551,6 +554,10 @@ spec:
         value: $(tasks.build-image-index.results.IMAGE_URL)
       - name: IMAGE_DIGEST
         value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+      - name: ADDITIONAL_TAGS
+        value:
+          - "v8.1"
+          - "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
       runAfter:
       - build-image-index
       taskRef:

Dockerfile

@@ -1,20 +1,31 @@
-#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
-COPY loki loki
-WORKDIR loki
+ARG REMOTE_SOURCE=loki
+ARG REMOTE_SOURCE_DIR=/go/app
+
+FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:1.22 AS builder
+
+# Build Arguments
+ARG REMOTE_SOURCE
+ARG REMOTE_SOURCE_DIR
+
+COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR
+WORKDIR $REMOTE_SOURCE_DIR
 RUN make clean && make BUILD_IN_CONTAINER=false promtail
 
 
-FROM registry.redhat.io/ubi9/ubi-micro
-# Standard Red Hat labels
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9-minimal:latest
+
+# Build Arguments
+ARG REMOTE_SOURCE
+ARG REMOTE_SOURCE_DIR
+
 LABEL com.redhat.component="promtail-container"
 LABEL name="promtail"
 LABEL version="v3.0.0"
 LABEL summary="Provides promtail container"
 LABEL io.k8s.display-name="Promtail container"
 LABEL maintainer="Guillaume Abrioux <[email protected]>"
 LABEL description="Responsible for gathering logs and sending them to Loki"
-COPY --from=builder go/loki/clients/cmd/promtail/promtail /usr/bin/promtail
-COPY --from=builder go/loki/clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml
+COPY --from=builder $REMOTE_SOURCE_DIR/clients/cmd/promtail/promtail /usr/bin/promtail
+COPY --from=builder $REMOTE_SOURCE_DIR/clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml
 ENTRYPOINT ["/usr/bin/promtail"]
 CMD ["-config.file=/etc/promtail/config.yml"]