Skip to content

Commit 70116e1

Browse files
Rakshitha-KamathPradnya-Chikhale
authored andcommitted
Update konflux references and hermetic build
Signed-off-by: Rakshitha-Kamath <[email protected]>
1 parent 506776c commit 70116e1

File tree

5 files changed

+21
-28
lines changed

5 files changed

+21
-28
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "loki"]
22
path = loki
33
url = https://github.com/ibmstorage/loki.git
4-
branch = release-8.1
4+
branch = tmp_release-7.1

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ spec:
8282
description: Skip checks against built image
8383
name: skip-checks
8484
type: string
85-
- default: "false"
85+
- default: "true"
8686
description: Execute the build with network isolation
8787
name: hermetic
8888
type: string
@@ -94,7 +94,7 @@ spec:
9494
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9595
name: image-expires-after
9696
type: string
97-
- default: "false"
97+
- default: "true"
9898
description: Build a source image.
9999
name: build-source-image
100100
type: string
@@ -625,7 +625,7 @@ spec:
625625
- name: name
626626
value: rpms-signature-scan
627627
- name: bundle
628-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
628+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
629629
- name: kind
630630
value: task
631631
resolver: bundles

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ spec:
7979
description: Skip checks against built image
8080
name: skip-checks
8181
type: string
82-
- default: "false"
82+
- default: "true"
8383
description: Execute the build with network isolation
8484
name: hermetic
8585
type: string
@@ -91,7 +91,7 @@ spec:
9191
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9292
name: image-expires-after
9393
type: string
94-
- default: "false"
94+
- default: "true"
9595
description: Build a source image.
9696
name: build-source-image
9797
type: string
@@ -621,7 +621,7 @@ spec:
621621
- name: name
622622
value: rpms-signature-scan
623623
- name: bundle
624-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
624+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
625625
- name: kind
626626
value: task
627627
resolver: bundles

Dockerfile

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,24 @@
1-
ARG REMOTE_SOURCE=loki
2-
ARG REMOTE_SOURCE_DIR=/go/app
3-
4-
FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:1.24 AS builder
5-
6-
# Build Arguments
7-
ARG REMOTE_SOURCE
8-
ARG REMOTE_SOURCE_DIR
9-
10-
COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR
11-
WORKDIR $REMOTE_SOURCE_DIR
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 AS builder
2+
COPY loki loki
3+
WORKDIR loki
124
RUN make clean && make BUILD_IN_CONTAINER=false promtail
135

146

15-
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9-minimal:latest
16-
17-
# Build Arguments
18-
ARG REMOTE_SOURCE
19-
ARG REMOTE_SOURCE_DIR
20-
7+
FROM registry.redhat.io/ubi9/ubi-micro
8+
# Standard Red Hat labels
219
LABEL com.redhat.component="promtail-container"
2210
LABEL name="promtail"
23-
LABEL version="v3.0.0"
11+
LABEL version="v3.5.3"
2412
LABEL summary="Provides promtail container"
2513
LABEL io.k8s.display-name="Promtail container"
14+
LABEL io.k8s.description="promtail-container"
15+
LABEL io.openshift.tags="rhceph ceph dashboard loki"
2616
LABEL maintainer="Guillaume Abrioux <[email protected]>"
2717
LABEL description="Responsible for gathering logs and sending them to Loki"
28-
COPY --from=builder $REMOTE_SOURCE_DIR/clients/cmd/promtail/promtail /usr/bin/promtail
29-
COPY --from=builder $REMOTE_SOURCE_DIR/clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml
18+
LABEL cpe=cpe:/a:redhat:ceph_storage:9::el9
19+
LABEL org.opencontainers.image.created="${BUILD_DATE}"
20+
21+
COPY --from=builder /loki/clients/cmd/promtail/promtail /usr/bin/promtail
22+
COPY --from=builder /loki/clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml
3023
ENTRYPOINT ["/usr/bin/promtail"]
3124
CMD ["-config.file=/etc/promtail/config.yml"]

loki

0 commit comments

Comments
 (0)