SRIOV-FEC Operator Release 22.06.25

.gitignore

@@ -1,9 +1,35 @@
-.vscode
+testbin/
+
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+bin
+
+# Test binary, build with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Kubernetes Generated files - skip generated files, except for vendored files
+
+!vendor/**/zz_generated.*
+
+# operator-sdk generated files
+config/crd/bases/
+bundle/
 bundle_tmp*
-N3000/docker/driver-container/files/
-N3000/docker/opae-image/files/
-N3000/files/*/*.rpm
-N3000/files/*/*.sh
+bundle.Dockerfile
+
+# editor and IDE paraphernalia
+.idea/*
+*.swp
+*.swo
+*~
+.vscode
+
 # duplicate license file used in dockerfiles
 TEMP_LICENSE_COPY
-.idea/*

.golangci.yml

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: Apache-2.0
+# Copyright (c) 2021 Intel Corporation
+---
+run:
+  timeout: 5m
+issues:
+  exclude-rules:
+    - linters:
+        - staticcheck
+      text: "SA1019:"
+

sriov-fec/Dockerfile → Dockerfile

@@ -2,7 +2,7 @@
 ## Copyright (c) 2020-2021 Intel Corporation
 
 # Build the manager binary
-FROM golang:1.17 as builder
+FROM golang:1.18.3 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests
@@ -22,7 +22,7 @@ COPY controllers/ controllers/
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5-240.1648458092
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6-751
 
 ARG VERSION
 ### Required OpenShift Labels

sriov-fec/Dockerfile.daemon → Dockerfile.daemon

@@ -1,17 +1,20 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) 2020-2021 Intel Corporation
 
-FROM golang:1.17 as builder
+FROM golang:1.18.3 as builder
 
 WORKDIR /workspace-pf
 
 RUN git clone --depth 1 --branch r44 https://github.com/benhoyt/inih && \
     cd inih/extra  && \
     make -f Makefile.static && \
     cp libinih.a ../
-RUN git clone  --depth 1 --branch v21.11 https://github.com/intel/pf-bb-config && \
+
+RUN git clone --depth 1 --branch v22.03 https://github.com/intel/pf-bb-config && \
     cd pf-bb-config && \
-    INIH_PATH=../inih make CFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE -z relro -z now -z noexecstack -s -O1"
+    VERSION_STRING=$(git describe --tags --long) && \
+    sed -i "s/#VERSION_STRING#/${VERSION_STRING}/g" config_app.c && \
+    make CFLAGS="-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE -z relro -z now -z noexecstack -s -O1"
 
 
 WORKDIR /workspace-go
@@ -20,13 +23,13 @@ COPY go.mod go.sum ./
 
 RUN go mod download
 
-COPY cmd cmd/
+COPY cmd/daemon/ cmd/daemon/
 COPY pkg pkg/
 COPY api api/
 
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o sriov_fec_daemon cmd/daemon/main.go
 
-FROM registry.access.redhat.com/ubi8:8.5-236.1648460182
+FROM registry.access.redhat.com/ubi8:8.6-754
 
 ARG VERSION
 ### Required OpenShift Labels
@@ -42,8 +45,10 @@ RUN mkdir -p /usr/share/misc/ && \
     curl https://pci-ids.ucw.cz/v2.2/pci.ids.gz --output pci.ids.gz && \
     gzip -d pci.ids.gz && \
     rm -rfv ./pci.ids.gz
+
 USER 1001
 
+
 COPY TEMP_LICENSE_COPY /licenses/LICENSE
 WORKDIR /sriov_workdir
 COPY --from=builder /workspace-go/sriov_fec_daemon .

labeler/Dockerfile → Dockerfile.labeler

@@ -1,16 +1,18 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) 2020 Intel Corporation
 
-FROM golang:1.17 as builder
+FROM golang:1.18.3 as builder
 
 WORKDIR /workspace
 COPY go.mod go.sum ./
 RUN go mod download
 
-COPY main.go .
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o node_labeler main.go
+COPY cmd/labeler/ cmd/labeler/
+COPY pkg/ pkg/
 
-FROM registry.access.redhat.com/ubi8:8.5-236.1648460182
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o node_labeler cmd/labeler/main.go
+
+FROM registry.access.redhat.com/ubi8:8.6-754
 
 ARG VERSION
 ### Required OpenShift Labels