Merge pull request #1074 from akrejcir/remove-instance-types

Remove instance types and preferences
kubevirt · Sep 20, 2024 · e2dd4b9 · e2dd4b9
2 parents 1b4e457 + 129e1f3
commit e2dd4b9
Show file tree

Hide file tree

Showing 357 changed files with 180 additions and 111,199 deletions.
diff --git 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
@@ -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/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -236,20 +236,16 @@ rules:
   resources:
   - virtualmachineclusterinstancetypes
   verbs:
-  - create
   - delete
   - list
-  - update
   - watch
 - apiGroups:
   - instancetype.kubevirt.io
   resources:
   - virtualmachineclusterpreferences
   verbs:
-  - create
   - delete
   - list
-  - update
   - watch
 - apiGroups:
   - kubevirt.io