Skip to content

Commit 6e19949

Browse files
Shiva Kumarshivakunv
authored andcommitted
fix: update digest lookup to use versioned RepoTags instead of latest
Signed-off-by: Shiva Kumar (SW-CLOUD) <shivaku@nvidia.com>
1 parent 88bae15 commit 6e19949

3 files changed

Lines changed: 61 additions & 51 deletions

File tree

.github/renovate.json

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,36 +27,40 @@
2727
"recreateWhen": "always",
2828
"separateMultipleMajor": false,
2929
"separateMinorPatch": false,
30+
"pruneStaleBranches": true,
31+
"rebaseWhen": "always",
32+
"force": {
33+
"createPr": true,
34+
"createPrEvenIfClosed": true
35+
},
36+
3037
"customManagers": [
3138
{
3239
"customType": "regex",
3340
"managerFilePatterns": [
34-
"bundle/manifests/gpu-operator-certified.clusterserviceversion.yaml"
41+
"deployments/gpu-operator/values.yaml"
3542
],
3643
"matchStrings": [
37-
"[-\\s]*value:\\s*\"?(?<depName>[^:\"]+)(?::(?<currentValue>[^@\"]+))?@(?<currentDigest>sha256:[a-f0-9]{64})\"?",
38-
"[-\\s]*image: (?<depName>.*?)(?::(?<currentValue>.*?))?@(?<currentDigest>sha256:[a-f0-9]{64})",
39-
"- name: (?<suffix>[\\w-]+)[-\\s]*image: (?<depName>.*?)(?::(?<currentValue>.*?))?@(?<currentDigest>sha256:[a-f0-9]{64})"
44+
"[-\\s]*repository:\\s*(?<repo>\\S+)\\s*\\n(?:\\s*#.*\\n|\\s*\\n)*[-\\s]*image:\\s*(?<image>\\S+)\\s*\\n(?:\\s*#.*\\n|\\s*\\n)*[-\\s]*version:\\s*(?<currentValue>\\S+)"
4045
],
41-
"versioningTemplate": "{{depName}}{{#if newValue}}:{{newValue}}{{/if}}{{#if newDigest}}@{{newDigest}}{{/if}}",
42-
"datasourceTemplate": "docker"
46+
"depNameTemplate": "{{repo}}/{{image}}",
47+
"datasourceTemplate": "docker",
48+
"versioningTemplate": "loose"
4349
},
4450
{
4551
"customType": "regex",
4652
"managerFilePatterns": [
47-
"deployments/gpu-operator/values.yaml"
53+
"bundle/manifests/gpu-operator-certified.clusterserviceversion.yaml"
4854
],
4955
"matchStrings": [
50-
"[-\\s]*repository:\\s*(?<repo>\\S+)\\s*\\n(?:\\s*#.*\\n|\\s*\\n)*[-\\s]*image:\\s*(?<image>\\S+)\\s*\\n(?:\\s*#.*\\n|\\s*\\n)*[-\\s]*version:\\s*(?<currentValue>\\S+)"
56+
"(?:value|image):\\s*[\"']?(?<depName>[^:\"'\\s]+):(?<currentValue>[^@\"'\\s]+)@(?<currentDigest>sha256:[a-f0-9]{64})"
5157
],
52-
"depNameTemplate": "{{repo}}/{{image}}",
53-
"datasourceTemplate": "docker",
54-
"versioningTemplate": "loose"
58+
"datasourceTemplate": "docker"
5559
}
5660
],
61+
5762
"packageRules": [
5863
{
59-
"matchPaths": ["deployments/gpu-operator/values.yaml"],
6064
"matchPackageNames": [
6165
"nvcr.io/nvidia/cloud-native/k8s-driver-manager",
6266
"nvcr.io/nvidia/cloud-native/k8s-kata-manager",
@@ -69,37 +73,41 @@
6973
"separateMajorMinor": false
7074
},
7175
{
72-
"matchPaths": ["deployments/gpu-operator/values.yaml"],
7376
"matchPackageNames": [
74-
"nvcr.io/nvidia/k8s/container-toolkit",
75-
"nvcr.io/nvidia/cloud-native/k8s-mig-manager"
77+
"nvcr.io/nvidia/cloud-native/k8s-mig-manager"
7678
],
77-
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-ubuntu(?<ubuntu>\\d+\\.\\d+)$",
79+
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:-ubuntu(?<ubuntu>\\d+\\.\\d+))?$",
7880
"separateMajorMinor": false
7981
},
8082
{
81-
"matchPaths": ["deployments/gpu-operator/values.yaml"],
82-
"matchPackageNames": [
83-
"nvcr.io/nvidia/k8s/dcgm-exporter"
84-
],
85-
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-distroless$",
83+
"matchPackageNames": ["nvcr.io/nvidia/cuda"],
84+
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-base-ubi9$",
8685
"separateMajorMinor": false
8786
},
8887
{
89-
"matchPaths": ["deployments/gpu-operator/values.yaml"],
90-
"matchPackageNames": [
91-
"nvcr.io/nvidia/cuda"
92-
],
93-
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-base-ubi9$",
88+
"matchPackageNames": ["nvcr.io/nvidia/k8s/dcgm-exporter"],
89+
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-\\d+\\.\\d+\\.\\d+-distroless$",
90+
"separateMajorMinor": false
91+
},
92+
{
93+
"matchPackageNames": ["nvcr.io/nvidia/cloud-native/dcgm"],
94+
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<rev>\\d+)-ubi9$",
95+
"separateMajorMinor": false
96+
},
97+
{
98+
"matchPackageNames": ["nvcr.io/nvidia/k8s/container-toolkit"],
99+
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:-rc\\.(?<build>\\d+))?$",
94100
"separateMajorMinor": false
95101
},
96102
{
97103
"matchPackageNames": ["nvcr.io/nvidia/driver"],
98104
"enabled": false
99105
},
100106
{
101-
"matchDatasources": ["*"],
102-
"groupName": "{{depName}}"
107+
"matchDatasources": ["docker"],
108+
"groupName": "{{depName}}",
109+
"branchTopic": "{{depName}}",
110+
"commitMessageTopic": "{{depName}}"
103111
}
104112
]
105113
}

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

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -201,38 +201,39 @@ spec:
201201
- name: gpu-operator-image
202202
image: ghcr.io/nvidia/gpu-operator:main-latest
203203
- name: dcgm-exporter-image
204-
image: nvcr.io/nvidia/k8s/dcgm-exporter@sha256:7c0ac4430bb0a5868b7404a0e06c47e02b0375b61aadd614385ad0bc2d43815a
204+
image: nvcr.io/nvidia/k8s/dcgm-exporter:4.4.2-4.7.0-distroless@sha256:7c0ac4430bb0a5868b7404a0e06c47e02b0375b61aadd614385ad0bc2d43815a
205205
- name: dcgm-image
206-
image: nvcr.io/nvidia/cloud-native/dcgm@sha256:99187d6b023689f50cf065c77b96ba5aacfa26a618854608a1e31da5e826b765
206+
image: nvcr.io/nvidia/cloud-native/dcgm:4.4.2-1-ubi9@sha256:99187d6b023689f50cf065c77b96ba5aacfa26a618854608a1e31da5e826b765
207207
- name: container-toolkit-image
208-
image: nvcr.io/nvidia/k8s/container-toolkit@sha256:ef2a0ef6bbf9c43529da3730974de9d51b8436c2314a68e718d437e6ab7c4b58
208+
image: nvcr.io/nvidia/k8s/container-toolkit:v1.18.1@sha256:ef2a0ef6bbf9c43529da3730974de9d51b8436c2314a68e718d437e6ab7c4b58
209209
- name: driver-image
210210
image: nvcr.io/nvidia/driver@sha256:838f50e304e8880851bae205edc6b781a251b5912267a2eed21661211db8e087
211211
- name: driver-image-570
212212
image: nvcr.io/nvidia/driver@sha256:ef9856ae8491b376364df1f0cad388bcf9983bd2b6c78000523c13536cf828c3
213213
- name: driver-image-535
214214
image: nvcr.io/nvidia/driver@sha256:35359117c5cdf786694d2fdba2ba038e7f673c5d0243c9ed4dc6cdaf6e675e4a
215215
- name: device-plugin-image
216-
image: nvcr.io/nvidia/k8s-device-plugin@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7
216+
image: nvcr.io/nvidia/k8s-device-plugin:v0.18.1@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7
217217
- name: gpu-feature-discovery-image
218-
image: nvcr.io/nvidia/k8s-device-plugin@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7
218+
image: nvcr.io/nvidia/k8s-device-plugin:v0.18.1@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7
219219
- name: mig-manager-image
220-
image: nvcr.io/nvidia/cloud-native/k8s-mig-manager@sha256:8e0803d2f29776cd4cc0501381a20a0b04b2da507a794d66a15894c57beaadb5
220+
image: nvcr.io/nvidia/cloud-native/k8s-mig-manager:v0.13.1@sha256:8e0803d2f29776cd4cc0501381a20a0b04b2da507a794d66a15894c57beaadb5
221221
- name: init-container-image
222-
image: nvcr.io/nvidia/cuda@sha256:d19fe621624c4eb6ac931b8558daa3ecc0c3f07f1e2a52e0267e083d22dceade
222+
image: nvcr.io/nvidia/cuda:13.0.1-base-ubi9@sha256:d19fe621624c4eb6ac931b8558daa3ecc0c3f07f1e2a52e0267e083d22dceade
223223
- name: gpu-operator-validator-image
224224
image: ghcr.io/nvidia/gpu-operator:main-latest
225225
- name: k8s-driver-manager-image
226-
image: nvcr.io/nvidia/cloud-native/k8s-driver-manager@sha256:c549346eb993fda62e9bf665aabaacc88abc06b0b24e69635427d4d71c2d5ed4
226+
image: nvcr.io/nvidia/cloud-native/k8s-driver-manager:v0.9.1@sha256:c549346eb993fda62e9bf665aabaacc88abc06b0b24e69635427d4d71c2d5ed4
227227
# TODO: update to a k8s-driver-manager image from nvcr.io once the next version is published
228+
# TODO: Add Renovate rule to update this image to the values.yaml image
228229
- name: vfio-manager-image
229230
image: ghcr.io/nvidia/k8s-driver-manager:69eec274
230231
- name: sandbox-device-plugin-image
231-
image: nvcr.io/nvidia/kubevirt-gpu-device-plugin@sha256:119de9a331a47203858b99901f44d0c4a8052961b4e60327f4b100d0ab8c9df0
232+
image: nvcr.io/nvidia/kubevirt-gpu-device-plugin:v1.4.0@sha256:119de9a331a47203858b99901f44d0c4a8052961b4e60327f4b100d0ab8c9df0
232233
- name: vgpu-device-manager-image
233-
image: nvcr.io/nvidia/cloud-native/vgpu-device-manager@sha256:098c01e11589e08ede9ffb3002d1c3dff424f0f0c5d1bfcbfd54a359073f16dd
234+
image: nvcr.io/nvidia/cloud-native/vgpu-device-manager:v0.4.1@sha256:098c01e11589e08ede9ffb3002d1c3dff424f0f0c5d1bfcbfd54a359073f16dd
234235
- name: gdrcopy-image
235-
image: nvcr.io/nvidia/cloud-native/gdrdrv@sha256:5c4e61f7ba83d7a64ff2523d447c209ce5bde1ddc79acaf1f32f19620b4912d6
236+
image: nvcr.io/nvidia/cloud-native/gdrdrv:v2.5.1@sha256:5c4e61f7ba83d7a64ff2523d447c209ce5bde1ddc79acaf1f32f19620b4912d6
236237
customresourcedefinitions:
237238
owned:
238239
- name: nvidiadrivers.nvidia.com
@@ -920,36 +921,37 @@ spec:
920921
- name: "VALIDATOR_IMAGE"
921922
value: "ghcr.io/nvidia/gpu-operator:main-latest"
922923
- name: "GFD_IMAGE"
923-
value: "nvcr.io/nvidia/k8s-device-plugin@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7"
924+
value: "nvcr.io/nvidia/k8s-device-plugin:v0.18.1@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7"
924925
- name: "CONTAINER_TOOLKIT_IMAGE"
925-
value: "nvcr.io/nvidia/k8s/container-toolkit@sha256:ef2a0ef6bbf9c43529da3730974de9d51b8436c2314a68e718d437e6ab7c4b58"
926+
value: "nvcr.io/nvidia/k8s/container-toolkit:v1.18.1@sha256:ef2a0ef6bbf9c43529da3730974de9d51b8436c2314a68e718d437e6ab7c4b58"
926927
- name: "DCGM_IMAGE"
927-
value: "nvcr.io/nvidia/cloud-native/dcgm@sha256:99187d6b023689f50cf065c77b96ba5aacfa26a618854608a1e31da5e826b765"
928+
value: "nvcr.io/nvidia/cloud-native/dcgm:4.4.2-1-ubi9@sha256:99187d6b023689f50cf065c77b96ba5aacfa26a618854608a1e31da5e826b765"
928929
- name: "DCGM_EXPORTER_IMAGE"
929-
value: "nvcr.io/nvidia/k8s/dcgm-exporter@sha256:7c0ac4430bb0a5868b7404a0e06c47e02b0375b61aadd614385ad0bc2d43815a"
930+
value: "nvcr.io/nvidia/k8s/dcgm-exporter:4.4.2-4.7.0-distroless@sha256:7c0ac4430bb0a5868b7404a0e06c47e02b0375b61aadd614385ad0bc2d43815a"
930931
- name: "DEVICE_PLUGIN_IMAGE"
931-
value: "nvcr.io/nvidia/k8s-device-plugin@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7"
932+
value: "nvcr.io/nvidia/k8s-device-plugin:v0.18.1@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7"
932933
- name: "DRIVER_IMAGE"
933934
value: "nvcr.io/nvidia/driver@sha256:838f50e304e8880851bae205edc6b781a251b5912267a2eed21661211db8e087"
934935
- name: "DRIVER_IMAGE-570"
935936
value: "nvcr.io/nvidia/driver@sha256:ef9856ae8491b376364df1f0cad388bcf9983bd2b6c78000523c13536cf828c3"
936937
- name: "DRIVER_IMAGE-535"
937938
value: "nvcr.io/nvidia/driver@sha256:35359117c5cdf786694d2fdba2ba038e7f673c5d0243c9ed4dc6cdaf6e675e4a"
938939
- name: "DRIVER_MANAGER_IMAGE"
939-
value: "nvcr.io/nvidia/cloud-native/k8s-driver-manager@sha256:c549346eb993fda62e9bf665aabaacc88abc06b0b24e69635427d4d71c2d5ed4"
940+
value: "nvcr.io/nvidia/cloud-native/k8s-driver-manager:v0.9.1@sha256:c549346eb993fda62e9bf665aabaacc88abc06b0b24e69635427d4d71c2d5ed4"
940941
- name: "MIG_MANAGER_IMAGE"
941-
value: "nvcr.io/nvidia/cloud-native/k8s-mig-manager@sha256:8e0803d2f29776cd4cc0501381a20a0b04b2da507a794d66a15894c57beaadb5"
942+
value: "nvcr.io/nvidia/cloud-native/k8s-mig-manager:v0.13.1@sha256:8e0803d2f29776cd4cc0501381a20a0b04b2da507a794d66a15894c57beaadb5"
942943
- name: "CUDA_BASE_IMAGE"
943-
value: "nvcr.io/nvidia/cuda@sha256:d19fe621624c4eb6ac931b8558daa3ecc0c3f07f1e2a52e0267e083d22dceade"
944+
value: "nvcr.io/nvidia/cuda:13.0.1-base-ubi9@sha256:d19fe621624c4eb6ac931b8558daa3ecc0c3f07f1e2a52e0267e083d22dceade"
944945
# TODO: update to a k8s-driver-manager image from nvcr.io once the next version is published
946+
# Add Renovate rule to update this image to the values.yaml image
945947
- name: "VFIO_MANAGER_IMAGE"
946948
value: "ghcr.io/nvidia/k8s-driver-manager:69eec274"
947949
- name: "SANDBOX_DEVICE_PLUGIN_IMAGE"
948-
value: "nvcr.io/nvidia/kubevirt-gpu-device-plugin@sha256:119de9a331a47203858b99901f44d0c4a8052961b4e60327f4b100d0ab8c9df0"
950+
value: "nvcr.io/nvidia/kubevirt-gpu-device-plugin:v1.4.0@sha256:119de9a331a47203858b99901f44d0c4a8052961b4e60327f4b100d0ab8c9df0"
949951
- name: "VGPU_DEVICE_MANAGER_IMAGE"
950-
value: "nvcr.io/nvidia/cloud-native/vgpu-device-manager@sha256:098c01e11589e08ede9ffb3002d1c3dff424f0f0c5d1bfcbfd54a359073f16dd"
952+
value: "nvcr.io/nvidia/cloud-native/vgpu-device-manager:v0.4.1@sha256:098c01e11589e08ede9ffb3002d1c3dff424f0f0c5d1bfcbfd54a359073f16dd"
951953
- name: "GDRCOPY_IMAGE"
952-
value: "nvcr.io/nvidia/cloud-native/gdrdrv@sha256:5c4e61f7ba83d7a64ff2523d447c209ce5bde1ddc79acaf1f32f19620b4912d6"
954+
value: "nvcr.io/nvidia/cloud-native/gdrdrv:v2.5.1@sha256:5c4e61f7ba83d7a64ff2523d447c209ce5bde1ddc79acaf1f32f19620b4912d6"
953955
terminationGracePeriodSeconds: 10
954956
volumes:
955957
- hostPath:

deployments/gpu-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ dcgm:
268268
enabled: false
269269
repository: nvcr.io/nvidia/cloud-native
270270
image: dcgm
271-
version: 4.4.2-1-ubuntu22.04
271+
version: 4.4.2-1-ubi9
272272
imagePullPolicy: IfNotPresent
273273
args: []
274274
env: []

0 commit comments

Comments
 (0)