Skip to content

Commit 097ce82

Browse files
author
Dmitry Rozhkov
committed
Add support for go mod
See kubernetes/kubernetes#79384 for details on how to update K8s dependencies.
1 parent 07c91e5 commit 097ce82

File tree

7 files changed

+411
-6
lines changed

7 files changed

+411
-6
lines changed

build/docker/intel-fpga-admissionwebhook.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN mkdir /install_root \
2222
--no-boot-update \
2323
&& rm -rf /install_root/var/lib/swupd/*
2424

25-
ARG DIR=/go/src/github.com/intel/intel-device-plugins-for-kubernetes
25+
ARG DIR=/intel-device-plugins-for-kubernetes
2626
WORKDIR $DIR
2727
COPY . .
2828
RUN cd cmd/fpga_admissionwebhook; go install

build/docker/intel-fpga-initcontainer.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN mkdir /install_root \
2323
&& rm -rf /install_root/var/lib/swupd/*
2424

2525
# Build CRI Hook
26-
ARG DIR=/go/src/github.com/intel/intel-device-plugins-for-kubernetes
26+
ARG DIR=/intel-device-plugins-for-kubernetes
2727
WORKDIR $DIR
2828
COPY . .
2929
RUN cd $DIR/cmd/fpga_crihook && \

build/docker/intel-fpga-plugin.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN mkdir /install_root \
2222
--no-boot-update \
2323
&& rm -rf /install_root/var/lib/swupd/*
2424

25-
ARG DIR=/go/src/github.com/intel/intel-device-plugins-for-kubernetes
25+
ARG DIR=/intel-device-plugins-for-kubernetes
2626
WORKDIR $DIR
2727
COPY . .
2828
RUN cd cmd/fpga_plugin; go install

build/docker/intel-gpu-plugin.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN mkdir /install_root \
2222
--no-boot-update \
2323
&& rm -rf /install_root/var/lib/swupd/*
2424

25-
ARG DIR=/go/src/github.com/intel/intel-device-plugins-for-kubernetes
25+
ARG DIR=/intel-device-plugins-for-kubernetes
2626
WORKDIR $DIR
2727
COPY . .
2828
RUN cd cmd/gpu_plugin; go install

build/docker/intel-qat-plugin.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ RUN test -z "${TAGS_KERNELDRV}" \
3434
&& cd /usr/src/qat/quickassist/utilities/adf_ctl \
3535
&& make KERNEL_SOURCE_DIR=/usr/src/qat/quickassist/qat \
3636
&& install -D adf_ctl /install_root/usr/local/bin/adf_ctl )
37-
ARG DIR=/go/src/github.com/intel/intel-device-plugins-for-kubernetes
37+
ARG DIR=/intel-device-plugins-for-kubernetes
3838
WORKDIR $DIR
3939
COPY . .
40-
RUN cd cmd/qat_plugin; go install ${TAGS_KERNELDRV}
40+
RUN cd cmd/qat_plugin; echo "build tags: ${TAGS_KERNELDRV}"; go install -tags "${TAGS_KERNELDRV}"
4141
RUN chmod a+x /go/bin/qat_plugin \
4242
&& install -D /go/bin/qat_plugin /install_root/usr/local/bin/intel_qat_device_plugin \
4343
&& install -D ${DIR}/LICENSE /install_root/usr/local/share/package-licenses/intel-device-plugins-for-kubernetes/LICENSE

go.mod

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
module github.com/intel/intel-device-plugins-for-kubernetes
2+
3+
go 1.12
4+
5+
require (
6+
github.com/fsnotify/fsnotify v1.4.7
7+
github.com/go-ini/ini v1.46.0
8+
github.com/pkg/errors v0.8.0
9+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
10+
golang.org/x/sys v0.0.0-20190312061237-fead79001313
11+
google.golang.org/grpc v1.13.0
12+
gopkg.in/ini.v1 v1.46.0 // indirect
13+
k8s.io/api v0.0.0
14+
k8s.io/apimachinery v0.0.0
15+
k8s.io/client-go v0.0.0
16+
k8s.io/kubernetes v1.15.3
17+
k8s.io/utils v0.0.0-20190221042446-c2654d5206da
18+
)
19+
20+
replace (
21+
k8s.io/api => k8s.io/api v0.0.0-20190819141258-3544db3b9e44
22+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190819143637-0dbe462fe92d
23+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
24+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190819142446-92cc630367d0
25+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190819144027-541433d7ce35
26+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190819141724-e14f31a72a77
27+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190819145148-d91c85d212d5
28+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190819145008-029dd04813af
29+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
30+
k8s.io/component-base => k8s.io/component-base v0.0.0-20190819141909-f0f7c184477d
31+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
32+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190819145328-4831a4ced492
33+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190819142756-13daafd3604f
34+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190819144832-f53437941eef
35+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190819144346-2e47de1df0f0
36+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190819144657-d1a724e0828e
37+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190602132728-7075c07e78bf
38+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190819144524-827174bad5e8
39+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190819145509-592c9a46fd00
40+
k8s.io/metrics => k8s.io/metrics v0.0.0-20190819143841-305e1cef1ab1
41+
k8s.io/node-api => k8s.io/node-api v0.0.0-20190819145652-b61681edbd0a
42+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190819143045-c84c31c165c4
43+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190819144209-f9ca4b649af0
44+
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190819143301-7c475f5e1313
45+
)

0 commit comments

Comments
 (0)