Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Bump CDI to v1.59.0 #2859

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/operands/cdi.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ func NewCDI(hc *hcov1beta1.HyperConverged, opts ...string) (*cdiv1beta1.CDI, err
}

if hc.Spec.Infra.NodePlacement != nil {
hc.Spec.Infra.NodePlacement.DeepCopyInto(&spec.Infra)
hc.Spec.Infra.NodePlacement.DeepCopyInto(&spec.Infra.NodePlacement)
}

if hc.Spec.Workloads.NodePlacement != nil {
Expand Down
45 changes: 45 additions & 0 deletions deploy/cluster_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2914,6 +2914,7 @@ rules:
- admissionregistration.k8s.io
resourceNames:
- cdi-api-datavolume-mutate
- cdi-api-pvc-mutate
resources:
- mutatingwebhookconfigurations
verbs:
Expand Down Expand Up @@ -2951,6 +2952,24 @@ rules:
- persistentvolumeclaims
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
- persistentvolumes
verbs:
- get
- list
- watch
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
Expand All @@ -2963,6 +2982,8 @@ rules:
- volumesnapshots
verbs:
- get
- list
- watch
- apiGroups:
- cdi.kubevirt.io
resources:
Expand All @@ -2976,12 +2997,30 @@ rules:
- datasources
verbs:
- get
- apiGroups:
- cdi.kubevirt.io
resources:
- volumeclonesources
verbs:
- get
- list
- watch
- apiGroups:
- cdi.kubevirt.io
resources:
- storageprofiles
verbs:
- get
- list
- watch
- apiGroups:
- cdi.kubevirt.io
resources:
- cdis
verbs:
- get
- list
- watch
- apiGroups:
- cdi.kubevirt.io
resources:
Expand Down Expand Up @@ -3067,6 +3106,12 @@ rules:
- get
- list
- watch
- apiGroups:
- config.openshift.io
resources:
- clusterversions
verbs:
- get
- apiGroups:
- cdi.kubevirt.io
resources:
Expand Down
136 changes: 128 additions & 8 deletions deploy/crds/containerized-data-importer00.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ spec:
description: "Claims lists the names of resources, defined
in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable. It can only be
set for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
Expand Down Expand Up @@ -221,7 +222,8 @@ spec:
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
to an implementation-defined value. Requests cannot exceed
Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
preallocation:
Expand Down Expand Up @@ -332,6 +334,52 @@ spec:
description: Override the URL used when uploading to a DataVolume
type: string
type: object
customizeComponents:
description: CustomizeComponents defines patches for components deployed
by the CDI operator.
properties:
flags:
description: Configure the value used for deployment and daemonset
resources
properties:
api:
additionalProperties:
type: string
type: object
controller:
additionalProperties:
type: string
type: object
uploadProxy:
additionalProperties:
type: string
type: object
type: object
patches:
items:
description: CustomizeComponentsPatch defines a patch for some
resource.
properties:
patch:
type: string
resourceName:
minLength: 1
type: string
resourceType:
minLength: 1
type: string
type:
description: PatchType defines the patch type.
type: string
required:
- patch
- resourceName
- resourceType
- type
type: object
type: array
x-kubernetes-list-type: atomic
type: object
imagePullPolicy:
description: PullPolicy describes a policy for if/when to pull a container
image
Expand All @@ -341,8 +389,8 @@ spec:
- Never
type: string
infra:
description: Rules on which nodes CDI infrastructure pods will be
scheduled
description: Selectors and tolerations that should apply to cdi infrastructure
components
properties:
affinity:
description: affinity enables pod affinity/anti-affinity placement
Expand Down Expand Up @@ -1215,6 +1263,14 @@ spec:
type: array
type: object
type: object
apiServerReplicas:
description: ApiserverReplicas set Replicas for cdi-apiserver
format: int32
type: integer
deploymentReplicas:
description: DeploymentReplicas set Replicas for cdi-deployment
format: int32
type: integer
nodeSelector:
additionalProperties:
type: string
Expand Down Expand Up @@ -1268,6 +1324,10 @@ spec:
type: string
type: object
type: array
uploadProxyReplicas:
description: UploadproxyReplicas set Replicas for cdi-uploadproxy
format: int32
type: integer
type: object
priorityClass:
description: PriorityClass of the CDI control plane
Expand Down Expand Up @@ -2424,7 +2484,8 @@ spec:
description: "Claims lists the names of resources, defined
in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the DynamicResourceAllocation
feature gate. \n This field is immutable."
feature gate. \n This field is immutable. It can only be
set for containers."
items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties:
Expand Down Expand Up @@ -2461,7 +2522,8 @@ spec:
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
to an implementation-defined value. Requests cannot exceed
Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
preallocation:
Expand Down Expand Up @@ -2572,6 +2634,52 @@ spec:
description: Override the URL used when uploading to a DataVolume
type: string
type: object
customizeComponents:
description: CustomizeComponents defines patches for components deployed
by the CDI operator.
properties:
flags:
description: Configure the value used for deployment and daemonset
resources
properties:
api:
additionalProperties:
type: string
type: object
controller:
additionalProperties:
type: string
type: object
uploadProxy:
additionalProperties:
type: string
type: object
type: object
patches:
items:
description: CustomizeComponentsPatch defines a patch for some
resource.
properties:
patch:
type: string
resourceName:
minLength: 1
type: string
resourceType:
minLength: 1
type: string
type:
description: PatchType defines the patch type.
type: string
required:
- patch
- resourceName
- resourceType
- type
type: object
type: array
x-kubernetes-list-type: atomic
type: object
imagePullPolicy:
description: PullPolicy describes a policy for if/when to pull a container
image
Expand All @@ -2581,8 +2689,8 @@ spec:
- Never
type: string
infra:
description: Rules on which nodes CDI infrastructure pods will be
scheduled
description: Selectors and tolerations that should apply to cdi infrastructure
components
properties:
affinity:
description: affinity enables pod affinity/anti-affinity placement
Expand Down Expand Up @@ -3455,6 +3563,14 @@ spec:
type: array
type: object
type: object
apiServerReplicas:
description: ApiserverReplicas set Replicas for cdi-apiserver
format: int32
type: integer
deploymentReplicas:
description: DeploymentReplicas set Replicas for cdi-deployment
format: int32
type: integer
nodeSelector:
additionalProperties:
type: string
Expand Down Expand Up @@ -3508,6 +3624,10 @@ spec:
type: string
type: object
type: array
uploadProxyReplicas:
description: UploadproxyReplicas set Replicas for cdi-uploadproxy
format: int32
type: integer
type: object
priorityClass:
description: PriorityClass of the CDI control plane
Expand Down
14 changes: 7 additions & 7 deletions deploy/images.csv
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ KUBEVIRT_EXPORSERVER_IMAGE,quay.io/kubevirt/virt-exportserver,KUBEVIRT_VERSION,f
CNA_OPERATOR_IMAGE,quay.io/kubevirt/cluster-network-addons-operator,NETWORK_ADDONS_VERSION,bf17da674ed6dac95aa4fd7637173fd4e026ebb4523b66f529c0eff394a25bcc
SSP_OPERATOR_IMAGE,quay.io/kubevirt/ssp-operator,SSP_VERSION,d57ef05fea09c4690dbe728ebe6a39d9df1a3574dfa7d18346bf3fe66afed702
SSP_VALIDATOR_IMAGE,quay.io/kubevirt/kubevirt-template-validator,SSP_VERSION,f6db539fe4d4b752644c6bc8a308f5a80ae09a71da5c5d535114dc4c3cf18e0a
CDI_OPERATOR_IMAGE,quay.io/kubevirt/cdi-operator,CDI_VERSION,f76a486f1b7c8f53ab5e009bfa0374c102767e58e875fceccd787368a09ae442
CDI_CONTROLLER_IMAGE,quay.io/kubevirt/cdi-controller,CDI_VERSION,6aea91b795e4b60f963ef74e4f2eda4d08eb89772c8caa15e77b2a81940bcd10
CDI_APISERVER_IMAGE,quay.io/kubevirt/cdi-apiserver,CDI_VERSION,699ecd04e9c16490f920daba4e6bee4f148ab323c24d07ac554272a9694c8c6f
CDI_CLONER_IMAGE,quay.io/kubevirt/cdi-cloner,CDI_VERSION,df1502ad04fb910715c2f7ab822abd1fd167ad63ccc45e32343ce5c06c329722
CDI_IMPORTER_IMAGE,quay.io/kubevirt/cdi-importer,CDI_VERSION,f5005a344533fd2d1ac84ee13357e5f9fa291dc5b8ae3467956c72547ad19071
CDI_UPLOADPROXY_IMAGE,quay.io/kubevirt/cdi-uploadproxy,CDI_VERSION,78f49c4858cbe685d596cffdfebbc62e4a581d3369b419622d1d25d4dbb00469
CDI_UPLOADSERVER_IMAGE,quay.io/kubevirt/cdi-uploadserver,CDI_VERSION,d9c84bef695700f674ca5526a17fe337d6d2d3a046a9c1fb7e7ff23e6d29adc7
CDI_OPERATOR_IMAGE,quay.io/kubevirt/cdi-operator,CDI_VERSION,f68e4f2a082fc72d92bc1df0340285af03cd12d8c7721b38c619d1de0f4c175a
CDI_CONTROLLER_IMAGE,quay.io/kubevirt/cdi-controller,CDI_VERSION,392ead2fdc5050c584765ebf99706cc5c0ab9c2b424b692ad35005e77d110b58
CDI_APISERVER_IMAGE,quay.io/kubevirt/cdi-apiserver,CDI_VERSION,4ba004f57e7d589ddb5372a9729360460a97effecc6e5ecaccd7fbf16c6fcf13
CDI_CLONER_IMAGE,quay.io/kubevirt/cdi-cloner,CDI_VERSION,05da8df0b64024f9e2a48a1a54f06c821d79a3efe7828fad2c4fda6a01d0cd86
CDI_IMPORTER_IMAGE,quay.io/kubevirt/cdi-importer,CDI_VERSION,de5b89c879a531165482d540deffdc2dec0c188fd0f7b5fbd49c0298cf9a5b1d
CDI_UPLOADPROXY_IMAGE,quay.io/kubevirt/cdi-uploadproxy,CDI_VERSION,86285df5cf52533732ddf4fdb74674cbce877ba69833cb8ed058c2a157cb5573
CDI_UPLOADSERVER_IMAGE,quay.io/kubevirt/cdi-uploadserver,CDI_VERSION,d7fb653bb33dade84583fff6048092346639532d6675aaf9f88070171cb0fe7c
HPPO_IMAGE,quay.io/kubevirt/hostpath-provisioner-operator,HPPO_VERSION,dd2948ca8e62d17eafba40bdcaad8367a97f092fd3b8d9849b2d62aec3152a72
HPP_IMAGE,quay.io/kubevirt/hostpath-provisioner,HPP_VERSION,adb1d33e95e8991dc47107926172469b5ecbeace509391ce021ca42d305a41d3
HPP_CSI_IMAGE,quay.io/kubevirt/hostpath-csi-driver,HPP_VERSION,8d84b9a33e0ec3749aece7c5f9879d1e0d248e8028ab3f776528a044d387033c
Expand Down
28 changes: 14 additions & 14 deletions deploy/images.env
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ KUBEVIRT_EXPORSERVER_IMAGE=quay.io/kubevirt/virt-exportserver@sha256:f9cd1dbb87e
CNA_OPERATOR_IMAGE=quay.io/kubevirt/cluster-network-addons-operator@sha256:bf17da674ed6dac95aa4fd7637173fd4e026ebb4523b66f529c0eff394a25bcc
SSP_OPERATOR_IMAGE=quay.io/kubevirt/ssp-operator@sha256:d57ef05fea09c4690dbe728ebe6a39d9df1a3574dfa7d18346bf3fe66afed702
SSP_VALIDATOR_IMAGE=quay.io/kubevirt/kubevirt-template-validator@sha256:f6db539fe4d4b752644c6bc8a308f5a80ae09a71da5c5d535114dc4c3cf18e0a
CDI_OPERATOR_IMAGE=quay.io/kubevirt/cdi-operator@sha256:f76a486f1b7c8f53ab5e009bfa0374c102767e58e875fceccd787368a09ae442
CDI_CONTROLLER_IMAGE=quay.io/kubevirt/cdi-controller@sha256:6aea91b795e4b60f963ef74e4f2eda4d08eb89772c8caa15e77b2a81940bcd10
CDI_APISERVER_IMAGE=quay.io/kubevirt/cdi-apiserver@sha256:699ecd04e9c16490f920daba4e6bee4f148ab323c24d07ac554272a9694c8c6f
CDI_CLONER_IMAGE=quay.io/kubevirt/cdi-cloner@sha256:df1502ad04fb910715c2f7ab822abd1fd167ad63ccc45e32343ce5c06c329722
CDI_IMPORTER_IMAGE=quay.io/kubevirt/cdi-importer@sha256:f5005a344533fd2d1ac84ee13357e5f9fa291dc5b8ae3467956c72547ad19071
CDI_UPLOADPROXY_IMAGE=quay.io/kubevirt/cdi-uploadproxy@sha256:78f49c4858cbe685d596cffdfebbc62e4a581d3369b419622d1d25d4dbb00469
CDI_UPLOADSERVER_IMAGE=quay.io/kubevirt/cdi-uploadserver@sha256:d9c84bef695700f674ca5526a17fe337d6d2d3a046a9c1fb7e7ff23e6d29adc7
CDI_OPERATOR_IMAGE=quay.io/kubevirt/cdi-operator@sha256:f68e4f2a082fc72d92bc1df0340285af03cd12d8c7721b38c619d1de0f4c175a
CDI_CONTROLLER_IMAGE=quay.io/kubevirt/cdi-controller@sha256:392ead2fdc5050c584765ebf99706cc5c0ab9c2b424b692ad35005e77d110b58
CDI_APISERVER_IMAGE=quay.io/kubevirt/cdi-apiserver@sha256:4ba004f57e7d589ddb5372a9729360460a97effecc6e5ecaccd7fbf16c6fcf13
CDI_CLONER_IMAGE=quay.io/kubevirt/cdi-cloner@sha256:05da8df0b64024f9e2a48a1a54f06c821d79a3efe7828fad2c4fda6a01d0cd86
CDI_IMPORTER_IMAGE=quay.io/kubevirt/cdi-importer@sha256:de5b89c879a531165482d540deffdc2dec0c188fd0f7b5fbd49c0298cf9a5b1d
CDI_UPLOADPROXY_IMAGE=quay.io/kubevirt/cdi-uploadproxy@sha256:86285df5cf52533732ddf4fdb74674cbce877ba69833cb8ed058c2a157cb5573
CDI_UPLOADSERVER_IMAGE=quay.io/kubevirt/cdi-uploadserver@sha256:d7fb653bb33dade84583fff6048092346639532d6675aaf9f88070171cb0fe7c
HPPO_IMAGE=quay.io/kubevirt/hostpath-provisioner-operator@sha256:dd2948ca8e62d17eafba40bdcaad8367a97f092fd3b8d9849b2d62aec3152a72
HPP_IMAGE=quay.io/kubevirt/hostpath-provisioner@sha256:adb1d33e95e8991dc47107926172469b5ecbeace509391ce021ca42d305a41d3
HPP_CSI_IMAGE=quay.io/kubevirt/hostpath-csi-driver@sha256:8d84b9a33e0ec3749aece7c5f9879d1e0d248e8028ab3f776528a044d387033c
Expand Down Expand Up @@ -45,13 +45,13 @@ DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/virt-exportserver@sha256:f9cd1dbb87
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cluster-network-addons-operator@sha256:bf17da674ed6dac95aa4fd7637173fd4e026ebb4523b66f529c0eff394a25bcc"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/ssp-operator@sha256:d57ef05fea09c4690dbe728ebe6a39d9df1a3574dfa7d18346bf3fe66afed702"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/kubevirt-template-validator@sha256:f6db539fe4d4b752644c6bc8a308f5a80ae09a71da5c5d535114dc4c3cf18e0a"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-operator@sha256:f76a486f1b7c8f53ab5e009bfa0374c102767e58e875fceccd787368a09ae442"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-controller@sha256:6aea91b795e4b60f963ef74e4f2eda4d08eb89772c8caa15e77b2a81940bcd10"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-apiserver@sha256:699ecd04e9c16490f920daba4e6bee4f148ab323c24d07ac554272a9694c8c6f"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-cloner@sha256:df1502ad04fb910715c2f7ab822abd1fd167ad63ccc45e32343ce5c06c329722"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-importer@sha256:f5005a344533fd2d1ac84ee13357e5f9fa291dc5b8ae3467956c72547ad19071"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-uploadproxy@sha256:78f49c4858cbe685d596cffdfebbc62e4a581d3369b419622d1d25d4dbb00469"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-uploadserver@sha256:d9c84bef695700f674ca5526a17fe337d6d2d3a046a9c1fb7e7ff23e6d29adc7"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-operator@sha256:f68e4f2a082fc72d92bc1df0340285af03cd12d8c7721b38c619d1de0f4c175a"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-controller@sha256:392ead2fdc5050c584765ebf99706cc5c0ab9c2b424b692ad35005e77d110b58"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-apiserver@sha256:4ba004f57e7d589ddb5372a9729360460a97effecc6e5ecaccd7fbf16c6fcf13"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-cloner@sha256:05da8df0b64024f9e2a48a1a54f06c821d79a3efe7828fad2c4fda6a01d0cd86"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-importer@sha256:de5b89c879a531165482d540deffdc2dec0c188fd0f7b5fbd49c0298cf9a5b1d"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-uploadproxy@sha256:86285df5cf52533732ddf4fdb74674cbce877ba69833cb8ed058c2a157cb5573"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/cdi-uploadserver@sha256:d7fb653bb33dade84583fff6048092346639532d6675aaf9f88070171cb0fe7c"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/hostpath-provisioner-operator@sha256:dd2948ca8e62d17eafba40bdcaad8367a97f092fd3b8d9849b2d62aec3152a72"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/hostpath-provisioner@sha256:adb1d33e95e8991dc47107926172469b5ecbeace509391ce021ca42d305a41d3"
DIGEST_LIST="${DIGEST_LIST},quay.io/kubevirt/hostpath-csi-driver@sha256:8d84b9a33e0ec3749aece7c5f9879d1e0d248e8028ab3f776528a044d387033c"
Expand Down
Loading