Skip to content

Commit b4351e8

Browse files
committed
Use new build tag to differentiate dynamic build
When we linked to libvirt directly, having the libvirt platform in the build was synonymous with a dynamically linked build. Now that we use a pure-Go libvirt library, the build type can be independent of whether libvirt is included. Once the baremetal installer build no longer includes the libvirt platform, we still want it to be dynamically linked.
1 parent 911203d commit b4351e8

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

hack/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ then
113113
GOOS='' GOARCH='' go generate ./data
114114
fi
115115

116-
if (echo "${TAGS}" | grep -q 'libvirt')
116+
if (echo "${TAGS}" | grep -q '\bfipscapable\b')
117117
then
118118
export CGO_ENABLED=1
119119
fi

images/baremetal/Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# It builds an image containing openshift-install.
33

44
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
5-
ARG TAGS="libvirt baremetal"
5+
ARG TAGS="libvirt baremetal fipscapable"
66
WORKDIR /go/src/github.com/openshift/installer
77
COPY . .
88
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh

images/libvirt/Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# oc for getting assets from an existing cluster to spin up multi-architecture compute clusters on libvirt.
44

55
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder
6-
ARG TAGS="libvirt"
6+
ARG TAGS="libvirt fipscapable"
77
WORKDIR /go/src/github.com/openshift/installer
88
COPY . .
99
RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh

pkg/hostcrypt/dynamic.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build libvirt
2-
// +build libvirt
1+
//go:build fipscapable
2+
// +build fipscapable
33

44
package hostcrypt
55

pkg/hostcrypt/static.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build !libvirt
2-
// +build !libvirt
1+
//go:build !fipscapable
2+
// +build !fipscapable
33

44
package hostcrypt
55

0 commit comments

Comments
 (0)