Skip to content

Commit 0971593

Browse files
Gaurav1ARakshitha-Kamath
authored andcommitted
changes for HAProxy konflux set up for rel5.3
1 parent 715e1c3 commit 0971593

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

.tekton/haproxy-5-3-pull-request.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,19 @@ spec:
8484
description: Skip checks against built image
8585
name: skip-checks
8686
type: string
87-
- default: "false"
87+
- default: "true"
8888
description: Execute the build with network isolation
8989
name: hermetic
9090
type: string
91-
- default: ""
91+
- default: '{"type": "rpm", "path": "."}'
9292
description: Build dependencies to be prefetched by Cachi2
9393
name: prefetch-input
9494
type: string
9595
- default: ""
9696
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9797
name: image-expires-after
9898
type: string
99-
- default: "false"
99+
- default: "true"
100100
description: Build a source image.
101101
name: build-source-image
102102
type: string
@@ -152,7 +152,11 @@ spec:
152152
- name: name
153153
value: init
154154
- name: bundle
155+
<<<<<<< HEAD
155156
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
157+
=======
158+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
159+
>>>>>>> 1216198 (changes for HAProxy konflux set up for rel5.3)
156160
- name: kind
157161
value: task
158162
resolver: bundles
@@ -630,7 +634,7 @@ spec:
630634
- name: name
631635
value: rpms-signature-scan
632636
- name: bundle
633-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:73471b26483d68fb6cdcc057b5891e510dbb5dd0a189884826b648c33e26a025
637+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
634638
- name: kind
635639
value: task
636640
resolver: bundles

.tekton/haproxy-5-3-push.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@ spec:
8181
description: Skip checks against built image
8282
name: skip-checks
8383
type: string
84-
- default: "false"
84+
- default: "true"
8585
description: Execute the build with network isolation
8686
name: hermetic
8787
type: string
88-
- default: ""
88+
- default: '{"type": "rpm", "path": "."}'
8989
description: Build dependencies to be prefetched by Cachi2
9090
name: prefetch-input
9191
type: string
9292
- default: ""
9393
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9494
name: image-expires-after
9595
type: string
96-
- default: "false"
96+
- default: "true"
9797
description: Build a source image.
9898
name: build-source-image
9999
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:73471b26483d68fb6cdcc057b5891e510dbb5dd0a189884826b648c33e26a025
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

Dockerfile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1-
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8-minimal:latest
1+
FROM --platform=$BUILDPLATFORM brew.registry.redhat.io/ubi9-minimal:latest
22

33
RUN microdnf update -y
44

55
# If you edit this version number, edit it here *and* the LABEL below:
6-
RUN microdnf install -y haproxy22
6+
RUN microdnf install -y haproxy && rpm -q haproxy-2.4.22
7+
8+
# Only install qatengine package when building on x86_64 arch.
9+
RUN if [ $(uname --hardware-platform) == "linux/amd64" ]; then microdnf install -y qatengine; fi
710

811
LABEL maintainer="Guillaume Abrioux <gabrioux@redhat.com>"
912
LABEL com.redhat.component="rhceph-haproxy-container"
1013
LABEL name="haproxy"
11-
LABEL version=2.2.19
14+
LABEL version=2.4.22
1215
LABEL description="HAProxy container"
1316
LABEL summary="Provides HAproxy container."
1417
LABEL io.k8s.display-name="HAProxy container"
1518
LABEL io.k8s.description="HAProxy container"
19+
LABEL io.openshift.tags="2.4.22"
20+
LABEL cpe=cpe:/a:redhat:ceph_storage:9::el9
21+
LABEL org.opencontainers.image.created="${BUILD_DATE}"
1622

1723
STOPSIGNAL SIGUSR1
1824

0 commit comments

Comments
 (0)