From 129e1f340f44f34f4a103db9c1b00b8404ab888b Mon Sep 17 00:00:00 2001 From: Andrej Krejcir Date: Thu, 12 Sep 2024 14:18:56 +0200 Subject: [PATCH] api: Deprecate instance types feature gate and spec field The feature gate and configuration fields are no longer used. Signed-off-by: Andrej Krejcir --- api/v1beta2/ssp_types.go | 9 +++++---- config/crd/bases/ssp.kubevirt.io_ssps.yaml | 9 +++------ data/crd/ssp.kubevirt.io_ssps.yaml | 9 +++------ vendor/kubevirt.io/ssp-operator/api/v1beta2/ssp_types.go | 9 +++++---- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/api/v1beta2/ssp_types.go b/api/v1beta2/ssp_types.go index 7e77b03df..d4cf88723 100644 --- a/api/v1beta2/ssp_types.go +++ b/api/v1beta2/ssp_types.go @@ -84,9 +84,9 @@ type SSPSpec struct { // TokenGenerationService configures the service for generating tokens to access VNC for a VM. TokenGenerationService *TokenGenerationService `json:"tokenGenerationService,omitempty"` - // CommonInstancetypes is the configuration of the common-instancetypes operand - // - // Deprecated: This functionality will be removed in a future release. + // CommonInstancetypes is ignored. + // +kubebuilder:deprecatedversion:warning="commonInstancetypes filed is ignored" + // Deprecated: This field is ignored. CommonInstancetypes *CommonInstancetypes `json:"commonInstancetypes,omitempty"` // TektonPipelines is the configuration of the tekton-pipelines operand @@ -123,7 +123,8 @@ type FeatureGates struct { // Deprecated: This field is ignored. DeployVmConsoleProxy bool `json:"deployVmConsoleProxy,omitempty"` - // Enables deployment of the common-instancetypes bundles, defaults to true. + // +kubebuilder:deprecatedversion:warning="instance types and preferences are no longer deployed by SSP" + // Deprecated: This field is ignored. DeployCommonInstancetypes *bool `json:"deployCommonInstancetypes,omitempty"` } diff --git a/config/crd/bases/ssp.kubevirt.io_ssps.yaml b/config/crd/bases/ssp.kubevirt.io_ssps.yaml index 097ff9afe..11447e337 100644 --- a/config/crd/bases/ssp.kubevirt.io_ssps.yaml +++ b/config/crd/bases/ssp.kubevirt.io_ssps.yaml @@ -3300,10 +3300,8 @@ spec: properties: commonInstancetypes: description: |- - CommonInstancetypes is the configuration of the common-instancetypes operand - - - Deprecated: This functionality will be removed in a future release. + CommonInstancetypes is ignored. + Deprecated: This field is ignored. properties: url: description: |- @@ -4187,8 +4185,7 @@ spec: description: FeatureGates for SSP properties: deployCommonInstancetypes: - description: Enables deployment of the common-instancetypes bundles, - defaults to true. + description: 'Deprecated: This field is ignored.' type: boolean deployTektonTaskResources: description: 'Deprecated: This field is ignored.' diff --git a/data/crd/ssp.kubevirt.io_ssps.yaml b/data/crd/ssp.kubevirt.io_ssps.yaml index 8672bc61d..ab935b711 100644 --- a/data/crd/ssp.kubevirt.io_ssps.yaml +++ b/data/crd/ssp.kubevirt.io_ssps.yaml @@ -3302,10 +3302,8 @@ spec: properties: commonInstancetypes: description: |- - CommonInstancetypes is the configuration of the common-instancetypes operand - - - Deprecated: This functionality will be removed in a future release. + CommonInstancetypes is ignored. + Deprecated: This field is ignored. properties: url: description: |- @@ -4189,8 +4187,7 @@ spec: description: FeatureGates for SSP properties: deployCommonInstancetypes: - description: Enables deployment of the common-instancetypes bundles, - defaults to true. + description: 'Deprecated: This field is ignored.' type: boolean deployTektonTaskResources: description: 'Deprecated: This field is ignored.' diff --git a/vendor/kubevirt.io/ssp-operator/api/v1beta2/ssp_types.go b/vendor/kubevirt.io/ssp-operator/api/v1beta2/ssp_types.go index 7e77b03df..d4cf88723 100644 --- a/vendor/kubevirt.io/ssp-operator/api/v1beta2/ssp_types.go +++ b/vendor/kubevirt.io/ssp-operator/api/v1beta2/ssp_types.go @@ -84,9 +84,9 @@ type SSPSpec struct { // TokenGenerationService configures the service for generating tokens to access VNC for a VM. TokenGenerationService *TokenGenerationService `json:"tokenGenerationService,omitempty"` - // CommonInstancetypes is the configuration of the common-instancetypes operand - // - // Deprecated: This functionality will be removed in a future release. + // CommonInstancetypes is ignored. + // +kubebuilder:deprecatedversion:warning="commonInstancetypes filed is ignored" + // Deprecated: This field is ignored. CommonInstancetypes *CommonInstancetypes `json:"commonInstancetypes,omitempty"` // TektonPipelines is the configuration of the tekton-pipelines operand @@ -123,7 +123,8 @@ type FeatureGates struct { // Deprecated: This field is ignored. DeployVmConsoleProxy bool `json:"deployVmConsoleProxy,omitempty"` - // Enables deployment of the common-instancetypes bundles, defaults to true. + // +kubebuilder:deprecatedversion:warning="instance types and preferences are no longer deployed by SSP" + // Deprecated: This field is ignored. DeployCommonInstancetypes *bool `json:"deployCommonInstancetypes,omitempty"` }