manual bump CDI to v1.59.0 (#2864)

* manual bump CDI to v1.59.0 Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com> * add test_id labels Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com> * Fix the node-placement e2e test The test read the pod name as the first container name. Since cdi-peployment first container name was changed, the test failed. Now, the test uses lables to get the name. Also, Make sure the pods are running before checking them. Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com> --------- Signed-off-by: Nahshon Unna-Tsameret <nunnatsa@redhat.com>
kubevirt · Apr 7, 2024 · 3585d39 · 3585d39
1 parent 84c59c8
commit 3585d39
Show file tree

Hide file tree

Showing 30 changed files with 1,086 additions and 135 deletions.
diff --git a/controllers/operands/cdi.go b/controllers/operands/cdi.go
@@ -8,11 +8,12 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
+
 	hcov1beta1 "github.com/kubevirt/hyperconverged-cluster-operator/api/v1beta1"
 	"github.com/kubevirt/hyperconverged-cluster-operator/controllers/common"
 	"github.com/kubevirt/hyperconverged-cluster-operator/pkg/util"
 	hcoutil "github.com/kubevirt/hyperconverged-cluster-operator/pkg/util"
-	cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 )
 
 const (
@@ -137,7 +138,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 {

diff --git a/deploy/cluster_role.yaml b/deploy/cluster_role.yaml
@@ -2931,6 +2931,7 @@ rules:
   - admissionregistration.k8s.io
   resourceNames:
   - cdi-api-datavolume-mutate
+  - cdi-api-pvc-mutate
   resources:
   - mutatingwebhookconfigurations
   verbs:
@@ -2968,6 +2969,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:
@@ -2980,6 +2999,8 @@ rules:
   - volumesnapshots
   verbs:
   - get
+  - list
+  - watch
 - apiGroups:
   - cdi.kubevirt.io
   resources:
@@ -2993,12 +3014,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:
@@ -3084,6 +3123,12 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - config.openshift.io
+  resources:
+  - clusterversions
+  verbs:
+  - get
 - apiGroups:
   - cdi.kubevirt.io
   resources:

diff --git a/deploy/crds/containerized-data-importer00.crd.yaml b/deploy/crds/containerized-data-importer00.crd.yaml
@@ -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:
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -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:
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/deploy/images.csv b/deploy/images.csv
@@ -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