Skip to content

Allow dynamic linking of binaries #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubevirt-bot merged 2 commits into from
Jun 16, 2023
Merged

Allow dynamic linking of binaries #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cca599
Allow dynamic linking of binaries
awels Jun 14, 2023
1db4a2e
Updated fedora to 37 so it has a recent enough glibc
awels Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FROM registry.fedoraproject.org/fedora-minimal:34
FROM registry.fedoraproject.org/fedora-minimal:37
RUN microdnf install glibc -y
COPY _out/hostpath-provisioner /
CMD ["/hostpath-provisioner"]
3 changes: 2 additions & 1 deletion Dockerfile.csi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM registry.fedoraproject.org/fedora-minimal:34
FROM registry.fedoraproject.org/fedora-minimal:37
RUN microdnf install glibc -y
COPY _out/hostpath-csi-driver /
ENTRYPOINT ["/hostpath-csi-driver"]

2 changes: 1 addition & 1 deletion hack/build-csi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ script_dir="$(cd "$(dirname "$0")" && pwd -P)"
source "${script_dir}"/common.sh
setGoInProw $GOLANG_VER

CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o _out/hostpath-csi-driver cmd/plugin/plugin.go
CGO_ENABLED=1 go build -a -tags strictfipsruntime -ldflags '-extldflags' -o _out/hostpath-csi-driver cmd/plugin/plugin.go
2 changes: 1 addition & 1 deletion hack/build-provisioner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ script_dir="$(cd "$(dirname "$0")" && pwd -P)"
source "${script_dir}"/common.sh
setGoInProw $GOLANG_VER

CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o _out/hostpath-provisioner cmd/provisioner/hostpath-provisioner.go
CGO_ENABLED=1 go build -a -tags strictfipsruntime -ldflags '-extldflags' -o _out/hostpath-provisioner cmd/provisioner/hostpath-provisioner.go
4 changes: 2 additions & 2 deletions tests/pvc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -168,7 +168,7 @@ func TestPVCSize(t *testing.T) {
dfString, err := RunNodeSSHCommand("node01", "df -Bk /var/hpvolumes | sed 1d")
Expect(err).ToNot(HaveOccurred())
Expect(dfString).ToNot(BeEmpty())
sizeQuantity := resource.MustParse(strings.ToLower(strings.Fields(dfString)[1]))
sizeQuantity := resource.MustParse(strings.Fields(dfString)[1] + "i")
int64Size, _ := sizeQuantity.AsInt64()
hostQuantity := resource.NewQuantity(int64(roundDownCapacityPretty(int64Size)), resource.BinarySI)
t.Logf("Reported size on host: %s", hostQuantity.String())
Expand Down