Skip to content
This repository was archived by the owner on Jun 25, 2025. It is now read-only.

Commit ffd6e7d

Browse files
ahalimx86clarkeknhenniganrafal-lalEoghan1232
committed
Redhat OCP 4.9-4.11 certification updates
Co-Authored-By: clarkek <clarkek@users.noreply.github.com> Co-Authored-By: nhennigan <nhennigan@users.noreply.github.com> Co-Authored-By: rafal-lal <rafal-lal@users.noreply.github.com> Co-Authored-By: Eoghan1232 <Eoghan1232@users.noreply.github.com> Co-Authored-By: pjconnol <pjconnol@users.noreply.github.com>
1 parent b27ac75 commit ffd6e7d

File tree

251 files changed

+11001
-859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+11001
-859
lines changed

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright (c) 2021-2022 Intel Corporation
2+
# Copyright (c) 2020-2022 Intel Corporation
33

‎Dockerfile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright (c) 2021 Intel Corporation
2+
# Copyright (c) 2020-2022 Intel Corporation
33

44
# Build the manager binary
5-
FROM golang:alpine3.13 as builder
5+
FROM docker.io/golang:alpine3.16 as builder
66

77
WORKDIR /workspace
88

@@ -18,10 +18,9 @@ COPY apis/ apis/
1818
COPY controllers/ controllers/
1919
COPY pkg/ pkg/
2020

21-
2221
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
2322

24-
FROM registry.access.redhat.com/ubi8:8.5-214
23+
FROM registry.access.redhat.com/ubi9/ubi-micro:9.1.0-6
2524

2625
ARG VERSION
2726
### Required OpenShift Labels
@@ -37,4 +36,10 @@ WORKDIR /
3736
COPY --from=builder /workspace/manager .
3837
COPY assets/ assets/
3938

39+
USER root
40+
RUN mkdir /licenses
41+
COPY LICENSE /licenses/LICENSE.txt
42+
RUN chown 1001 /licenses
43+
USER 1001
44+
4045
ENTRYPOINT ["/manager"]

‎Dockerfile.daemon‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright (c) 2020-2021 Intel Corporation
2+
# Copyright (c) 2020-2022 Intel Corporation
33

4-
FROM golang:alpine3.13 as builder
4+
FROM docker.io/golang:alpine3.16 as builder
55

66
WORKDIR /workspace
77

@@ -16,9 +16,17 @@ COPY apis apis/
1616
# Build
1717
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o fwddp_daemon cmd/fwddp-daemon/main.go
1818

19-
FROM registry.access.redhat.com/ubi8:8.5-214
19+
FROM registry.access.redhat.com/ubi9/ubi:9.1.0-1646.1669023907 as package_installer
2020

21-
RUN yum install -y ethtool iproute kmod pciutils && yum clean all
21+
RUN dnf install -y ethtool iproute kmod pciutils gcc make
22+
23+
# Manually compile latest version of zlib
24+
RUN curl -L -o zlib-1.2.13.tar.gz https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz && \
25+
tar xzvf zlib-1.2.13.tar.gz
26+
WORKDIR /zlib-1.2.13
27+
RUN ./configure && make test && make install
28+
29+
FROM registry.access.redhat.com/ubi9/ubi-micro:9.1.0-6
2230

2331
ARG VERSION
2432
### Required OpenShift Labels
@@ -32,4 +40,22 @@ LABEL name="Intel Ethernet Operator - daemonset" \
3240
WORKDIR /
3341
COPY --from=builder /workspace/fwddp_daemon .
3442

43+
COPY --from=package_installer /lib64/libm.so.6 /lib64/libmnl.so.0 /lib64/libc.so.6 /lib64/ld-linux-x86-64.so.2 \
44+
/lib64/libzstd.so.1 /lib64/liblzma.so.5 /lib64/libcrypto.so.3 /lib64/libgcc_s.so.1 \
45+
/lib64/libpci.so.3 /lib64/libkmod.so.2 /lib64/libbpf.so.0 \
46+
/lib64/libmnl.so.0 /lib64/libtinfo.so.6 /lib64
47+
COPY --from=package_installer /usr/local/lib/libz.so.1.2.13 /lib64/libz.so.1
48+
COPY --from=package_installer /usr/sbin/ethtool /usr/sbin/lspci \
49+
/usr/sbin/setpci /usr/sbin/update-pciids /usr/sbin/ip /usr/sbin
50+
COPY --from=package_installer /usr/bin/kmod /usr/bin/
51+
52+
RUN mkdir /usr/share/hwdata
53+
COPY --from=package_installer /usr/share/hwdata /usr/share/hwdata
54+
55+
USER root
56+
RUN mkdir /licenses
57+
COPY LICENSE /licenses/LICENSE.txt
58+
RUN chown 1001 /licenses
59+
USER 1001
60+
3561
ENTRYPOINT ["/fwddp_daemon"]

‎Dockerfile.labeler‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright (c) 2021 Intel Corporation
2+
# Copyright (c) 2020-2022 Intel Corporation
33

4-
FROM golang:alpine3.13 as builder
4+
FROM docker.io/golang:alpine3.16 as builder
55

66
WORKDIR /workspace
77
COPY go.mod go.sum ./
@@ -11,9 +11,12 @@ COPY cmd cmd/
1111
COPY pkg pkg/
1212
COPY apis apis/
1313

14+
RUN apk update && apk add curl
15+
RUN curl https://pci-ids.ucw.cz/v2.2/pci.ids.gz -o pci.ids.gz && gunzip pci.ids.gz
16+
1417
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o node_labeler cmd/labeler/main.go
1518

16-
FROM registry.access.redhat.com/ubi8:8.5-214
19+
FROM registry.access.redhat.com/ubi9/ubi-micro:9.1.0-6
1720

1821
ARG VERSION
1922
### Required OpenShift Labels
@@ -26,13 +29,16 @@ devices as set in the config file (typically Intel Ethernet E810)" \
2629
description="The container detects the relevant PCI devices, labels the nodes that contain them \
2730
and removes the label for the nodes that do not."
2831

29-
WORKDIR /usr/share/misc/
30-
31-
RUN curl https://pci-ids.ucw.cz/v2.2/pci.ids.gz -o pci.ids.gz && \
32-
gunzip pci.ids.gz
32+
COPY --from=builder /workspace/pci.ids /usr/share/misc/pci.ids
3333

3434
USER 1001
3535
WORKDIR /labeler-workspace
3636
COPY --from=builder /workspace/node_labeler .
3737

38+
USER root
39+
RUN mkdir /licenses
40+
COPY LICENSE /licenses/LICENSE.txt
41+
RUN chown 1001 /licenses
42+
USER 1001
43+
3844
ENTRYPOINT ["bash", "-c", "/labeler-workspace/node_labeler && sleep infinity"]

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: Apache-2.0
2-
# Copyright (c) 2021 Intel Corporation
2+
# Copyright (c) 2020-2022 Intel Corporation
33
pipeline {
44
agent {
55
kubernetes {

‎LICENSE‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,5 +172,9 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
172172
defend, and hold each Contributor harmless for any liability
173173
incurred by, or claims asserted against, such Contributor by reason
174174
of your accepting any such warranty or additional liability.
175-
175+
176+
LICENSES OF THIRD PARTY COMPONENTS ARE AVAILABLE IN THIS REPOSITORY
177+
IN THE FOLDER ./third-party-licenses/
178+
176179
END OF TERMS AND CONDITIONS
180+

0 commit comments

Comments
 (0)