Skip to content

Commit 46199e2

Browse files
committed
Merge branch 'Gaurav-Rel-5.3' of https://github.com/ibmstorage/haproxy into Gaurav-Rel-5.3
2 parents 02b3725 + 047d809 commit 46199e2

File tree

6 files changed

+505
-520
lines changed

6 files changed

+505
-520
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ spec:
152152
- name: name
153153
value: init
154154
- name: bundle
155-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
155+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:1d8221c84f91b923d89de50bf16481ea729e3b68ea04a9a7cbe8485ddbb27ee6
156156
- name: kind
157157
value: task
158158
resolver: bundles
@@ -173,7 +173,7 @@ spec:
173173
- name: name
174174
value: git-clone-oci-ta
175175
- name: bundle
176-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3a920a83fc0135aaae2730fe9d446eb2da2ffc9d63a34bceea04afd24653bdee
176+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d35e5d501cb5f5f88369511f76249857cb5ac30250e1dcf086939321964ff6b9
177177
- name: kind
178178
value: task
179179
resolver: bundles
@@ -204,7 +204,7 @@ spec:
204204
- name: name
205205
value: prefetch-dependencies-oci-ta
206206
- name: bundle
207-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:970285e3b0495961199523b566e0dd92ec2e29bedbcf61d8fc67106b06d0f923
207+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:092491ac0f6e1009d10c58a1319d1029371bf637cc1293cceba53c6da5314ed1
208208
- name: kind
209209
value: task
210210
resolver: bundles
@@ -256,7 +256,7 @@ spec:
256256
- name: name
257257
value: buildah-remote-oci-ta
258258
- name: bundle
259-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.6@sha256:ac05dabe8b6b446f974cf2b6ef1079cfaa9443d7078c2ebe3ec79aa650e1b5b2
259+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:9e866d4d0489a6ab84ae263db416c9f86d2d6117ef4444f495a0e97388ae3ac0
260260
- name: kind
261261
value: task
262262
resolver: bundles
@@ -287,7 +287,7 @@ spec:
287287
- name: name
288288
value: build-image-index
289289
- name: bundle
290-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
290+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3499772af90aad0d3935629be6d37dd9292195fb629e6f43ec839c7f545a0faa
291291
- name: kind
292292
value: task
293293
resolver: bundles
@@ -313,7 +313,7 @@ spec:
313313
- name: name
314314
value: source-build-oci-ta
315315
- name: bundle
316-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:2a290f91fdccf4c9ef726a1605163bc14904e1dbf9837ac6d2621caddd10f98e
316+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b1eb49583b41872b27356fee20d5f0eb6ff7f5cdeacde7ffb39655f031104728
317317
- name: kind
318318
value: task
319319
resolver: bundles
@@ -366,7 +366,7 @@ spec:
366366
- name: name
367367
value: clair-scan
368368
- name: bundle
369-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
369+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:417f44117f8d87a4a62fea6589b5746612ac61640b454dbd88f74892380411f2
370370
- name: kind
371371
value: task
372372
resolver: bundles
@@ -417,7 +417,7 @@ spec:
417417
- name: name
418418
value: sast-snyk-check-oci-ta
419419
- name: bundle
420-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
420+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:fe5e5ba3a72632cd505910de2eacd62c9d11ed570c325173188f8d568ac60771
421421
- name: kind
422422
value: task
423423
resolver: bundles
@@ -439,7 +439,7 @@ spec:
439439
- name: name
440440
value: clamav-scan
441441
- name: bundle
442-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
442+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:7749146f7e4fe530846f1b15c9366178ec9f44776ef1922a60d3e7e2b8c6426b
443443
- name: kind
444444
value: task
445445
resolver: bundles
@@ -489,7 +489,7 @@ spec:
489489
- name: name
490490
value: sast-coverity-check-oci-ta
491491
- name: bundle
492-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:cdbe1a968676e4f5519b082bf1e27a4cdcf66dd60af66dbc26b3e604f957f7e9
492+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:f9ca942208dc2e63b479384ccc56a611cc793397ecc837637b5b9f89c2ecbefe
493493
- name: kind
494494
value: task
495495
resolver: bundles
@@ -510,7 +510,7 @@ spec:
510510
- name: name
511511
value: coverity-availability-check
512512
- name: bundle
513-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:db2b267dc15e4ed17f704ee91b8e9b38068e1a35b1018a328fdca621819d74c6
513+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:36bcf1531b85c2c7d7b4382bc0a9c61b0501e2e54e84991b11b225bdec0e5928
514514
- name: kind
515515
value: task
516516
resolver: bundles
@@ -536,7 +536,7 @@ spec:
536536
- name: name
537537
value: sast-shell-check-oci-ta
538538
- name: bundle
539-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
539+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1f0fcba24ebc447d9f8a2ea2e8f262fa435d6c523ca6b0346cd67261551fc9ed
540540
- name: kind
541541
value: task
542542
resolver: bundles
@@ -562,7 +562,7 @@ spec:
562562
- name: name
563563
value: sast-unicode-check-oci-ta
564564
- name: bundle
565-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
565+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1833c618170ab9deb8455667f220df8e88d16ccd630a2361366f594e2bdcb712
566566
- name: kind
567567
value: task
568568
resolver: bundles
@@ -579,10 +579,10 @@ spec:
579579
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
580580
- name: ADDITIONAL_TAGS
581581
value:
582-
- "v5.3"
583-
- "pull-request-{{pull_request_number}}"
584-
- "from-branch-{{source_branch}}"
585-
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
582+
- "v5.3"
583+
- "pull-request-{{pull_request_number}}"
584+
- "from-branch-{{source_branch}}"
585+
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
586586
runAfter:
587587
- build-image-index
588588
taskRef:
@@ -613,7 +613,7 @@ spec:
613613
- name: name
614614
value: push-dockerfile-oci-ta
615615
- name: bundle
616-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:14fba04580b236e4206a904b86ee2fd8eeaa4163f7619a9c2602d361e4f74c51
616+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:8c75c4a747e635e5f3e12266a3bb6e5d3132bf54e37eaa53d505f89897dd8eca
617617
- name: kind
618618
value: task
619619
resolver: bundles

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ spec:
149149
- name: name
150150
value: init
151151
- name: bundle
152-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
152+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:1d8221c84f91b923d89de50bf16481ea729e3b68ea04a9a7cbe8485ddbb27ee6
153153
- name: kind
154154
value: task
155155
resolver: bundles
@@ -170,7 +170,7 @@ spec:
170170
- name: name
171171
value: git-clone-oci-ta
172172
- name: bundle
173-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3a920a83fc0135aaae2730fe9d446eb2da2ffc9d63a34bceea04afd24653bdee
173+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d35e5d501cb5f5f88369511f76249857cb5ac30250e1dcf086939321964ff6b9
174174
- name: kind
175175
value: task
176176
resolver: bundles
@@ -201,7 +201,7 @@ spec:
201201
- name: name
202202
value: prefetch-dependencies-oci-ta
203203
- name: bundle
204-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:970285e3b0495961199523b566e0dd92ec2e29bedbcf61d8fc67106b06d0f923
204+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:092491ac0f6e1009d10c58a1319d1029371bf637cc1293cceba53c6da5314ed1
205205
- name: kind
206206
value: task
207207
resolver: bundles
@@ -253,7 +253,7 @@ spec:
253253
- name: name
254254
value: buildah-remote-oci-ta
255255
- name: bundle
256-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.6@sha256:ac05dabe8b6b446f974cf2b6ef1079cfaa9443d7078c2ebe3ec79aa650e1b5b2
256+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:9e866d4d0489a6ab84ae263db416c9f86d2d6117ef4444f495a0e97388ae3ac0
257257
- name: kind
258258
value: task
259259
resolver: bundles
@@ -284,7 +284,7 @@ spec:
284284
- name: name
285285
value: build-image-index
286286
- name: bundle
287-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
287+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3499772af90aad0d3935629be6d37dd9292195fb629e6f43ec839c7f545a0faa
288288
- name: kind
289289
value: task
290290
resolver: bundles
@@ -310,7 +310,7 @@ spec:
310310
- name: name
311311
value: source-build-oci-ta
312312
- name: bundle
313-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:2a290f91fdccf4c9ef726a1605163bc14904e1dbf9837ac6d2621caddd10f98e
313+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b1eb49583b41872b27356fee20d5f0eb6ff7f5cdeacde7ffb39655f031104728
314314
- name: kind
315315
value: task
316316
resolver: bundles
@@ -363,7 +363,7 @@ spec:
363363
- name: name
364364
value: clair-scan
365365
- name: bundle
366-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
366+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:417f44117f8d87a4a62fea6589b5746612ac61640b454dbd88f74892380411f2
367367
- name: kind
368368
value: task
369369
resolver: bundles
@@ -414,7 +414,7 @@ spec:
414414
- name: name
415415
value: sast-snyk-check-oci-ta
416416
- name: bundle
417-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
417+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:fe5e5ba3a72632cd505910de2eacd62c9d11ed570c325173188f8d568ac60771
418418
- name: kind
419419
value: task
420420
resolver: bundles
@@ -436,7 +436,7 @@ spec:
436436
- name: name
437437
value: clamav-scan
438438
- name: bundle
439-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
439+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:7749146f7e4fe530846f1b15c9366178ec9f44776ef1922a60d3e7e2b8c6426b
440440
- name: kind
441441
value: task
442442
resolver: bundles
@@ -486,7 +486,7 @@ spec:
486486
- name: name
487487
value: sast-coverity-check-oci-ta
488488
- name: bundle
489-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:cdbe1a968676e4f5519b082bf1e27a4cdcf66dd60af66dbc26b3e604f957f7e9
489+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:f9ca942208dc2e63b479384ccc56a611cc793397ecc837637b5b9f89c2ecbefe
490490
- name: kind
491491
value: task
492492
resolver: bundles
@@ -507,7 +507,7 @@ spec:
507507
- name: name
508508
value: coverity-availability-check
509509
- name: bundle
510-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:db2b267dc15e4ed17f704ee91b8e9b38068e1a35b1018a328fdca621819d74c6
510+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:36bcf1531b85c2c7d7b4382bc0a9c61b0501e2e54e84991b11b225bdec0e5928
511511
- name: kind
512512
value: task
513513
resolver: bundles
@@ -533,7 +533,7 @@ spec:
533533
- name: name
534534
value: sast-shell-check-oci-ta
535535
- name: bundle
536-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
536+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1f0fcba24ebc447d9f8a2ea2e8f262fa435d6c523ca6b0346cd67261551fc9ed
537537
- name: kind
538538
value: task
539539
resolver: bundles
@@ -559,7 +559,7 @@ spec:
559559
- name: name
560560
value: sast-unicode-check-oci-ta
561561
- name: bundle
562-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
562+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1833c618170ab9deb8455667f220df8e88d16ccd630a2361366f594e2bdcb712
563563
- name: kind
564564
value: task
565565
resolver: bundles
@@ -576,8 +576,8 @@ spec:
576576
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
577577
- name: ADDITIONAL_TAGS
578578
value:
579-
- "v5.3"
580-
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
579+
- "v5.3"
580+
- "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
581581
runAfter:
582582
- build-image-index
583583
taskRef:
@@ -608,7 +608,7 @@ spec:
608608
- name: name
609609
value: push-dockerfile-oci-ta
610610
- name: bundle
611-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:14fba04580b236e4206a904b86ee2fd8eeaa4163f7619a9c2602d361e4f74c51
611+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:8c75c4a747e635e5f3e12266a3bb6e5d3132bf54e37eaa53d505f89897dd8eca
612612
- name: kind
613613
value: task
614614
resolver: bundles

