haproxy-5-3: fix

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

Author: Rakshitha-Kamath

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

@@ -152,11 +152,7 @@ spec:
         - name: name
           value: init
         - name: bundle
-<<<<<<< HEAD
           value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
-=======
-          value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
->>>>>>> 1216198 (changes for HAProxy konflux set up for rel5.3)
         - name: kind
           value: task
         resolver: bundles

Dockerfile

@@ -1,22 +1,18 @@
-FROM --platform=$BUILDPLATFORM registry.redhat.io/ubi8-minimal:latest
+FROM registry.redhat.io/ubi8/ubi-minimal:latest
 
 RUN microdnf update -y
 
-# If you edit this version number, edit it here *and* the LABEL below:
-RUN microdnf install -y haproxy && rpm -q haproxy-2.4.22
-
-# Only install qatengine package when building on x86_64 arch.
-RUN if [ $(uname --hardware-platform) == "linux/amd64" ]; then microdnf install -y qatengine; fi
+RUN microdnf install -y haproxy22
 
 LABEL maintainer="Guillaume Abrioux <[email protected]>"
 LABEL com.redhat.component="rhceph-haproxy-container"
 LABEL name="haproxy"
-LABEL version=2.4.22
+LABEL version=2.2.19
 LABEL description="HAProxy container"
 LABEL summary="Provides HAproxy container."
 LABEL io.k8s.display-name="HAProxy container"
 LABEL io.k8s.description="HAProxy container"
-LABEL io.openshift.tags="2.4.22"
+LABEL io.openshift.tags="2.2.19"
 LABEL cpe=cpe:/a:redhat:ceph_storage:5::el8
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 

rpms.in.yaml

@@ -5,10 +5,10 @@ context:
   bare: true
 
 arches:
-  - x86_64
   - ppc64le
   - s390x
+  - x86_64
 
 # taken from install package list in Dockerfile
 packages:
-  - haproxy-2.4.22
+  - haproxy22