From 42f7783177d6ede5cb70f43ba680ec427b16b6e0 Mon Sep 17 00:00:00 2001
From: Brendan Shephard <bshephar@redhat.com>
Date: Mon, 19 Feb 2024 14:47:17 +1000
Subject: [PATCH] FIPs compliant builds

- Changed the build image to ubi9/go-toolkit
- Changed the base image to ubi9/minimal
- Added the default GO_BUILD_EXTRA_ARGS="-tags strictfipsruntime"
- Added the GO_BUILD_EXTRA_ENV_ARGS build argument to allow custom build arguments at build time. It defaults to "CGO_ENABLED=1 GO111MODULE=on"
- Those default parameters have been added to enable FIPS compliance
- Fixed indentation
- Removed TARGETOS and TARGETARCH env vars.
- Added DOCKER_BUILD_ARGS variable in Makefile to pass custom parameters during podman build
- Added export FAIL_FIPS_CHECK=true in .prow_ci.env file

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
---
 .prow_ci.env                                          |  1 +
 Dockerfile                                            | 11 ++++++-----
 Makefile                                              |  5 ++++-
 .../openstack-operator.clusterserviceversion.yaml     |  1 +
 custom-bundle.Dockerfile                              |  3 ++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.prow_ci.env b/.prow_ci.env
index 0655cbc07..564ca8958 100644
--- a/.prow_ci.env
+++ b/.prow_ci.env
@@ -1,2 +1,3 @@
 export USE_IMAGE_DIGESTS=true
 export BUNDLE_DOCKERFILE=custom-bundle.Dockerfile
+export FAIL_FIPS_CHECK=true
diff --git a/Dockerfile b/Dockerfile
index 17dd7a381..aae778daa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
-ARG GOLANG_BUILDER=docker.io/library/golang:1.20
-ARG OPERATOR_BASE_IMAGE=gcr.io/distroless/static:nonroot
-
+ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.20
+ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest
 # Build the manager binary
 FROM $GOLANG_BUILDER AS builder
 
@@ -12,11 +11,13 @@ ARG REMOTE_SOURCE_DIR=/remote-source
 ARG REMOTE_SOURCE_SUBDIR=
 ARG DEST_ROOT=/dest-root
 
-ARG GO_BUILD_EXTRA_ARGS=
+ARG GO_BUILD_EXTRA_ARGS="-tags strictfipsruntime"
+ARG GO_BUILD_EXTRA_ENV_ARGS="CGO_ENABLED=1 GO111MODULE=on"
 
 COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR
 WORKDIR $REMOTE_SOURCE_DIR/$REMOTE_SOURCE_SUBDIR
 
+USER root
 RUN mkdir -p ${DEST_ROOT}/usr/local/bin/
 
 # cache deps before building and copying source so that we don't need to re-download as much
@@ -24,7 +25,7 @@ RUN mkdir -p ${DEST_ROOT}/usr/local/bin/
 RUN if [ ! -f $CACHITO_ENV_FILE ]; then go mod download ; fi
 
 # Build manager
-RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; CGO_ENABLED=0  GO111MODULE=on go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager main.go
+RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager main.go
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
diff --git a/Makefile b/Makefile
index 48ad8637f..e408fc627 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,9 @@ endif
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
+# Extra vars which will be passed to the Docker-build
+DOCKER_BUILD_ARGS ?=
+
 .PHONY: all
 all: build
 
@@ -152,7 +155,7 @@ run: manifests generate fmt vet ## Run a controller from your host.
 
 .PHONY: docker-build
 docker-build: test ## Build docker image with the manager.
-	podman build -t ${IMG} .
+	podman build -t ${IMG} . ${DOCKER_BUILD_ARGS}
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.
diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
index 56da6db2d..5816b514f 100644
--- a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml
@@ -5,6 +5,7 @@ metadata:
     alm-examples: '[]'
     capabilities: Basic Install
     features.operators.openshift.io/disconnected: "true"
+    features.operators.openshift.io/fips-compliant: "true"
     operatorframework.io/suggested-namespace: openstack-operators
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.operatorframework.io/builder: operator-sdk-v1.26.0
diff --git a/custom-bundle.Dockerfile b/custom-bundle.Dockerfile
index a8d266562..69d485e00 100644
--- a/custom-bundle.Dockerfile
+++ b/custom-bundle.Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_CTX=golang:1.20
+ARG GOLANG_CTX=registry.access.redhat.com/ubi9/go-toolset:1.20
 
 FROM $GOLANG_CTX as builder
 
@@ -14,6 +14,7 @@ COPY apis/ apis/
 RUN go mod download
 
 # Copy the go source
+USER root
 COPY cmd/csv-merger/csv-merger.go csv-merger.go
 COPY pkg/ pkg/