Skip to content

Commit 82cc522

Browse files
committed
[1.18] Add FIPS compliance config
Add tag strictfipsruntime Fix openssl issue for nop container Signed-off-by: savitaashture <[email protected]>
1 parent 2d64be4 commit 82cc522

File tree

7 files changed

+19
-7
lines changed

7 files changed

+19
-7
lines changed

.konflux/dockerfiles/controller.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ COPY upstream .
88
COPY .konflux/patches patches/
99
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
1010
COPY head HEAD
11+
ENV GOEXPERIMENT=strictfipsruntime
1112
ENV GODEBUG="http2server=0"
12-
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/controller \
13+
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/controller \
1314
./cmd/controller
1415

1516
FROM $RUNTIME

.konflux/dockerfiles/events.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ COPY .konflux/patches patches/
99
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
1010
COPY head HEAD
1111
ENV GODEBUG="http2server=0"
12-
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/events \
12+
ENV GOEXPERIMENT=strictfipsruntime
13+
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/events \
1314
./cmd/events
1415

1516
FROM $RUNTIME

.konflux/dockerfiles/nop.Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ARG GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23
2+
ARG MID_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:66b99214cb9733e77c4a12cc3e3cbbe76769a213f4e2767f170a4f0fdf9db490
23
ARG RUNTIME=scratch
34

45
FROM $GO_BUILDER AS builder
@@ -9,12 +10,17 @@ COPY .konflux/patches patches/
910
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
1011
COPY head HEAD
1112
ENV GODEBUG="http2server=0"
12-
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/nop \
13+
ENV GOEXPERIMENT=strictfipsruntime
14+
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/nop \
1315
./cmd/nop
1416

17+
FROM $MID_RUNTIME AS tmp
18+
1519
FROM $RUNTIME
1620
ARG VERSION=pipeline-1.18
1721

22+
COPY --from=tmp /usr/lib64/libcrypto.so.* /usr/lib64/
23+
1824
ENV NOP=/usr/local/bin/nop \
1925
KO_APP=/ko-app \
2026
KO_DATA_PATH=/kodata

.konflux/dockerfiles/resolvers.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ COPY .konflux/patches patches/
99
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
1010
COPY head HEAD
1111
ENV GODEBUG="http2server=0"
12-
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/resolvers \
12+
ENV GOEXPERIMENT=strictfipsruntime
13+
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/resolvers \
1314
./cmd/resolvers
1415

1516
FROM $RUNTIME

.konflux/dockerfiles/sidecarlogresults.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ COPY .konflux/patches patches/
99
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
1010
COPY head HEAD
1111
ENV GODEBUG="http2server=0"
12-
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/sidecarlogresults \
12+
ENV GOEXPERIMENT=strictfipsruntime
13+
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/sidecarlogresults \
1314
./cmd/sidecarlogresults
1415

1516
FROM $RUNTIME

.konflux/dockerfiles/webhook.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ COPY .konflux/patches patches/
99
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
1010
COPY head HEAD
1111
ENV GODEBUG="http2server=0"
12-
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/webhook \
12+
ENV GOEXPERIMENT=strictfipsruntime
13+
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/webhook \
1314
./cmd/webhook
1415

1516
FROM $RUNTIME

.konflux/dockerfiles/workingdirinit.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ COPY .konflux/patches patches/
99
RUN set -e; for f in patches/*.patch; do echo ${f}; [[ -f ${f} ]] || continue; git apply ${f}; done
1010
COPY head HEAD
1111
ENV GODEBUG="http2server=0"
12-
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -v -o /tmp/workingdirinit \
12+
ENV GOEXPERIMENT=strictfipsruntime
13+
RUN go build -ldflags="-X 'knative.dev/pkg/changeset.rev=$(cat HEAD)'" -mod=vendor -tags disable_gcp -tags strictfipsruntime -v -o /tmp/workingdirinit \
1314
./cmd/workingdirinit
1415

1516
FROM $RUNTIME

0 commit comments

Comments
 (0)