Skip to content

Commit 78f7c95

Browse files
authored
Merge pull request #1835 from tkatila/misc-fixes-9-2024
Misc fixes vol. 9/2024
2 parents 4ca9eb9 + 2d9ba91 commit 78f7c95

20 files changed

+89
-87
lines changed

build/docker/intel-deviceplugin-operator.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3939
FROM ${GOLANG_BASE} as builder
4040
ARG DIR=/intel-device-plugins-for-kubernetes
4141
ARG GO111MODULE=on
42-
ARG LDFLAGS="-ldflags=all=-w -s"
43-
ARG GOFLAGS=-trimpath
44-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
45-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
42+
ARG LDFLAGS="all=-w -s"
43+
ARG GOFLAGS="-trimpath"
44+
ARG GCFLAGS="all=-spectre=all -N -l"
45+
ARG ASMFLAGS="all=-spectre=all"
4646
ARG GOLICENSES_VERSION
4747
ARG EP=/usr/local/bin/intel_deviceplugin_operator
4848
ARG CMD
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-dlb-plugin.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3939
FROM ${GOLANG_BASE} as builder
4040
ARG DIR=/intel-device-plugins-for-kubernetes
4141
ARG GO111MODULE=on
42-
ARG LDFLAGS="-ldflags=all=-w -s"
43-
ARG GOFLAGS=-trimpath
44-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
45-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
42+
ARG LDFLAGS="all=-w -s"
43+
ARG GOFLAGS="-trimpath"
44+
ARG GCFLAGS="all=-spectre=all -N -l"
45+
ARG ASMFLAGS="all=-spectre=all"
4646
ARG GOLICENSES_VERSION
4747
ARG EP=/usr/local/bin/intel_dlb_device_plugin
4848
ARG CMD
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-dsa-plugin.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3939
FROM ${GOLANG_BASE} as builder
4040
ARG DIR=/intel-device-plugins-for-kubernetes
4141
ARG GO111MODULE=on
42-
ARG LDFLAGS="-ldflags=all=-w -s"
43-
ARG GOFLAGS=-trimpath
44-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
45-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
42+
ARG LDFLAGS="all=-w -s"
43+
ARG GOFLAGS="-trimpath"
44+
ARG GCFLAGS="all=-spectre=all -N -l"
45+
ARG ASMFLAGS="all=-spectre=all"
4646
ARG GOLICENSES_VERSION
4747
ARG EP=/usr/local/bin/intel_dsa_device_plugin
4848
ARG CMD
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-fpga-admissionwebhook.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3939
FROM ${GOLANG_BASE} as builder
4040
ARG DIR=/intel-device-plugins-for-kubernetes
4141
ARG GO111MODULE=on
42-
ARG LDFLAGS="-ldflags=all=-w -s"
43-
ARG GOFLAGS=-trimpath
44-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
45-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
42+
ARG LDFLAGS="all=-w -s"
43+
ARG GOFLAGS="-trimpath"
44+
ARG GCFLAGS="all=-spectre=all -N -l"
45+
ARG ASMFLAGS="all=-spectre=all"
4646
ARG GOLICENSES_VERSION
4747
ARG EP=/usr/local/bin/intel_fpga_admissionwebhook
4848
ARG CMD
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-fpga-initcontainer.Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3838
FROM ${GOLANG_BASE} as builder
3939
ARG DIR=/intel-device-plugins-for-kubernetes
4040
ARG GO111MODULE=on
41-
ARG LDFLAGS="-ldflags=all=-w -s"
42-
ARG GOFLAGS=-trimpath
43-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
44-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
41+
ARG LDFLAGS="all=-w -s"
42+
ARG GOFLAGS="-trimpath"
43+
ARG GCFLAGS="all=-spectre=all -N -l"
44+
ARG ASMFLAGS="all=-spectre=all"
4545
ARG GOLICENSES_VERSION
4646
ARG CRI_HOOK=intel-fpga-crihook
4747
ARG CMD=fpga_crihook
4848
ARG EP=/usr/local/fpga-sw/$CRI_HOOK
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \
@@ -59,7 +59,7 @@ ARG CMD=fpga_tool
5959
ARG EP=/usr/local/fpga-sw/$CMD
6060
WORKDIR ${DIR}
6161
COPY . .
62-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
62+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
6363
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
6464
&& if [ ! -d "licenses/$CMD" ] ; then \
6565
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-fpga-plugin.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3939
FROM ${GOLANG_BASE} as builder
4040
ARG DIR=/intel-device-plugins-for-kubernetes
4141
ARG GO111MODULE=on
42-
ARG LDFLAGS="-ldflags=all=-w -s"
43-
ARG GOFLAGS=-trimpath
44-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
45-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
42+
ARG LDFLAGS="all=-w -s"
43+
ARG GOFLAGS="-trimpath"
44+
ARG GCFLAGS="all=-spectre=all -N -l"
45+
ARG ASMFLAGS="all=-spectre=all"
4646
ARG GOLICENSES_VERSION
4747
ARG EP=/usr/local/bin/intel_fpga_device_plugin
4848
ARG CMD
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-gpu-fakedev.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3939
FROM ${GOLANG_BASE} as builder
4040
ARG DIR=/intel-device-plugins-for-kubernetes
4141
ARG GO111MODULE=on
42-
ARG LDFLAGS="-ldflags=all=-w -s"
43-
ARG GOFLAGS=-trimpath
44-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
45-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
42+
ARG LDFLAGS="all=-w -s"
43+
ARG GOFLAGS="-trimpath"
44+
ARG GCFLAGS="all=-spectre=all -N -l"
45+
ARG ASMFLAGS="all=-spectre=all"
4646
ARG GOLICENSES_VERSION
4747
ARG EP=/usr/local/bin/intel_gpu_fakedev
4848
ARG CMD
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-gpu-initcontainer.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,18 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3838
FROM ${GOLANG_BASE} as builder
3939
ARG DIR=/intel-device-plugins-for-kubernetes
4040
ARG GO111MODULE=on
41-
ARG LDFLAGS="-ldflags=all=-w -s"
42-
ARG GOFLAGS=-trimpath
43-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
44-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
41+
ARG LDFLAGS="all=-w -s"
42+
ARG GOFLAGS="-trimpath"
43+
ARG GCFLAGS="all=-spectre=all -N -l"
44+
ARG ASMFLAGS="all=-spectre=all"
4545
ARG GOLICENSES_VERSION
4646
ARG EP=/usr/local/bin/gpu-sw/intel-gpu-nfdhook
4747
ARG CMD=gpu_nfdhook
4848
ARG NFD_HOOK=intel-gpu-nfdhook
4949
ARG SRC_DIR=/usr/local/bin/gpu-sw
5050
WORKDIR ${DIR}
5151
COPY . .
52-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
52+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5353
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5454
&& if [ ! -d "licenses/$CMD" ] ; then \
5555
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-gpu-plugin.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3939
FROM ${GOLANG_BASE} as builder
4040
ARG DIR=/intel-device-plugins-for-kubernetes
4141
ARG GO111MODULE=on
42-
ARG LDFLAGS="-ldflags=all=-w -s"
43-
ARG GOFLAGS=-trimpath
44-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
45-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
42+
ARG LDFLAGS="all=-w -s"
43+
ARG GOFLAGS="-trimpath"
44+
ARG GCFLAGS="all=-spectre=all -N -l"
45+
ARG ASMFLAGS="all=-spectre=all"
4646
ARG GOLICENSES_VERSION
4747
ARG EP=/usr/local/bin/intel_gpu_device_plugin
4848
ARG CMD
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

