Skip to content

Commit 3a7279a

Browse files
authored
Merge branch 'main' into feature/perdevice-uuid-timeslicing
2 parents 85954f6 + 25e4935 commit 3a7279a

141 files changed

Lines changed: 11333 additions & 26485 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
go-version: ${{ inputs.golang_version }}
4949

5050
- name: Set up Holodeck
51-
uses: NVIDIA/holodeck@v0.3.3
51+
uses: NVIDIA/holodeck@v0.3.6
5252
with:
5353
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
5454
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## Changelog
22

3+
### v0.19.3
4+
- bump nvcr.io/nvidia/distroless/go to v4.0.8-dev (#1852)
5+
- revert default enablement of features mofed, gdrcopy and mofed (#1837)
6+
- bump golang version to 1.26.4 (#1828)
7+
- bump golang.org/x/net to v0.56.0 (#1867)
8+
39
### v0.19.2
410
- Bump golang version to 1.26.3 (#1754)
511
- Bump nvidia/distroless/go to v4.0.6-dev (#1806)

cmd/config-manager/main.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,9 @@ func findPidToSignal(f *Flags) (int, error) {
453453
if err != nil {
454454
return -1, fmt.Errorf("error getting cmdline: %v", err)
455455
}
456+
if len(cmdline) == 0 {
457+
continue
458+
}
456459
if cmdline[0] == f.ProcessToSignal {
457460
return p.PID, nil
458461
}

cmd/nvidia-device-plugin/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,16 @@ func main() {
104104
},
105105
&cli.BoolFlag{
106106
Name: "gdrcopy-enabled",
107-
Value: true,
108107
Usage: "ensure that containers that request NVIDIA GPU resources are started with GDRCopy support",
109108
EnvVars: []string{"GDRCOPY_ENABLED"},
110109
},
111110
&cli.BoolFlag{
112111
Name: "gds-enabled",
113-
Value: true,
114112
Usage: "ensure that containers that request NVIDIA GPU resources are started with GPUDirect Storage support",
115113
EnvVars: []string{"GDS_ENABLED"},
116114
},
117115
&cli.BoolFlag{
118116
Name: "mofed-enabled",
119-
Value: true,
120117
Usage: "ensure that containers that request NVIDIA GPU resources are started with MOFED support",
121118
EnvVars: []string{"MOFED_ENABLED"},
122119
},

deployments/container/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.26.3 AS base
15+
FROM golang:1.26.4 AS base
1616

1717
# The devel image is used for local development.
1818
FROM base AS devel
@@ -51,7 +51,7 @@ RUN apt-get update \
5151
&& cp /bin/busybox /busybox/busybox \
5252
&& /busybox/busybox --install -s /busybox
5353

54-
FROM nvcr.io/nvidia/distroless/go:v4.0.6 AS application
54+
FROM nvcr.io/nvidia/distroless/go:v4.0.8 AS application
5555

5656
USER 0:0
5757

deployments/helm/nvidia-device-plugin/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: nvidia-device-plugin
33
type: application
44
description: A Helm chart for the nvidia-device-plugin on Kubernetes
5-
version: "0.19.2"
6-
appVersion: "0.19.2"
5+
version: "0.19.3"
6+
appVersion: "0.19.3"
77
kubeVersion: ">= 1.10.0-0"
88
home: https://github.com/NVIDIA/k8s-device-plugin
99

deployments/helm/nvidia-device-plugin/templates/daemonset-device-plugin.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
1+
{{- /*
2+
Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
143

4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/ -}}
1516
{{- if .Values.devicePlugin.enabled }}
1617
---
1718
{{- $options := (include "nvidia-device-plugin.options" . | fromJson) }}

deployments/helm/nvidia-device-plugin/templates/daemonset-gfd.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
# Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
1+
{{- /*
2+
Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
143

4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/ -}}
1516
{{- if .Values.gfd.enabled }}
1617
---
1718
{{- $options := (include "nvidia-device-plugin.options" . | fromJson) }}

deployments/helm/nvidia-device-plugin/templates/daemonset-mps-control-daemon.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
# Copyright 2024 NVIDIA CORPORATION
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
1+
{{- /*
2+
Copyright 2024 NVIDIA CORPORATION
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/ -}}
1416
{{- if .Values.devicePlugin.enabled }}
1517
---
1618
{{- $options := (include "nvidia-device-plugin.options" . | fromJson) }}

deployments/static/gpu-feature-discovery-daemonset-with-mig-mixed.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: gpu-feature-discovery
55
labels:
66
app.kubernetes.io/name: gpu-feature-discovery
7-
app.kubernetes.io/version: 0.19.2
7+
app.kubernetes.io/version: 0.19.3
88
app.kubernetes.io/part-of: nvidia-gpu
99
spec:
1010
selector:
@@ -15,11 +15,11 @@ spec:
1515
metadata:
1616
labels:
1717
app.kubernetes.io/name: gpu-feature-discovery
18-
app.kubernetes.io/version: 0.19.2
18+
app.kubernetes.io/version: 0.19.3
1919
app.kubernetes.io/part-of: nvidia-gpu
2020
spec:
2121
containers:
22-
- image: nvcr.io/nvidia/k8s-device-plugin:v0.19.2
22+
- image: nvcr.io/nvidia/k8s-device-plugin:v0.19.3
2323
name: gpu-feature-discovery
2424
command: ["/usr/bin/gpu-feature-discovery"]
2525
volumeMounts:

0 commit comments

Comments
 (0)