Dockerfile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
FROM --platform=$BUILDPLATFORM registry.redhat.io/ubi8-minimal:latest
1+
FROM registry.redhat.io/ubi8/ubi-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 haproxy && rpm -q haproxy-2.4.22
7-
8-
RUN microdnf install -y shadow-utils
9-
RUN groupadd haproxygroup
10-
RUN useradd -g haproxygroup haproxyuser
11-
12-
# Only install qatengine package when building on x86_64 arch.
13-
RUN if [ $(uname --hardware-platform) == "linux/amd64" ]; then microdnf install -y qatengine; fi
6+
RUN microdnf install -y haproxy22
147

158
LABEL maintainer="Guillaume Abrioux <[email protected]>"
169
LABEL com.redhat.component="rhceph-haproxy-container"
@@ -20,7 +13,7 @@ LABEL description="HAProxy container"
2013
LABEL summary="Provides HAproxy container."
2114
LABEL io.k8s.display-name="HAProxy container"
2215
LABEL io.k8s.description="HAProxy container"
23-
LABEL io.openshift.tags="2.4.22"
16+
LABEL io.openshift.tags="2.2.19"
2417
LABEL cpe=cpe:/a:redhat:ceph_storage:5::el8
2518
LABEL org.opencontainers.image.created="${BUILD_DATE}"
2619

rpms.in.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ context:
55
bare: true
66

77
arches:
8-
- x86_64
98
- ppc64le
109
- s390x
10+
- x86_64
1111

1212
# taken from install package list in Dockerfile
1313
packages:

0 commit comments

Comments
 (0)