Skip to content
This repository has been archived by the owner on Aug 19, 2024. It is now read-only.

Commit

Permalink
feat: enable FIPS compliance by switching to ubi9 minimal and install…
Browse files Browse the repository at this point in the history
…ing openssl; add Infrastructure Feature Test annotations (RHIDP-294) (#141)

* feat: enable FIPS compliance by switching to ubi9 minimal and installing openssl; add Infrastructure Feature Test annotations (RHIDP-294)

Signed-off-by: RHDH Build (rhdh-bot) <rhdh-bot@redhat.com>

* fix sonarcube complaint and use latest 9.3-1475 ubi9 minimal

Signed-off-by: RHDH Build (rhdh-bot) <rhdh-bot@redhat.com>

---------

Signed-off-by: RHDH Build (rhdh-bot) <rhdh-bot@redhat.com>
Co-authored-by: RHDH Build (rhdh-bot) <rhdh-bot@redhat.com>
  • Loading branch information
nickboldt and rhdh-bot authored Jan 12, 2024
1 parent a187eba commit 910d71e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 7 deletions.
13 changes: 12 additions & 1 deletion .rhdh/bundle/manifests/rhdh-operator.csv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,19 @@ metadata:
operatorframework.io/suggested-namespace: openshift-operators
operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift
Platform Plus"]'
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/builder: operator-sdk-v1.33.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
# Infrastructure Feature Test annotations - see https://issues.redhat.com/browse/RHIDP-294
features.operators.openshift.io/disconnected: true
features.operators.openshift.io/fips-compliant: true
features.operators.openshift.io/proxy-aware: false
features.operators.openshift.io/cnf: false
features.operators.openshift.io/cni: false
features.operators.openshift.io/csi: false
features.operators.openshift.io/tls-profiles: false
features.operators.openshift.io/token-auth-aws: false
features.operators.openshift.io/token-auth-azure: false
features.operators.openshift.io/token-auth-gcp: false
repository: https://gitlab.cee.redhat.com/rhidp/rhdh/
support: Red Hat
name: rhdh-operator.v1.0.0
Expand Down
8 changes: 5 additions & 3 deletions .rhdh/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ RUN source ./cachito.env && rm -f ./cachito.env && mkdir -p /workspace
RUN export ARCH="$(uname -m)" && if [[ ${ARCH} == "x86_64" ]]; then export ARCH="amd64"; elif [[ ${ARCH} == "aarch64" ]]; then export ARCH="arm64"; fi && \
CGO_ENABLED=1 GOOS=linux GOARCH=${ARCH} go build -a -o manager main.go

# NOTE: ubi-micro will not be FIPS compliant, if openssl is not installed
#@follow_tag(registry.redhat.io/ubi9/ubi-micro:latest)
FROM registry.access.redhat.com/ubi9/ubi-micro:9.3-9
# Install openssl for FIPS support
#@follow_tag(registry.redhat.io/ubi9/ubi-minimal:latest)
FROM registry.access.redhat.com/ubi9-minimal:9.3-1475 AS runtime
RUN microdnf install -y openssl; microdnf clean -y all

# Upstream sources
# Downstream comment
# ENV CONTAINER_SOURCE=/workspace
Expand Down
8 changes: 5 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ RUN go mod download
RUN export ARCH="$(uname -m)" && if [[ ${ARCH} == "x86_64" ]]; then export ARCH="amd64"; elif [[ ${ARCH} == "aarch64" ]]; then export ARCH="arm64"; fi && \
CGO_ENABLED=1 GOOS=linux GOARCH=${ARCH} go build -a -o manager main.go

# NOTE: ubi-micro will not be FIPS compliant, if openssl is not installed
#@follow_tag(registry.redhat.io/ubi9/ubi-micro:latest)
FROM registry.access.redhat.com/ubi9/ubi-micro:9.3-9
# Install openssl for FIPS support
#@follow_tag(registry.redhat.io/ubi9/ubi-minimal:latest)
FROM registry.access.redhat.com/ubi9-minimal:9.3-1475 AS runtime
RUN microdnf install -y openssl; microdnf clean -y all

# Upstream sources
# Downstream comment
ENV CONTAINER_SOURCE=/workspace
Expand Down

0 comments on commit 910d71e

Please sign in to comment.