Skip to content

Commit 6b7d758

Browse files
yansun1996sajmera-pensando
yansun1996
authored and
sajmera-pensando
committed
[Build] resolve conflicts for opensourcing kubevirt related commits
1 parent a29309a commit 6b7d758

File tree

8 files changed

+113
-113
lines changed

8 files changed

+113
-113
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ metadata:
3232
capabilities: Seamless Upgrades
3333
categories: AI/Machine Learning,Monitoring
3434
containerImage: docker.io/rocm/gpu-operator:v1.2.0
35-
createdAt: "2025-08-09T01:44:36Z"
35+
createdAt: "2025-08-13T23:39:41Z"
3636
description: |-
3737
Operator responsible for deploying AMD GPU kernel drivers, device plugin, device test runner and device metrics exporter
3838
For more information, visit [documentation](https://instinct.docs.amd.com/projects/gpu-operator/en/latest/)
@@ -354,11 +354,6 @@ spec:
354354
path: driver.imageSign.keySecret
355355
x-descriptors:
356356
- urn:alm:descriptor:com.amd.deviceconfigs:imageSignKeySecret
357-
- description: tolerations for kmm module object
358-
displayName: Tolerations
359-
path: driver.tolerations
360-
x-descriptors:
361-
- urn:alm:descriptor:com.amd.deviceconfigs:tolerations
362357
- description: advanced arguments, parameters and more configs to manage tne
363358
driver
364359
displayName: KernelModuleConfig
@@ -383,6 +378,11 @@ spec:
383378
path: driver.kernelModuleConfig.unloadArgs
384379
x-descriptors:
385380
- urn:alm:descriptor:com.amd.deviceconfigs:unloadArg
381+
- description: tolerations for kmm module object
382+
displayName: Tolerations
383+
path: driver.tolerations
384+
x-descriptors:
385+
- urn:alm:descriptor:com.amd.deviceconfigs:tolerations
386386
- description: policy to upgrade the drivers
387387
displayName: UpgradePolicy
388388
path: driver.upgradePolicy

‎bundle/manifests/amd.com_deviceconfigs.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,31 @@ spec:
484484
type: object
485485
x-kubernetes-map-type: atomic
486486
type: object
487+
kernelModuleConfig:
488+
description: advanced arguments, parameters and more configs to
489+
manage tne driver
490+
properties:
491+
loadArgs:
492+
description: LoadArg are the arguments when modprobe is executed
493+
to load the kernel module. The command will be `modprobe
494+
${Args} module_name`.
495+
items:
496+
type: string
497+
type: array
498+
parameters:
499+
description: Parameters is being used for modprobe commands.
500+
The command will be `modprobe ${Args} module_name ${Parameters}`.
501+
items:
502+
type: string
503+
type: array
504+
unloadArgs:
505+
description: UnloadArg are the arguments when modprobe is
506+
executed to unload the kernel module. The command will be
507+
`modprobe -r ${Args} module_name`.
508+
items:
509+
type: string
510+
type: array
511+
type: object
487512
tolerations:
488513
description: tolerations for kmm module object
489514
items:
@@ -523,31 +548,6 @@ spec:
523548
type: string
524549
type: object
525550
type: array
526-
kernelModuleConfig:
527-
description: advanced arguments, parameters and more configs to
528-
manage tne driver
529-
properties:
530-
loadArgs:
531-
description: LoadArg are the arguments when modprobe is executed
532-
to load the kernel module. The command will be `modprobe
533-
${Args} module_name`.
534-
items:
535-
type: string
536-
type: array
537-
parameters:
538-
description: Parameters is being used for modprobe commands.
539-
The command will be `modprobe ${Args} module_name ${Parameters}`.
540-
items:
541-
type: string
542-
type: array
543-
unloadArgs:
544-
description: UnloadArg are the arguments when modprobe is
545-
executed to unload the kernel module. The command will be
546-
`modprobe -r ${Args} module_name`.
547-
items:
548-
type: string
549-
type: array
550-
type: object
551551
upgradePolicy:
552552
description: policy to upgrade the drivers
553553
properties:

‎config/crd/bases/amd.com_deviceconfigs.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,31 @@ spec:
480480
type: object
481481
x-kubernetes-map-type: atomic
482482
type: object
483+
kernelModuleConfig:
484+
description: advanced arguments, parameters and more configs to
485+
manage tne driver
486+
properties:
487+
loadArgs:
488+
description: LoadArg are the arguments when modprobe is executed
489+
to load the kernel module. The command will be `modprobe
490+
${Args} module_name`.
491+
items:
492+
type: string
493+
type: array
494+
parameters:
495+
description: Parameters is being used for modprobe commands.
496+
The command will be `modprobe ${Args} module_name ${Parameters}`.
497+
items:
498+
type: string
499+
type: array
500+
unloadArgs:
501+
description: UnloadArg are the arguments when modprobe is
502+
executed to unload the kernel module. The command will be
503+
`modprobe -r ${Args} module_name`.
504+
items:
505+
type: string
506+
type: array
507+
type: object
483508
tolerations:
484509
description: tolerations for kmm module object
485510
items:
@@ -519,31 +544,6 @@ spec:
519544
type: string
520545
type: object
521546
type: array
522-
kernelModuleConfig:
523-
description: advanced arguments, parameters and more configs to
524-
manage tne driver
525-
properties:
526-
loadArgs:
527-
description: LoadArg are the arguments when modprobe is executed
528-
to load the kernel module. The command will be `modprobe
529-
${Args} module_name`.
530-
items:
531-
type: string
532-
type: array
533-
parameters:
534-
description: Parameters is being used for modprobe commands.
535-
The command will be `modprobe ${Args} module_name ${Parameters}`.
536-
items:
537-
type: string
538-
type: array
539-
unloadArgs:
540-
description: UnloadArg are the arguments when modprobe is
541-
executed to unload the kernel module. The command will be
542-
`modprobe -r ${Args} module_name`.
543-
items:
544-
type: string
545-
type: array
546-
type: object
547547
upgradePolicy:
548548
description: policy to upgrade the drivers
549549
properties:

‎config/manifests/bases/amd-gpu-operator.clusterserviceversion.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,6 @@ spec:
325325
path: driver.imageSign.keySecret
326326
x-descriptors:
327327
- urn:alm:descriptor:com.amd.deviceconfigs:imageSignKeySecret
328-
- description: tolerations for kmm module object
329-
displayName: Tolerations
330-
path: driver.tolerations
331-
x-descriptors:
332-
- urn:alm:descriptor:com.amd.deviceconfigs:tolerations
333328
- description: advanced arguments, parameters and more configs to manage tne
334329
driver
335330
displayName: KernelModuleConfig
@@ -354,6 +349,11 @@ spec:
354349
path: driver.kernelModuleConfig.unloadArgs
355350
x-descriptors:
356351
- urn:alm:descriptor:com.amd.deviceconfigs:unloadArg
352+
- description: tolerations for kmm module object
353+
displayName: Tolerations
354+
path: driver.tolerations
355+
x-descriptors:
356+
- urn:alm:descriptor:com.amd.deviceconfigs:tolerations
357357
- description: policy to upgrade the drivers
358358
displayName: UpgradePolicy
359359
path: driver.upgradePolicy

‎helm-charts-k8s/Chart.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ dependencies:
66
repository: file://./charts/kmm
77
version: v1.0.0
88
digest: sha256:f9a315dd2ce3d515ebf28c8e9a6a82158b493ca2686439ec381487761261b597
9-
generated: "2025-08-09T01:44:10.510383817Z"
9+
generated: "2025-08-13T23:39:27.892020259Z"

‎helm-charts-k8s/crds/deviceconfig-crd.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,31 @@ spec:
487487
type: object
488488
x-kubernetes-map-type: atomic
489489
type: object
490+
kernelModuleConfig:
491+
description: advanced arguments, parameters and more configs to
492+
manage tne driver
493+
properties:
494+
loadArgs:
495+
description: LoadArg are the arguments when modprobe is executed
496+
to load the kernel module. The command will be `modprobe ${Args}
497+
module_name`.
498+
items:
499+
type: string
500+
type: array
501+
parameters:
502+
description: Parameters is being used for modprobe commands.
503+
The command will be `modprobe ${Args} module_name ${Parameters}`.
504+
items:
505+
type: string
506+
type: array
507+
unloadArgs:
508+
description: UnloadArg are the arguments when modprobe is executed
509+
to unload the kernel module. The command will be `modprobe
510+
-r ${Args} module_name`.
511+
items:
512+
type: string
513+
type: array
514+
type: object
490515
tolerations:
491516
description: tolerations for kmm module object
492517
items:
@@ -526,31 +551,6 @@ spec:
526551
type: string
527552
type: object
528553
type: array
529-
kernelModuleConfig:
530-
description: advanced arguments, parameters and more configs to
531-
manage tne driver
532-
properties:
533-
loadArgs:
534-
description: LoadArg are the arguments when modprobe is executed
535-
to load the kernel module. The command will be `modprobe ${Args}
536-
module_name`.
537-
items:
538-
type: string
539-
type: array
540-
parameters:
541-
description: Parameters is being used for modprobe commands.
542-
The command will be `modprobe ${Args} module_name ${Parameters}`.
543-
items:
544-
type: string
545-
type: array
546-
unloadArgs:
547-
description: UnloadArg are the arguments when modprobe is executed
548-
to unload the kernel module. The command will be `modprobe
549-
-r ${Args} module_name`.
550-
items:
551-
type: string
552-
type: array
553-
type: object
554554
upgradePolicy:
555555
description: policy to upgrade the drivers
556556
properties:

‎helm-charts-openshift/Chart.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ dependencies:
66
repository: file://./charts/kmm
77
version: v1.0.0
88
digest: sha256:25200c34a5cc846a1275e5bf3fc637b19e909dc68de938189c5278d77d03f5ac
9-
generated: "2025-08-09T01:44:30.971839872Z"
9+
generated: "2025-08-13T23:39:39.216809884Z"

‎helm-charts-openshift/crds/deviceconfig-crd.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,31 @@ spec:
487487
type: object
488488
x-kubernetes-map-type: atomic
489489
type: object
490+
kernelModuleConfig:
491+
description: advanced arguments, parameters and more configs to
492+
manage tne driver
493+
properties:
494+
loadArgs:
495+
description: LoadArg are the arguments when modprobe is executed
496+
to load the kernel module. The command will be `modprobe ${Args}
497+
module_name`.
498+
items:
499+
type: string
500+
type: array
501+
parameters:
502+
description: Parameters is being used for modprobe commands.
503+
The command will be `modprobe ${Args} module_name ${Parameters}`.
504+
items:
505+
type: string
506+
type: array
507+
unloadArgs:
508+
description: UnloadArg are the arguments when modprobe is executed
509+
to unload the kernel module. The command will be `modprobe
510+
-r ${Args} module_name`.
511+
items:
512+
type: string
513+
type: array
514+
type: object
490515
tolerations:
491516
description: tolerations for kmm module object
492517
items:
@@ -526,31 +551,6 @@ spec:
526551
type: string
527552
type: object
528553
type: array
529-
kernelModuleConfig:
530-
description: advanced arguments, parameters and more configs to
531-
manage tne driver
532-
properties:
533-
loadArgs:
534-
description: LoadArg are the arguments when modprobe is executed
535-
to load the kernel module. The command will be `modprobe ${Args}
536-
module_name`.
537-
items:
538-
type: string
539-
type: array
540-
parameters:
541-
description: Parameters is being used for modprobe commands.
542-
The command will be `modprobe ${Args} module_name ${Parameters}`.
543-
items:
544-
type: string
545-
type: array
546-
unloadArgs:
547-
description: UnloadArg are the arguments when modprobe is executed
548-
to unload the kernel module. The command will be `modprobe
549-
-r ${Args} module_name`.
550-
items:
551-
type: string
552-
type: array
553-
type: object
554554
upgradePolicy:
555555
description: policy to upgrade the drivers
556556
properties:

0 commit comments

Comments
 (0)