Skip to content

Commit 50ee567

Browse files
Rakshitha-KamathPradnya-Chikhale
authored andcommitted
This PR contains the following changes,
[1] Remove the arm64 support as it was started in rhceph-8.1 [2] Dockerfile changes to install keepalived-2.1.5 for rhceph-5.3 [3] Update the rpm.repo to install dependencies for rhel8 [4] rpm.in.yaml and rpm.lock.file to install keepalived-2.1.5 Signed-off-by: Rakshitha-Kamath <[email protected]>
1 parent d42fed4 commit 50ee567

File tree

6 files changed

+4069
-7858
lines changed

6 files changed

+4069
-7858
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ spec:
2929
- name: build-platforms
3030
value:
3131
- linux/x86_64
32-
- linux/arm64
3332
- linux/s390x
3433
- linux/ppc64le
3534
- name: dockerfile
@@ -646,4 +645,4 @@ spec:
646645
- name: git-auth
647646
secret:
648647
secretName: '{{ git_auth_secret }}'
649-
status: {}
648+
status: {}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ spec:
2626
- name: build-platforms
2727
value:
2828
- linux/x86_64
29-
- linux/arm64
3029
- linux/s390x
3130
- linux/ppc64le
3231
- name: dockerfile
@@ -642,4 +641,4 @@ spec:
642641
- name: git-auth
643642
secret:
644643
secretName: '{{ git_auth_secret }}'
645-
status: {}
644+
status: {}

Dockerfile

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
2-
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9-minimal:latest
1+
FROM registry.redhat.io/ubi8/ubi-minimal:latest
32

43
# Update the image to get the latest CVE updates
54
RUN microdnf update -y \
6-
&& microdnf install -y --nodocs \
7-
bash \
8-
curl-minimal \
9-
iproute \
5+
&& microdnf install --nodocs \
6+
bash \
7+
curl \
8+
iproute \
109
keepalived-2.1.5 \
1110
&& rm /etc/keepalived/keepalived.conf
1211

@@ -19,12 +18,14 @@ CMD ["./init.sh"]
1918
# Build specific labels
2019
LABEL maintainer="Guillaume Abrioux <[email protected]>"
2120
LABEL com.redhat.component="keepalived-container"
22-
LABEL version=2.2.8
21+
LABEL version=2.1.5
2322
LABEL name="keepalived"
2423
LABEL description="Red Hat Ceph Storage keepalived"
25-
LABEL summary="Provides the keepalived on RHEL 9 for Red Hat Ceph Storage."
26-
LABEL io.k8s.display-name="Keepalived on RHEL 9"
27-
LABEL io.k8s.description="keepalived-container"
24+
LABEL summary="Provides the keepalived on RHEL 8 for Red Hat Ceph Storage."
25+
LABEL io.k8s.display-name="Keepalived on RHEL 8"
2826
LABEL io.openshift.tags="rhceph ceph keepalived"
29-
LABEL cpe=cpe:/a:redhat:ceph_storage:5::el9
30-
LABEL org.opencontainers.image.created="${BUILD_DATE}"
27+
28+
# Konflux specific labels
29+
LABEL io.k8s.description="keepalived-container"
30+
LABEL cpe=cpe:/a:redhat:ceph_storage:5::el8
31+
LABEL org.opencontainers.image.created="${BUILD_DATE}"

rpms.in.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ context:
66

77
arches:
88
- x86_64
9-
- aarch64
109
- ppc64le
1110
- s390x
1211

1312
packages:
1413
- bash
15-
- curl-minimal
14+
- curl
1615
- iproute
17-
- keepalived-2.2.8
16+
- keepalived-2.1.5

0 commit comments

Comments
 (0)