From b5410de75c73ff57a4ddba21c8f9071e7ccd9e20 Mon Sep 17 00:00:00 2001 From: Bartosz Rybacki Date: Mon, 23 Nov 2020 12:49:32 +0100 Subject: [PATCH] make generate && make deps-update Signed-off-by: Bartosz Rybacki --- go.sum | 5 +++-- .../src/kubevirt.io/client-go/api/v1/openapi_generated.go | 8 +++++++- staging/src/kubevirt.io/client-go/go.sum | 5 +++-- .../pkg/apis/core/v1alpha1/openapi_generated.go | 8 +++++++- .../pkg/apis/core/v1alpha1/types.go | 2 ++ .../pkg/apis/core/v1alpha1/types_swagger_generated.go | 1 + .../pkg/apis/core/v1alpha1/utils.go | 2 +- .../pkg/apis/core/v1alpha1/zz_generated.deepcopy.go | 5 +++++ vendor/modules.txt | 2 +- 9 files changed, 30 insertions(+), 8 deletions(-) diff --git a/go.sum b/go.sum index 2c1155df0659..0d097d15006d 100644 --- a/go.sum +++ b/go.sum @@ -494,6 +494,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mrnold/go-libnbd v1.4.1-cdi/go.mod h1:t/zovtHFkgtIy65eJ+Ay1mNBFz+yO6ESu6r6CluGzdI= github.com/mtrmac/gpgme v0.1.2/go.mod h1:GYYHnGSuS7HK3zVS2n3y73y0okK/BeKzwnn5jgiVFNI= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -1024,8 +1025,8 @@ k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc h1:GiXZzevctVRRBh56shqcqB9s9ReWMU6GTsFyE2RCFJQ= k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -kubevirt.io/containerized-data-importer v1.25.0 h1:B0AolhY7/gYqgaq9JkaHNHDkY8hhDAfKPZG520jdr7E= -kubevirt.io/containerized-data-importer v1.25.0/go.mod h1:LwwTsoJNDD6dpLpBAX6frulmVQTQK/mvHavd6L/KR6k= +kubevirt.io/containerized-data-importer v1.26.1 h1:QryIvQ8Dp4ciUe6TgD/+5Tg/9h4jn+BLRxC9+hLxeLA= +kubevirt.io/containerized-data-importer v1.26.1/go.mod h1:gV0UGj0JybVFobLjkUzRxFJFgeUUhZb7zs1HgvnDsOQ= kubevirt.io/controller-lifecycle-operator-sdk v0.1.1 h1:dqURkr5Q5f4qJM7uLHL0akFxTatt0MUekKL0xifmVjs= kubevirt.io/controller-lifecycle-operator-sdk v0.1.1/go.mod h1:M+UuZsp90mmKUVGb5zXDZtIIY1noY5pJk9i2YCQwSnk= kubevirt.io/qe-tools v0.1.6 h1:S6z9CATmgV2/z9CWetij++Rhu7l/Z4ObZqerLdNMo0Y= diff --git a/staging/src/kubevirt.io/client-go/api/v1/openapi_generated.go b/staging/src/kubevirt.io/client-go/api/v1/openapi_generated.go index d0deede2b23a..c83bc5544561 100644 --- a/staging/src/kubevirt.io/client-go/api/v1/openapi_generated.go +++ b/staging/src/kubevirt.io/client-go/api/v1/openapi_generated.go @@ -19229,11 +19229,17 @@ func schema_pkg_apis_core_v1alpha1_CDISpec(ref common.ReferenceCallback) common. Ref: ref("kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api.NodePlacement"), }, }, + "config": { + SchemaProps: spec.SchemaProps{ + Description: "CDIConfig at CDI level", + Ref: ref("kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1.CDIConfigSpec"), + }, + }, }, }, }, Dependencies: []string{ - "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api.NodePlacement"}, + "kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1.CDIConfigSpec", "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api.NodePlacement"}, } } diff --git a/staging/src/kubevirt.io/client-go/go.sum b/staging/src/kubevirt.io/client-go/go.sum index b936e55b645a..5934460c4e3c 100644 --- a/staging/src/kubevirt.io/client-go/go.sum +++ b/staging/src/kubevirt.io/client-go/go.sum @@ -390,6 +390,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/mrnold/go-libnbd v1.4.1-cdi/go.mod h1:t/zovtHFkgtIy65eJ+Ay1mNBFz+yO6ESu6r6CluGzdI= github.com/mtrmac/gpgme v0.1.2/go.mod h1:GYYHnGSuS7HK3zVS2n3y73y0okK/BeKzwnn5jgiVFNI= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -840,8 +841,8 @@ k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc h1:GiXZzevctVRRBh56shqcqB9s9ReWMU6GTsFyE2RCFJQ= k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -kubevirt.io/containerized-data-importer v1.25.0 h1:B0AolhY7/gYqgaq9JkaHNHDkY8hhDAfKPZG520jdr7E= -kubevirt.io/containerized-data-importer v1.25.0/go.mod h1:LwwTsoJNDD6dpLpBAX6frulmVQTQK/mvHavd6L/KR6k= +kubevirt.io/containerized-data-importer v1.26.1 h1:QryIvQ8Dp4ciUe6TgD/+5Tg/9h4jn+BLRxC9+hLxeLA= +kubevirt.io/containerized-data-importer v1.26.1/go.mod h1:gV0UGj0JybVFobLjkUzRxFJFgeUUhZb7zs1HgvnDsOQ= kubevirt.io/controller-lifecycle-operator-sdk v0.1.1 h1:dqURkr5Q5f4qJM7uLHL0akFxTatt0MUekKL0xifmVjs= kubevirt.io/controller-lifecycle-operator-sdk v0.1.1/go.mod h1:M+UuZsp90mmKUVGb5zXDZtIIY1noY5pJk9i2YCQwSnk= kubevirt.io/qe-tools v0.1.6 h1:S6z9CATmgV2/z9CWetij++Rhu7l/Z4ObZqerLdNMo0Y= diff --git a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/openapi_generated.go b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/openapi_generated.go index 50ffb90f3380..d212931cac7b 100644 --- a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/openapi_generated.go +++ b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/openapi_generated.go @@ -13753,11 +13753,17 @@ func schema_pkg_apis_core_v1alpha1_CDISpec(ref common.ReferenceCallback) common. Ref: ref("kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api.NodePlacement"), }, }, + "config": { + SchemaProps: spec.SchemaProps{ + Description: "CDIConfig at CDI level", + Ref: ref("kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1.CDIConfigSpec"), + }, + }, }, }, }, Dependencies: []string{ - "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api.NodePlacement"}, + "kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1.CDIConfigSpec", "kubevirt.io/controller-lifecycle-operator-sdk/pkg/sdk/api.NodePlacement"}, } } diff --git a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/types.go b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/types.go index 675b81e508a8..49f41ad033fc 100644 --- a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/types.go +++ b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/types.go @@ -268,6 +268,8 @@ type CDISpec struct { Infra sdkapi.NodePlacement `json:"infra,omitempty"` // Restrict on which nodes CDI workload pods will be scheduled Workloads sdkapi.NodePlacement `json:"workload,omitempty"` + // CDIConfig at CDI level + Config *CDIConfigSpec `json:"config,omitempty"` } // CDIUninstallStrategy defines the state to leave CDI on uninstall diff --git a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/types_swagger_generated.go b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/types_swagger_generated.go index 4b63cd155a65..542eb1ea2568 100644 --- a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/types_swagger_generated.go +++ b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/types_swagger_generated.go @@ -125,6 +125,7 @@ func (CDISpec) SwaggerDoc() map[string]string { "uninstallStrategy": "+kubebuilder:validation:Enum=RemoveWorkloads;BlockUninstallIfWorkloadsExist\nCDIUninstallStrategy defines the state to leave CDI on uninstall", "infra": "Rules on which nodes CDI infrastructure pods will be scheduled", "workload": "Restrict on which nodes CDI workload pods will be scheduled", + "config": "CDIConfig at CDI level", } } diff --git a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/utils.go b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/utils.go index 6abac7032a4c..9a7b6fa3434e 100644 --- a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/utils.go +++ b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/utils.go @@ -47,7 +47,7 @@ func IsPopulated(pvc *corev1.PersistentVolumeClaim, getDvFunc func(name, namespa // 3. If the PVC is owned by a DataVolume, look up the DV and check the phase, if phase !WaitForFirstConsumer return false func IsWaitForFirstConsumerBeforePopulating(pvc *corev1.PersistentVolumeClaim, getDvFunc func(name, namespace string) (*DataVolume, error)) (bool, error) { pvcOwner := metav1.GetControllerOf(pvc) - if pvc.Status.Phase == corev1.ClaimPending && pvcOwner != nil && pvcOwner.Kind == "DataVolume" { + if pvcOwner != nil && pvcOwner.Kind == "DataVolume" { // Find the data volume: dv, err := getDvFunc(pvcOwner.Name, pvc.Namespace) if err != nil { diff --git a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go index fe7aeb8e2999..8a9f0ba8ba73 100644 --- a/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -224,6 +224,11 @@ func (in *CDISpec) DeepCopyInto(out *CDISpec) { } in.Infra.DeepCopyInto(&out.Infra) in.Workloads.DeepCopyInto(&out.Workloads) + if in.Config != nil { + in, out := &in.Config, &out.Config + *out = new(CDIConfigSpec) + (*in).DeepCopyInto(*out) + } return } diff --git a/vendor/modules.txt b/vendor/modules.txt index b141102772ca..6d5669db8dcf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -840,7 +840,7 @@ kubevirt.io/client-go/precond kubevirt.io/client-go/subresources kubevirt.io/client-go/util kubevirt.io/client-go/version -# kubevirt.io/containerized-data-importer v1.25.0 => kubevirt.io/containerized-data-importer v1.25.0 +# kubevirt.io/containerized-data-importer v1.26.1 => kubevirt.io/containerized-data-importer v1.26.1 kubevirt.io/containerized-data-importer/pkg/apis/core kubevirt.io/containerized-data-importer/pkg/apis/core/v1alpha1 kubevirt.io/containerized-data-importer/pkg/apis/upload