Skip to content
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

[WIP]Feature/support mig devices #20

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[WIP]Feature/support mig devices #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4a376f
Update nvidia.go from v0.10.0
zamog Dec 15, 2021
db12d02
Add mig files from v0.10.0
zamog Dec 15, 2021
96c2c0f
Update go and ubuntu version
zamog Dec 15, 2021
70c3650
Update k8s version to 1.19
zamog Dec 15, 2021
459ebd5
Add MIG devices support
zamog Dec 15, 2021
45d6920
generalize mig id generator to any number of mig devices per card
zamog Dec 16, 2021
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
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ VERSION ?= 1.0.0

##### Public rules #####

all: ubuntu16.04 centos7
all: ubuntu18.04 centos7

push:
$(DOCKER) push "$(REGISTRY)/volcano-device-plugin:$(VERSION)-ubuntu16.04"
$(DOCKER) push "$(REGISTRY)/volcano-device-plugin:$(VERSION)-ubuntu18.04"
$(DOCKER) push "$(REGISTRY)/volcano-device-plugin:$(VERSION)-centos7"

push-short:
$(DOCKER) tag "$(REGISTRY)/volcano-device-plugin:$(VERSION)-ubuntu16.04" "$(REGISTRY)/volcano-device-plugin:$(VERSION)"
$(DOCKER) tag "$(REGISTRY)/volcano-device-plugin:$(VERSION)-ubuntu18.04" "$(REGISTRY)/volcano-device-plugin:$(VERSION)"
$(DOCKER) push "$(REGISTRY)/volcano-device-plugin:$(VERSION)"

push-latest:
$(DOCKER) tag "$(REGISTRY)/volcano-device-plugin:$(VERSION)-ubuntu16.04" "$(REGISTRY)/volcano-device-plugin:latest"
$(DOCKER) tag "$(REGISTRY)/volcano-device-plugin:$(VERSION)-ubuntu18.04" "$(REGISTRY)/volcano-device-plugin:latest"
$(DOCKER) push "$(REGISTRY)/volcano-device-plugin:latest"

ubuntu16.04:
ubuntu18.04:
$(DOCKER) build --pull \
--tag $(REGISTRY)/volcano-device-plugin:$(VERSION)-ubuntu16.04 \
--file docker/amd64/Dockerfile.ubuntu16.04 .
--tag $(REGISTRY)/volcano-device-plugin:$(VERSION)-ubuntu18.04 \
--file docker/amd64/Dockerfile.ubuntu18.04 .

centos7:
$(DOCKER) build --pull \
Expand Down
4 changes: 2 additions & 2 deletions docker/amd64/Dockerfile.ubuntu16.04 → docker/amd64/Dockerfile.ubuntu18.04
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:16.04 as build
FROM ubuntu:18.04 as build

RUN apt-get update && apt-get install -y --no-install-recommends \
g++ \
ca-certificates \
wget && \
rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.14.4
ENV GOLANG_VERSION 1.16.12
RUN wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz \
| tar -C /usr/local -xz
ENV GOPATH /go
Expand Down
62 changes: 31 additions & 31 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
module volcano.sh/k8s-device-plugin

go 1.14
go 1.16

replace (
k8s.io/api => k8s.io/api v0.18.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.2
k8s.io/apimachinery => k8s.io/apimachinery v0.18.2
k8s.io/apiserver => k8s.io/apiserver v0.18.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.2
k8s.io/client-go => k8s.io/client-go v0.18.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.2
k8s.io/code-generator => k8s.io/code-generator v0.18.2
k8s.io/component-base => k8s.io/component-base v0.18.2
k8s.io/cri-api => k8s.io/cri-api v0.18.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.2
k8s.io/kubectl => k8s.io/kubectl v0.18.2
k8s.io/kubelet => k8s.io/kubelet v0.18.2
k8s.io/kubernetes => k8s.io/kubernetes v1.18.2
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.2
k8s.io/metrics => k8s.io/metrics v0.18.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.2
k8s.io/api => k8s.io/api v0.19.16
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.16
k8s.io/apimachinery => k8s.io/apimachinery v0.19.16
k8s.io/apiserver => k8s.io/apiserver v0.19.16
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.16
k8s.io/client-go => k8s.io/client-go v0.19.16
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.16
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.16
k8s.io/code-generator => k8s.io/code-generator v0.19.16
k8s.io/component-base => k8s.io/component-base v0.19.16
k8s.io/cri-api => k8s.io/cri-api v0.19.16
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.16
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.16
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.16
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.16
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.16
k8s.io/kubectl => k8s.io/kubectl v0.19.16
k8s.io/kubelet => k8s.io/kubelet v0.19.16
k8s.io/kubernetes => k8s.io/kubernetes v1.19.16
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.16
k8s.io/metrics => k8s.io/metrics v0.19.16
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.16
)

require (
github.com/NVIDIA/gpu-monitoring-tools v0.0.0-20200421213100-de959f43b55a
github.com/NVIDIA/go-gpuallocator v0.2.1
github.com/NVIDIA/gpu-monitoring-tools v0.0.0-20201222072828-352eb4c503a7
github.com/fsnotify/fsnotify v1.4.9
github.com/prometheus/common v0.4.1
golang.org/x/net v0.0.0-20200421231249-e086a090c8fd // indirect
google.golang.org/grpc v1.29.0
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
k8s.io/client-go v0.18.2
github.com/prometheus/common v0.10.0
google.golang.org/grpc v1.29.1
k8s.io/api v0.19.16
k8s.io/apimachinery v0.19.16
k8s.io/client-go v0.19.16
k8s.io/klog v1.0.0
k8s.io/kubelet v0.0.0
k8s.io/kubernetes v1.18.2
k8s.io/kubernetes v1.19.16
)
Loading