Skip to content

Commit 1489c9c

Browse files
committed
Merge branch '22.9.1-cherry-picks' into 'release-22.09'
Cherry-pick: Bump dcgm to 3.1.3, dcgm-exporter to 3.1.3-3.1.2, and nvidia-fs to 2.14.13 See merge request nvidia/kubernetes/gpu-operator!591
2 parents 435feae + 198d4a4 commit 1489c9c

11 files changed

+4777
-21
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif
2323
include $(CURDIR)/versions.mk
2424

2525
MODULE := github.com/NVIDIA/gpu-operator
26-
CUDA_IMAGE ?= nvidia/cuda
26+
CUDA_IMAGE ?= nvcr.io/nvidia/cuda
2727
BUILDER_IMAGE ?= golang:$(GOLANG_VERSION)
2828
DIST ?= ubi8
2929

@@ -302,4 +302,4 @@ $(BUILD_TARGETS): build-%:
302302
# This includes https://github.com/openshift-psap/ci-artifacts
303303
docker-image: OUT_IMAGE ?= $(IMAGE_NAME):$(IMAGE_TAG)
304304
docker-image: ${DEFAULT_PUSH_TARGET}
305-
endif
305+
endif

bundle/manifests/gpu-operator-certified.clusterserviceversion.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ spec:
133133
- name: gpu-operator-image
134134
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator:release-22.09-latest-ubi8
135135
- name: dcgm-exporter-image
136-
image: nvcr.io/nvidia/k8s/dcgm-exporter@sha256:4f991f2be8ec9f590ed53d15bcc5d9cf105298b1eca2d69b8449f8972e6a3faf
136+
image: nvcr.io/nvidia/k8s/dcgm-exporter@sha256:9a00cdfdddb73327ef8e8e0fa60e50926a388d380c551bba6a3d3012be40401d
137137
- name: dcgm-image
138-
image: nvcr.io/nvidia/cloud-native/dcgm@sha256:150c446598d4ab03db0fd2301b1922aabdf3e0159571c71abe4489075639b2e7
138+
image: nvcr.io/nvidia/cloud-native/dcgm@sha256:c3cf59dd5d6160eba5d816ade2e81b35ebb10f4884df67971f6ace36f8e6efc1
139139
- name: container-toolkit-image
140140
image: nvcr.io/nvidia/k8s/container-toolkit@sha256:efb88937f73434994d1bbadc87b492a1df047aa9f8d6e9f5ec3b09536e6e7691
141141
- name: driver-image
@@ -155,13 +155,13 @@ spec:
155155
- name: mig-manager-image
156156
image: nvcr.io/nvidia/cloud-native/k8s-mig-manager@sha256:50c2a2b998e467c82716efa79fe136aa6f7ea95fd23576cf384d251bb9628640
157157
- name: init-container-image
158-
image: nvcr.io/nvidia/cuda@sha256:7e840c252c730279c0e3f89b68208aac02ded73c945c0c21e2f1d23b1a9b052f
158+
image: nvcr.io/nvidia/cuda@sha256:5f2a2d8977f2c59abe88394f05cc3c044194554f90994d8554b0e1117ab5900d
159159
- name: gpu-operator-validator-image
160160
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-validator:release-22.09-latest-ubi8
161161
- name: k8s-driver-manager-image
162162
image: nvcr.io/nvidia/cloud-native/k8s-driver-manager@sha256:6240c5912aabed789c672f3179b4a65e45511d10fa8c41a5de0d91644a792b14
163163
- name: vfio-manager-image
164-
image: nvcr.io/nvidia/cuda@sha256:7e840c252c730279c0e3f89b68208aac02ded73c945c0c21e2f1d23b1a9b052f
164+
image: nvcr.io/nvidia/cuda@sha256:5f2a2d8977f2c59abe88394f05cc3c044194554f90994d8554b0e1117ab5900d
165165
- name: sandbox-device-plugin-image
166166
image: nvcr.io/nvidia/kubevirt-gpu-device-plugin@sha256:0d47dad29d2ef445b301c5c64717758eed43a606345b79f97bce2e64b40a91a8
167167
- name: vgpu-device-manager-image
@@ -763,9 +763,9 @@ spec:
763763
- name: "CONTAINER_TOOLKIT_IMAGE"
764764
value: "nvcr.io/nvidia/k8s/container-toolkit@sha256:efb88937f73434994d1bbadc87b492a1df047aa9f8d6e9f5ec3b09536e6e7691"
765765
- name: "DCGM_IMAGE"
766-
value: "nvcr.io/nvidia/cloud-native/dcgm@sha256:150c446598d4ab03db0fd2301b1922aabdf3e0159571c71abe4489075639b2e7"
766+
value: "nvcr.io/nvidia/cloud-native/dcgm@sha256:c3cf59dd5d6160eba5d816ade2e81b35ebb10f4884df67971f6ace36f8e6efc1"
767767
- name: "DCGM_EXPORTER_IMAGE"
768-
value: "nvcr.io/nvidia/k8s/dcgm-exporter@sha256:4f991f2be8ec9f590ed53d15bcc5d9cf105298b1eca2d69b8449f8972e6a3faf"
768+
value: "nvcr.io/nvidia/k8s/dcgm-exporter@sha256:9a00cdfdddb73327ef8e8e0fa60e50926a388d380c551bba6a3d3012be40401d"
769769
- name: "DEVICE_PLUGIN_IMAGE"
770770
value: "nvcr.io/nvidia/k8s-device-plugin@sha256:9c17d3a907eb77eb8f7b4f3faf52d8352e4252af92003f828083f80d629bd2c3"
771771
- name: "DRIVER_IMAGE"
@@ -783,9 +783,9 @@ spec:
783783
- name: "MIG_MANAGER_IMAGE"
784784
value: "nvcr.io/nvidia/cloud-native/k8s-mig-manager@sha256:50c2a2b998e467c82716efa79fe136aa6f7ea95fd23576cf384d251bb9628640"
785785
- name: "CUDA_BASE_IMAGE"
786-
value: "nvcr.io/nvidia/cuda@sha256:7e840c252c730279c0e3f89b68208aac02ded73c945c0c21e2f1d23b1a9b052f"
786+
value: "nvcr.io/nvidia/cuda@sha256:5f2a2d8977f2c59abe88394f05cc3c044194554f90994d8554b0e1117ab5900d"
787787
- name: "VFIO_MANAGER_IMAGE"
788-
value: "nvcr.io/nvidia/cuda@sha256:7e840c252c730279c0e3f89b68208aac02ded73c945c0c21e2f1d23b1a9b052f"
788+
value: "nvcr.io/nvidia/cuda@sha256:5f2a2d8977f2c59abe88394f05cc3c044194554f90994d8554b0e1117ab5900d"
789789
- name: "SANDBOX_DEVICE_PLUGIN_IMAGE"
790790
value: "nvcr.io/nvidia/kubevirt-gpu-device-plugin@sha256:0d47dad29d2ef445b301c5c64717758eed43a606345b79f97bce2e64b40a91a8"
791791
- name: "VGPU_DEVICE_MANAGER_IMAGE"

0 commit comments

Comments
 (0)