build/docker/intel-iaa-plugin.Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ ARG GOLANG_BASE=golang:1.23-bookworm
3939
FROM ${GOLANG_BASE} as builder
4040
ARG DIR=/intel-device-plugins-for-kubernetes
4141
ARG GO111MODULE=on
42-
ARG LDFLAGS="-ldflags=all=-w -s"
43-
ARG GOFLAGS=-trimpath
44-
ARG GCFLAGS="-gcflags=all=-spectre=all -N -l"
45-
ARG ASMFLAGS="-asmflags=all=-spectre=all"
42+
ARG LDFLAGS="all=-w -s"
43+
ARG GOFLAGS="-trimpath"
44+
ARG GCFLAGS="all=-spectre=all -N -l"
45+
ARG ASMFLAGS="all=-spectre=all"
4646
ARG GOLICENSES_VERSION
4747
ARG EP=/usr/local/bin/intel_iaa_device_plugin
4848
ARG CMD
4949
WORKDIR ${DIR}
5050
COPY . .
51-
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install "${GCFLAGS}" "${ASMFLAGS}" "${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
51+
RUN (cd cmd/${CMD}; GO111MODULE=${GO111MODULE} GOFLAGS=${GOFLAGS} CGO_ENABLED=0 go install -gcflags="${GCFLAGS}" -asmflags="${ASMFLAGS}" -ldflags="${LDFLAGS}") && install -D /go/bin/${CMD} /install_root${EP}
5252
RUN install -D ${DIR}/LICENSE /install_root/licenses/intel-device-plugins-for-kubernetes/LICENSE \
5353
&& if [ ! -d "licenses/$CMD" ] ; then \
5454
GO111MODULE=on go run github.com/google/go-licenses@${GOLICENSES_VERSION} save "./cmd/$CMD" \

0 commit comments

Comments
 (0)