fix: container-toolkit patched image with fixed CVE (#2415)

* fix: container-toolkit patched image with fixed CVE * fix: container-toolkit patched image with fixed CVE * fix: container-toolkit patched image with fixed CVE * fix: container-toolkit patched image with fixed CVE * fix: container-toolkit patched image with fixed CVE * fix: container-toolkit patched image with fixed CVE
mesosphere · Jul 22, 2024 · 8245728 · 8245728
1 parent 34d7f85
commit 8245728
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 6 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -403,10 +403,10 @@ resources:
       - license_path: LICENSE
         ref: ${image_tag%-ubuntu20.04}
         url: https://github.com/NVIDIA/nvidia-container-toolkit
-  - container_image: nvcr.io/nvidia/k8s/container-toolkit:v1.15.0-ubi8
+  - container_image: ghcr.io/mesosphere/dkp-container-images/nvcr.io/nvidia/k8s/container-toolkit:v1.15.0-ubi8-d2iq.0
     sources:
       - license_path: LICENSE
-        ref: ${image_tag%-ubi8}
+        ref: ${image_tag%-ubi8-d2iq.0}
         url: https://github.com/NVIDIA/nvidia-container-toolkit
   - container_image: nvcr.io/nvidia/k8s/dcgm-exporter:3.3.5-3.4.1-ubuntu22.04
     sources:

diff --git a/...idia-gpu-operator/24.3.0/defaults/cm.yaml → ...u-operator/24.3.0-d2iq.0/defaults/cm.yaml b/...idia-gpu-operator/24.3.0/defaults/cm.yaml → ...u-operator/24.3.0-d2iq.0/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: nvidia-gpu-operator-24.3.0-d2iq-defaults
+  name: nvidia-gpu-operator-24.3.0-d2iq.0-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |

diff --git a/...erator/24.3.0/defaults/kustomization.yaml → ...24.3.0-d2iq.0/defaults/kustomization.yaml b/...erator/24.3.0/defaults/kustomization.yaml → ...24.3.0-d2iq.0/defaults/kustomization.yaml
diff --git a/....3.0/grafana-dashboards/gpu-operator.json → ...iq.0/grafana-dashboards/gpu-operator.json b/....3.0/grafana-dashboards/gpu-operator.json → ...iq.0/grafana-dashboards/gpu-operator.json
diff --git a/...3.0/grafana-dashboards/kustomization.yaml → ...q.0/grafana-dashboards/kustomization.yaml b/...3.0/grafana-dashboards/kustomization.yaml → ...q.0/grafana-dashboards/kustomization.yaml
diff --git a/...idia-gpu-operator/24.3.0/helmrelease.yaml → ...u-operator/24.3.0-d2iq.0/helmrelease.yaml b/...idia-gpu-operator/24.3.0/helmrelease.yaml → ...u-operator/24.3.0-d2iq.0/helmrelease.yaml
@@ -9,7 +9,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/nvidia-gpu-operator/24.3.0/helmrelease
+  path: ./services/nvidia-gpu-operator/24.3.0-d2iq.0/helmrelease
   sourceRef:
     kind: GitRepository
     name: management

diff --git a/...rator/24.3.0/helmrelease/extra-images.txt → ...4.3.0-d2iq.0/helmrelease/extra-images.txt b/...rator/24.3.0/helmrelease/extra-images.txt → ...4.3.0-d2iq.0/helmrelease/extra-images.txt
@@ -1,5 +1,5 @@
 nvcr.io/nvidia/k8s/container-toolkit:{{ regexReplaceAllLiteral "-.+$" .Values.toolkit.version "" }}-ubuntu20.04
-nvcr.io/nvidia/k8s/container-toolkit:{{ regexReplaceAllLiteral "-.+$" .Values.toolkit.version "" }}-ubi8
+ghcr.io/mesosphere/dkp-container-images/nvcr.io/nvidia/k8s/container-toolkit:{{ regexReplaceAllLiteral "-.+$" .Values.toolkit.version "" }}-ubi8-d2iq.0
 nvcr.io/nvidia/cloud-native/gpu-operator-validator:{{ .Values.validator.version }}
 nvcr.io/nvidia/cloud-native/dcgm:{{ .Values.dcgm.version }}
 nvcr.io/nvidia/k8s/dcgm-exporter:{{ .Values.dcgmExporter.version }}

diff --git a/...tor/24.3.0/helmrelease/kustomization.yaml → ...3.0-d2iq.0/helmrelease/kustomization.yaml b/...tor/24.3.0/helmrelease/kustomization.yaml → ...3.0-d2iq.0/helmrelease/kustomization.yaml
diff --git a/...u-operator/24.3.0/helmrelease/nvidia.yaml → ...tor/24.3.0-d2iq.0/helmrelease/nvidia.yaml b/...u-operator/24.3.0/helmrelease/nvidia.yaml → ...tor/24.3.0-d2iq.0/helmrelease/nvidia.yaml
@@ -24,5 +24,5 @@ spec:
   releaseName: nvidia-gpu-operator
   valuesFrom:
     - kind: ConfigMap
-      name: nvidia-gpu-operator-24.3.0-d2iq-defaults
+      name: nvidia-gpu-operator-24.3.0-d2iq.0-defaults
   targetNamespace: ${releaseNamespace}
diff --git a/...ia-gpu-operator/24.3.0/kustomization.yaml → ...operator/24.3.0-d2iq.0/kustomization.yaml b/...ia-gpu-operator/24.3.0/kustomization.yaml → ...operator/24.3.0-d2iq.0/kustomization.yaml