Skip to content

Commit

Permalink
Merge branch 'cherry-pick-0.14.1' into 'release-0.14'
Browse files Browse the repository at this point in the history 
Cherry-pick changes for v0.14.1 release

See merge request nvidia/kubernetes/device-plugin!305
  • Loading branch information
Evan Lezar committed Jul 11, 2023
2 parents 7209ee4 + 563f8c2 commit 1f3dd06
Show file tree
Hide file tree
Showing 2,310 changed files with 316,727 additions and 58,313 deletions.
2 changes: 1 addition & 1 deletion .common-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
default:
image: docker:stable
services:
- name: docker:stable-dind
- name: docker:dind
command: ["--experimental"]

variables:
Expand Down
4 changes: 4 additions & 0 deletions api/config/v1/flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ func updateFromCLIFlag[T any](pflag **T, c *cli.Context, flagName string) {
*flag = ptr(c.Bool(flagName))
case **Duration:
*flag = ptr(Duration(c.Duration(flagName)))
case **deviceListStrategyFlag:
*flag = ptr((deviceListStrategyFlag)(c.StringSlice(flagName)))
default:
panic(fmt.Errorf("unsupported flag type for %v: %T", flagName, flag))
}
}
}
Expand Down
28 changes: 25 additions & 3 deletions deployments/container/Dockerfile.ubi8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG GOLANG_VERSION=1.20.1
ARG GOLANG_VERSION=1.20.5
ARG CUDA_IMAGE=cuda
ARG CUDA_VERSION=11.6.1
ARG CUDA_VERSION=12.2.0
ARG BASE_DIST=ubi8
FROM golang:${GOLANG_VERSION} as build
FROM nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST} as build

RUN yum install -y \
wget make git gcc \
&& \
rm -rf /var/cache/yum/*

ARG GOLANG_VERSION=x.x.x
RUN set -eux; \
\
arch="$(uname -m)"; \
case "${arch##*-}" in \
x86_64 | amd64) ARCH='amd64' ;; \
ppc64el | ppc64le) ARCH='ppc64le' ;; \
aarch64) ARCH='arm64' ;; \
*) echo "unsupported architecture" ; exit 1 ;; \
esac; \
wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \
| tar -C /usr/local -xz


ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

WORKDIR /build
COPY . .
Expand Down
28 changes: 25 additions & 3 deletions deployments/container/Dockerfile.ubuntu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,39 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG GOLANG_VERSION=1.20.1
ARG GOLANG_VERSION=1.20.5
ARG CUDA_IMAGE=cuda
ARG CUDA_VERSION=11.6.1
ARG CUDA_VERSION=12.2.0
ARG BASE_DIST=ubuntu20.04
FROM golang:${GOLANG_VERSION} as build
FROM nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST} as build

RUN apt-get update && \
apt-get install -y wget make git gcc \
&& \
rm -rf /var/lib/apt/lists/*

ARG GOLANG_VERSION=x.x.x
RUN set -eux; \
\
arch="$(uname -m)"; \
case "${arch##*-}" in \
x86_64 | amd64) ARCH='amd64' ;; \
ppc64el | ppc64le) ARCH='ppc64le' ;; \
aarch64) ARCH='arm64' ;; \
*) echo "unsupported architecture" ; exit 1 ;; \
esac; \
wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz \
| tar -C /usr/local -xz

ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

WORKDIR /build
COPY . .

RUN mkdir /artifacts
ARG VERSION="N/A"
ARG GIT_COMMIT="unknown"
RUN make PREFIX=/artifacts cmds

FROM nvidia/${CUDA_IMAGE}:${CUDA_VERSION}-base-${BASE_DIST}
Expand Down
118 changes: 63 additions & 55 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,86 +3,94 @@ module github.com/NVIDIA/k8s-device-plugin
go 1.20

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

require (
github.com/NVIDIA/go-gpuallocator v0.2.3
github.com/NVIDIA/nvidia-container-toolkit v1.13.0-rc.2.0.20230328200512-f6983969ad5d
github.com/NVIDIA/nvidia-container-toolkit v1.13.3
github.com/container-orchestrated-devices/container-device-interface v0.5.4-0.20230111111500-5b3b5d81179a
github.com/fsnotify/fsnotify v1.5.4
github.com/fsnotify/fsnotify v1.6.0
github.com/google/uuid v1.3.0
github.com/prometheus/procfs v0.1.3
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.7.0
github.com/prometheus/procfs v0.8.0
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.2
github.com/urfave/cli/v2 v2.4.0
gitlab.com/nvidia/cloud-native/go-nvlib v0.0.0-20230327171225-18ad7cd513cf
golang.org/x/net v0.7.0
google.golang.org/grpc v1.29.0
k8s.io/api v0.19.1
k8s.io/apimachinery v0.19.1
k8s.io/client-go v0.19.1
k8s.io/klog/v2 v2.2.0
golang.org/x/net v0.10.0
google.golang.org/grpc v1.56.0
k8s.io/api v0.27.3
k8s.io/apimachinery v0.27.3
k8s.io/client-go v0.27.3
k8s.io/klog/v2 v2.90.1
k8s.io/kubelet v0.0.0
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/NVIDIA/go-nvml v0.12.0-1 // indirect
github.com/NVIDIA/gpu-monitoring-tools v0.0.0-20201222072828-352eb4c503a7 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v0.2.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.0 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.4.1 // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/imdario/mergo v0.3.5 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/opencontainers/runc v1.1.4 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/runc v1.1.7 // indirect
github.com/opencontainers/runtime-spec v1.1.0-rc.2 // indirect
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/appengine v1.6.5 // indirect
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
google.golang.org/protobuf v1.27.1 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Loading

0 comments on commit 1f3dd06

Please sign in to comment.