Skip to content

Commit a63305b

Browse files
Shiva Kumarrajathagasthya
Shiva Kumar
authored and
rajathagasthya
committed
fix: update digest lookup to use versioned RepoTags instead of latest
Signed-off-by: Shiva Kumar (SW-CLOUD) <shivaku@nvidia.com> Signed-off-by: Rajath Agasthya <ragasthya@nvidia.com>
1 parent 2082bd9 commit a63305b

3 files changed

Lines changed: 58 additions & 49 deletions

File tree

‎.github/renovate.json‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,35 @@
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
],
5761
"labels": [
@@ -60,7 +64,6 @@
6064
],
6165
"packageRules": [
6266
{
63-
"matchPaths": ["deployments/gpu-operator/values.yaml"],
6467
"matchPackageNames": [
6568
"nvcr.io/nvidia/cloud-native/k8s-driver-manager",
6669
"nvcr.io/nvidia/cloud-native/k8s-kata-manager",
@@ -73,37 +76,41 @@
7376
"separateMajorMinor": false
7477
},
7578
{
76-
"matchPaths": ["deployments/gpu-operator/values.yaml"],
7779
"matchPackageNames": [
78-
"nvcr.io/nvidia/k8s/container-toolkit",
79-
"nvcr.io/nvidia/cloud-native/k8s-mig-manager"
80+
"nvcr.io/nvidia/cloud-native/k8s-mig-manager"
8081
],
81-
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-ubuntu(?<ubuntu>\\d+\\.\\d+)$",
82+
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)$",
8283
"separateMajorMinor": false
8384
},
8485
{
85-
"matchPaths": ["deployments/gpu-operator/values.yaml"],
86-
"matchPackageNames": [
87-
"nvcr.io/nvidia/k8s/dcgm-exporter"
88-
],
89-
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-distroless$",
86+
"matchPackageNames": ["nvcr.io/nvidia/cuda"],
87+
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-base-ubi9$",
9088
"separateMajorMinor": false
9189
},
9290
{
93-
"matchPaths": ["deployments/gpu-operator/values.yaml"],
94-
"matchPackageNames": [
95-
"nvcr.io/nvidia/cuda"
96-
],
97-
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-base-ubi9$",
91+
"matchPackageNames": ["nvcr.io/nvidia/k8s/dcgm-exporter"],
92+
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<build>\\d+)\\.(?<revision>\\d+)\\.(?<compatibility>\\d+)-distroless$",
93+
"separateMajorMinor": false
94+
},
95+
{
96+
"matchPackageNames": ["nvcr.io/nvidia/cloud-native/dcgm"],
97+
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<revision>\\d+)-ubi9$",
98+
"separateMajorMinor": false
99+
},
100+
{
101+
"matchPackageNames": ["nvcr.io/nvidia/k8s/container-toolkit"],
102+
"versioning": "regex:^v?(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)(?:-rc\\.(?<prerelease>\\d+))?$",
98103
"separateMajorMinor": false
99104
},
100105
{
101106
"matchPackageNames": ["nvcr.io/nvidia/driver"],
102107
"enabled": false
103108
},
104109
{
105-
"matchDatasources": ["*"],
106-
"groupName": "{{depName}}"
110+
"matchDatasources": ["docker"],
111+
"groupName": "{{depName}}",
112+
"branchTopic": "{{depName}}",
113+
"commitMessageTopic": "{{depName}}"
107114
}
108115
]
109116
}

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

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -199,36 +199,37 @@ spec:
199199
- name: gpu-operator-image
200200
image: ghcr.io/nvidia/gpu-operator:main-latest
201201
- name: dcgm-exporter-image
202-
image: nvcr.io/nvidia/k8s/dcgm-exporter@sha256:b5d8813707469c5717ce27a5fefb933a29e8ba6cd2fd7d93ad3dcd6ae18579ef
202+
image: nvcr.io/nvidia/k8s/dcgm-exporter:4.5.1-4.8.0-distroless@sha256:b5d8813707469c5717ce27a5fefb933a29e8ba6cd2fd7d93ad3dcd6ae18579ef
203203
- name: dcgm-image
204-
image: nvcr.io/nvidia/cloud-native/dcgm@sha256:d7558fa75ed7b703665cbc6ba6360ef4e53ecdefe65c1881c165d2ac816c674a
204+
image: nvcr.io/nvidia/cloud-native/dcgm:4.5.2-1-ubi9@sha256:d7558fa75ed7b703665cbc6ba6360ef4e53ecdefe65c1881c165d2ac816c674a
205205
- name: container-toolkit-image
206-
image: nvcr.io/nvidia/k8s/container-toolkit@sha256:2e607e6b3156f6e61018d211078a5f576939c29a9d8764b2e99c245833045622
206+
image: nvcr.io/nvidia/k8s/container-toolkit:v1.19.0-rc.3@sha256:2e607e6b3156f6e61018d211078a5f576939c29a9d8764b2e99c245833045622
207207
- name: driver-image
208208
image: nvcr.io/nvidia/driver@sha256:2df62cd428d73ee04779ed7dd89f278bd407ff641208fa47f0f569ac39c9d75b
209209
- name: driver-image-570
210210
image: nvcr.io/nvidia/driver@sha256:38d55e5d1de9a774da98754166d2ae0b114d308f1fc151fdd6b184f4f7fa2db7
211211
- name: driver-image-535
212212
image: nvcr.io/nvidia/driver@sha256:659d9315957ffa2a3f2a003716f066f6a1b3c06ae5557192148ed410dc1b9a6e
213213
- name: device-plugin-image
214-
image: nvcr.io/nvidia/k8s-device-plugin@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7
214+
image: nvcr.io/nvidia/k8s-device-plugin:v0.18.1@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7
215215
- name: gpu-feature-discovery-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: mig-manager-image
218-
image: nvcr.io/nvidia/cloud-native/k8s-mig-manager@sha256:8e0803d2f29776cd4cc0501381a20a0b04b2da507a794d66a15894c57beaadb5
218+
image: nvcr.io/nvidia/cloud-native/k8s-mig-manager:v0.13.1@sha256:8e0803d2f29776cd4cc0501381a20a0b04b2da507a794d66a15894c57beaadb5
219219
- name: gpu-operator-validator-image
220220
image: ghcr.io/nvidia/gpu-operator:main-latest
221221
- name: k8s-driver-manager-image
222-
image: nvcr.io/nvidia/cloud-native/k8s-driver-manager@sha256:c549346eb993fda62e9bf665aabaacc88abc06b0b24e69635427d4d71c2d5ed4
222+
image: nvcr.io/nvidia/cloud-native/k8s-driver-manager:v0.9.1@sha256:c549346eb993fda62e9bf665aabaacc88abc06b0b24e69635427d4d71c2d5ed4
223223
# TODO: update to a k8s-driver-manager image from nvcr.io once the next version is published
224+
# TODO: Add Renovate rule to update this image to the values.yaml image
224225
- name: vfio-manager-image
225226
image: ghcr.io/nvidia/k8s-driver-manager:69eec274
226227
- name: sandbox-device-plugin-image
227-
image: nvcr.io/nvidia/kubevirt-gpu-device-plugin@sha256:119de9a331a47203858b99901f44d0c4a8052961b4e60327f4b100d0ab8c9df0
228+
image: nvcr.io/nvidia/kubevirt-gpu-device-plugin:v1.4.0@sha256:119de9a331a47203858b99901f44d0c4a8052961b4e60327f4b100d0ab8c9df0
228229
- name: vgpu-device-manager-image
229-
image: nvcr.io/nvidia/cloud-native/vgpu-device-manager@sha256:098c01e11589e08ede9ffb3002d1c3dff424f0f0c5d1bfcbfd54a359073f16dd
230+
image: nvcr.io/nvidia/cloud-native/vgpu-device-manager:v0.4.1@sha256:098c01e11589e08ede9ffb3002d1c3dff424f0f0c5d1bfcbfd54a359073f16dd
230231
- name: gdrcopy-image
231-
image: nvcr.io/nvidia/cloud-native/gdrdrv@sha256:5c4e61f7ba83d7a64ff2523d447c209ce5bde1ddc79acaf1f32f19620b4912d6
232+
image: nvcr.io/nvidia/cloud-native/gdrdrv:v2.5.1@sha256:5c4e61f7ba83d7a64ff2523d447c209ce5bde1ddc79acaf1f32f19620b4912d6
232233
customresourcedefinitions:
233234
owned:
234235
- name: nvidiadrivers.nvidia.com
@@ -916,34 +917,35 @@ spec:
916917
- name: "VALIDATOR_IMAGE"
917918
value: "ghcr.io/nvidia/gpu-operator:main-latest"
918919
- name: "GFD_IMAGE"
919-
value: "nvcr.io/nvidia/k8s-device-plugin@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7"
920+
value: "nvcr.io/nvidia/k8s-device-plugin:v0.18.1@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7"
920921
- name: "CONTAINER_TOOLKIT_IMAGE"
921-
value: "nvcr.io/nvidia/k8s/container-toolkit@sha256:2e607e6b3156f6e61018d211078a5f576939c29a9d8764b2e99c245833045622"
922+
value: "nvcr.io/nvidia/k8s/container-toolkit:v1.19.0-rc.3@sha256:2e607e6b3156f6e61018d211078a5f576939c29a9d8764b2e99c245833045622"
922923
- name: "DCGM_IMAGE"
923-
value: "nvcr.io/nvidia/cloud-native/dcgm@sha256:d7558fa75ed7b703665cbc6ba6360ef4e53ecdefe65c1881c165d2ac816c674a"
924+
value: "nvcr.io/nvidia/cloud-native/dcgm:4.5.2-1-ubi9@sha256:d7558fa75ed7b703665cbc6ba6360ef4e53ecdefe65c1881c165d2ac816c674a"
924925
- name: "DCGM_EXPORTER_IMAGE"
925-
value: "nvcr.io/nvidia/k8s/dcgm-exporter@sha256:b5d8813707469c5717ce27a5fefb933a29e8ba6cd2fd7d93ad3dcd6ae18579ef"
926+
value: "nvcr.io/nvidia/k8s/dcgm-exporter:4.5.1-4.8.0-distroless@sha256:b5d8813707469c5717ce27a5fefb933a29e8ba6cd2fd7d93ad3dcd6ae18579ef"
926927
- name: "DEVICE_PLUGIN_IMAGE"
927-
value: "nvcr.io/nvidia/k8s-device-plugin@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7"
928+
value: "nvcr.io/nvidia/k8s-device-plugin:v0.18.1@sha256:50ac011ab941ab0140d52f56aa0e2fdc553bca96836ab3b26be394fc823fd9e7"
928929
- name: "DRIVER_IMAGE"
929930
value: "nvcr.io/nvidia/driver@sha256:2df62cd428d73ee04779ed7dd89f278bd407ff641208fa47f0f569ac39c9d75b"
930931
- name: "DRIVER_IMAGE-570"
931932
value: "nvcr.io/nvidia/driver@sha256:38d55e5d1de9a774da98754166d2ae0b114d308f1fc151fdd6b184f4f7fa2db7"
932933
- name: "DRIVER_IMAGE-535"
933934
value: "nvcr.io/nvidia/driver@sha256:659d9315957ffa2a3f2a003716f066f6a1b3c06ae5557192148ed410dc1b9a6e"
934935
- name: "DRIVER_MANAGER_IMAGE"
935-
value: "nvcr.io/nvidia/cloud-native/k8s-driver-manager@sha256:c549346eb993fda62e9bf665aabaacc88abc06b0b24e69635427d4d71c2d5ed4"
936+
value: "nvcr.io/nvidia/cloud-native/k8s-driver-manager:v0.9.1@sha256:c549346eb993fda62e9bf665aabaacc88abc06b0b24e69635427d4d71c2d5ed4"
936937
- name: "MIG_MANAGER_IMAGE"
937-
value: "nvcr.io/nvidia/cloud-native/k8s-mig-manager@sha256:8e0803d2f29776cd4cc0501381a20a0b04b2da507a794d66a15894c57beaadb5"
938+
value: "nvcr.io/nvidia/cloud-native/k8s-mig-manager:v0.13.1@sha256:8e0803d2f29776cd4cc0501381a20a0b04b2da507a794d66a15894c57beaadb5"
938939
# TODO: update to a k8s-driver-manager image from nvcr.io once the next version is published
940+
# Add Renovate rule to update this image to the values.yaml image
939941
- name: "VFIO_MANAGER_IMAGE"
940942
value: "ghcr.io/nvidia/k8s-driver-manager:69eec274"
941943
- name: "SANDBOX_DEVICE_PLUGIN_IMAGE"
942-
value: "nvcr.io/nvidia/kubevirt-gpu-device-plugin@sha256:119de9a331a47203858b99901f44d0c4a8052961b4e60327f4b100d0ab8c9df0"
944+
value: "nvcr.io/nvidia/kubevirt-gpu-device-plugin:v1.4.0@sha256:119de9a331a47203858b99901f44d0c4a8052961b4e60327f4b100d0ab8c9df0"
943945
- name: "VGPU_DEVICE_MANAGER_IMAGE"
944-
value: "nvcr.io/nvidia/cloud-native/vgpu-device-manager@sha256:098c01e11589e08ede9ffb3002d1c3dff424f0f0c5d1bfcbfd54a359073f16dd"
946+
value: "nvcr.io/nvidia/cloud-native/vgpu-device-manager:v0.4.1@sha256:098c01e11589e08ede9ffb3002d1c3dff424f0f0c5d1bfcbfd54a359073f16dd"
945947
- name: "GDRCOPY_IMAGE"
946-
value: "nvcr.io/nvidia/cloud-native/gdrdrv@sha256:5c4e61f7ba83d7a64ff2523d447c209ce5bde1ddc79acaf1f32f19620b4912d6"
948+
value: "nvcr.io/nvidia/cloud-native/gdrdrv:v2.5.1@sha256:5c4e61f7ba83d7a64ff2523d447c209ce5bde1ddc79acaf1f32f19620b4912d6"
947949
terminationGracePeriodSeconds: 10
948950
volumes:
949951
- hostPath:

‎deployments/gpu-operator/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ dcgm:
264264
enabled: false
265265
repository: nvcr.io/nvidia/cloud-native
266266
image: dcgm
267-
version: 4.5.2-1-ubuntu22.04
267+
version: 4.5.2-1-ubi9
268268
imagePullPolicy: IfNotPresent
269269
args: []
270270
env: []

0 commit comments

Comments
 (0)