diff --git a/go.mod b/go.mod index 1e480f136..8d923f4f1 100644 --- a/go.mod +++ b/go.mod @@ -27,8 +27,8 @@ require ( k8s.io/client-go v12.0.0+incompatible k8s.io/kube-aggregator v0.26.2 k8s.io/utils v0.0.0-20230505201702-9f6742963106 - kubevirt.io/api v1.0.0-rc.0 - kubevirt.io/containerized-data-importer-api v1.57.0-alpha1 + kubevirt.io/api v1.0.0 + kubevirt.io/containerized-data-importer-api v1.57.0 kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 kubevirt.io/qe-tools v0.1.8 kubevirt.io/ssp-operator/api v0.0.0 diff --git a/go.sum b/go.sum index 1f2b49a5f..d043c0b72 100644 --- a/go.sum +++ b/go.sum @@ -863,10 +863,10 @@ k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/ k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/pkg v0.0.0-20230221152827-2d84369c105d h1:3j5XVeK6B8w7HGAauirrSRwy9dA6HYUstjr6EyOI4bw= knative.dev/pkg v0.0.0-20230221152827-2d84369c105d/go.mod h1:DMTRDJ5WRxf/DrlOPzohzfhSuJggscLZ8EavOq9O/x8= -kubevirt.io/api v1.0.0-rc.0 h1:tG2MaBGkwdloMJieHEyHHvwvUwV11hNn/snlXvrmdIQ= -kubevirt.io/api v1.0.0-rc.0/go.mod h1:CJ4vZsaWhVN3jNbyc9y3lIZhw8nUHbWjap0xHABQiqc= -kubevirt.io/containerized-data-importer-api v1.57.0-alpha1 h1:IWo12+ei3jltSN5jQN1xjgakfvRSF3G3Rr4GXVOOy2I= -kubevirt.io/containerized-data-importer-api v1.57.0-alpha1/go.mod h1:Y/8ETgHS1GjO89bl682DPtQOYEU/1ctPFBz6Sjxm4DM= +kubevirt.io/api v1.0.0 h1:RBdXP5CDhE0v5qL2OUQdrYyRrHe/F68Z91GWqBDF6nw= +kubevirt.io/api v1.0.0/go.mod h1:CJ4vZsaWhVN3jNbyc9y3lIZhw8nUHbWjap0xHABQiqc= +kubevirt.io/containerized-data-importer-api v1.57.0 h1:IpRCUyDS0x7BaVa5q5MCzuWRAfvXT54GpEnNJke5hSE= +kubevirt.io/containerized-data-importer-api v1.57.0/go.mod h1:Y/8ETgHS1GjO89bl682DPtQOYEU/1ctPFBz6Sjxm4DM= kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 h1:fZYvD3/Vnitfkx6IJxjLAk8ugnZQ7CXVYcRfkSKmuZY= kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4/go.mod h1:018lASpFYBsYN6XwmA2TIrPCx6e0gviTd/ZNtSitKgc= kubevirt.io/qe-tools v0.1.8 h1:Ar7qicmzHdd+Ia+6rjHDg3D7GReIyq7QFXoC4F7TjhQ= diff --git a/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/types.go b/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/types.go index 86dc46c25..c03364976 100644 --- a/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/types.go +++ b/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/types.go @@ -379,6 +379,11 @@ const ( // Paused represents a DataVolumePhase of Paused Paused DataVolumePhase = "Paused" + // PrepClaimInProgress represents a data volume with a current phase of PrepClaimInProgress + PrepClaimInProgress DataVolumePhase = "PrepClaimInProgress" + // RebindInProgress represents a data volume with a current phase of RebindInProgress + RebindInProgress DataVolumePhase = "RebindInProgress" + // DataVolumeReady is the condition that indicates if the data volume is ready to be consumed. DataVolumeReady DataVolumeConditionType = "Ready" // DataVolumeBound is the condition that indicates if the underlying PVC is bound or not. @@ -414,6 +419,8 @@ type StorageProfileSpec struct { CloneStrategy *CDICloneStrategy `json:"cloneStrategy,omitempty"` // ClaimPropertySets is a provided set of properties applicable to PVC ClaimPropertySets []ClaimPropertySet `json:"claimPropertySets,omitempty"` + // DataImportCronSourceFormat defines the format of the DataImportCron-created disk image sources + DataImportCronSourceFormat *DataImportCronSourceFormat `json:"dataImportCronSourceFormat,omitempty"` } // StorageProfileStatus provides the most recently observed status of the StorageProfile @@ -426,6 +433,8 @@ type StorageProfileStatus struct { CloneStrategy *CDICloneStrategy `json:"cloneStrategy,omitempty"` // ClaimPropertySets computed from the spec and detected in the system ClaimPropertySets []ClaimPropertySet `json:"claimPropertySets,omitempty"` + // DataImportCronSourceFormat defines the format of the DataImportCron-created disk image sources + DataImportCronSourceFormat *DataImportCronSourceFormat `json:"dataImportCronSourceFormat,omitempty"` } // ClaimPropertySet is a set of properties applicable to PVC @@ -834,6 +843,17 @@ const ( CloneStrategyCsiClone CDICloneStrategy = "csi-clone" ) +// DataImportCronSourceFormat defines the format of the DataImportCron-created disk image sources +type DataImportCronSourceFormat string + +const ( + // DataImportCronSourceFormatSnapshot implies using a VolumeSnapshot as the resulting DataImportCron disk image source + DataImportCronSourceFormatSnapshot DataImportCronSourceFormat = "snapshot" + + // DataImportCronSourceFormatPvc implies using a PVC as the resulting DataImportCron disk image source + DataImportCronSourceFormatPvc DataImportCronSourceFormat = "pvc" +) + // CDIUninstallStrategy defines the state to leave CDI on uninstall type CDIUninstallStrategy string @@ -913,7 +933,7 @@ type CDIConfigSpec struct { Preallocation *bool `json:"preallocation,omitempty"` // InsecureRegistries is a list of TLS disabled registries InsecureRegistries []string `json:"insecureRegistries,omitempty"` - // DataVolumeTTLSeconds is the time in seconds after DataVolume completion it can be garbage collected. The default is 0 sec. To disable GC use -1. + // DataVolumeTTLSeconds is the time in seconds after DataVolume completion it can be garbage collected. Disabled by default. // +optional DataVolumeTTLSeconds *int32 `json:"dataVolumeTTLSeconds,omitempty"` // TLSSecurityProfile is used by operators to apply cluster-wide TLS security settings to operands. diff --git a/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/types_swagger_generated.go b/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/types_swagger_generated.go index aaa83e1c2..e1fa900fc 100644 --- a/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/types_swagger_generated.go +++ b/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/types_swagger_generated.go @@ -180,19 +180,21 @@ func (StorageProfile) SwaggerDoc() map[string]string { func (StorageProfileSpec) SwaggerDoc() map[string]string { return map[string]string{ - "": "StorageProfileSpec defines specification for StorageProfile", - "cloneStrategy": "CloneStrategy defines the preferred method for performing a CDI clone", - "claimPropertySets": "ClaimPropertySets is a provided set of properties applicable to PVC", + "": "StorageProfileSpec defines specification for StorageProfile", + "cloneStrategy": "CloneStrategy defines the preferred method for performing a CDI clone", + "claimPropertySets": "ClaimPropertySets is a provided set of properties applicable to PVC", + "dataImportCronSourceFormat": "DataImportCronSourceFormat defines the format of the DataImportCron-created disk image sources", } } func (StorageProfileStatus) SwaggerDoc() map[string]string { return map[string]string{ - "": "StorageProfileStatus provides the most recently observed status of the StorageProfile", - "storageClass": "The StorageClass name for which capabilities are defined", - "provisioner": "The Storage class provisioner plugin name", - "cloneStrategy": "CloneStrategy defines the preferred method for performing a CDI clone", - "claimPropertySets": "ClaimPropertySets computed from the spec and detected in the system", + "": "StorageProfileStatus provides the most recently observed status of the StorageProfile", + "storageClass": "The StorageClass name for which capabilities are defined", + "provisioner": "The Storage class provisioner plugin name", + "cloneStrategy": "CloneStrategy defines the preferred method for performing a CDI clone", + "claimPropertySets": "ClaimPropertySets computed from the spec and detected in the system", + "dataImportCronSourceFormat": "DataImportCronSourceFormat defines the format of the DataImportCron-created disk image sources", } } @@ -467,7 +469,7 @@ func (CDIConfigSpec) SwaggerDoc() map[string]string { "filesystemOverhead": "FilesystemOverhead describes the space reserved for overhead when using Filesystem volumes. A value is between 0 and 1, if not defined it is 0.055 (5.5% overhead)", "preallocation": "Preallocation controls whether storage for DataVolumes should be allocated in advance.", "insecureRegistries": "InsecureRegistries is a list of TLS disabled registries", - "dataVolumeTTLSeconds": "DataVolumeTTLSeconds is the time in seconds after DataVolume completion it can be garbage collected. The default is 0 sec. To disable GC use -1.\n+optional", + "dataVolumeTTLSeconds": "DataVolumeTTLSeconds is the time in seconds after DataVolume completion it can be garbage collected. Disabled by default.\n+optional", "tlsSecurityProfile": "TLSSecurityProfile is used by operators to apply cluster-wide TLS security settings to operands.", "imagePullSecrets": "The imagePullSecrets used to pull the container images", } diff --git a/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/zz_generated.deepcopy.go b/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/zz_generated.deepcopy.go index a8ea39f6f..44a9f88dc 100644 --- a/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/zz_generated.deepcopy.go +++ b/vendor/kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1/zz_generated.deepcopy.go @@ -1494,6 +1494,11 @@ func (in *StorageProfileSpec) DeepCopyInto(out *StorageProfileSpec) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.DataImportCronSourceFormat != nil { + in, out := &in.DataImportCronSourceFormat, &out.DataImportCronSourceFormat + *out = new(DataImportCronSourceFormat) + **out = **in + } return } @@ -1532,6 +1537,11 @@ func (in *StorageProfileStatus) DeepCopyInto(out *StorageProfileStatus) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.DataImportCronSourceFormat != nil { + in, out := &in.DataImportCronSourceFormat, &out.DataImportCronSourceFormat + *out = new(DataImportCronSourceFormat) + **out = **in + } return } diff --git a/vendor/modules.txt b/vendor/modules.txt index 70e048a07..a58e0d89d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -829,14 +829,14 @@ knative.dev/pkg/metrics knative.dev/pkg/metrics/metricskey knative.dev/pkg/tracker knative.dev/pkg/webhook/resourcesemantics -# kubevirt.io/api v1.0.0-rc.0 +# kubevirt.io/api v1.0.0 ## explicit; go 1.17 kubevirt.io/api/core kubevirt.io/api/core/v1 kubevirt.io/api/instancetype kubevirt.io/api/instancetype/v1alpha2 kubevirt.io/api/instancetype/v1beta1 -# kubevirt.io/containerized-data-importer-api v1.57.0-alpha1 +# kubevirt.io/containerized-data-importer-api v1.57.0 ## explicit; go 1.19 kubevirt.io/containerized-data-importer-api/pkg/apis/core kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1