Merge pull request #1051 from akrejcir/revert-vm-proxy-api-v0.21

Revert "api: Add config option for vm-console-proxy, deprecate feature gate"

api/v1beta2/ssp_types.go

@@ -81,9 +81,6 @@ type SSPSpec struct {
 	// TLSSecurityProfile is a configuration for the TLS.
 	TLSSecurityProfile *ocpv1.TLSSecurityProfile `json:"tlsSecurityProfile,omitempty"`
 
-	// 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.
@@ -119,8 +116,6 @@ type FeatureGates struct {
 	// Deprecated: This field is ignored.
 	DeployTektonTaskResources bool `json:"deployTektonTaskResources,omitempty"`
 
-	// +kubebuilder:deprecatedversion:warning="use the .spec.tokenGenerationService to enable vm-console-proxy"
-	// Deprecated: This field is ignored.
 	DeployVmConsoleProxy bool `json:"deployVmConsoleProxy,omitempty"`
 
 	// Enables deployment of the common-instancetypes bundles, defaults to true.
@@ -143,11 +138,6 @@ func (t *DataImportCronTemplate) AsDataImportCron() cdiv1beta1.DataImportCron {
 	}
 }
 
-// TokenGenerationService configures the service for generating tokens to access VNC for a VM.
-type TokenGenerationService struct {
-	Enabled bool `json:"enabled,omitempty"`
-}
-
 // SSPStatus defines the observed state of SSP
 type SSPStatus struct {
 	lifecycleapi.Status `json:",inline"`

config/crd/bases/ssp.kubevirt.io_ssps.yaml

@@ -4194,7 +4194,6 @@ spec:
                     description: 'Deprecated: This field is ignored.'
                     type: boolean
                   deployVmConsoleProxy:
-                    description: 'Deprecated: This field is ignored.'
                     type: boolean
                 type: object
               tektonPipelines:
@@ -5479,13 +5478,6 @@ spec:
                     - Custom
                     type: string
                 type: object
-              tokenGenerationService:
-                description: TokenGenerationService configures the service for generating
-                  tokens to access VNC for a VM.
-                properties:
-                  enabled:
-                    type: boolean
-                type: object
             required:
             - commonTemplates
             type: object

data/crd/ssp.kubevirt.io_ssps.yaml

@@ -4196,7 +4196,6 @@ spec:
                     description: 'Deprecated: This field is ignored.'
                     type: boolean
                   deployVmConsoleProxy:
-                    description: 'Deprecated: This field is ignored.'
                     type: boolean
                 type: object
               tektonPipelines:
@@ -5481,13 +5480,6 @@ spec:
                     - Custom
                     type: string
                 type: object
-              tokenGenerationService:
-                description: TokenGenerationService configures the service for generating
-                  tokens to access VNC for a VM.
-                properties:
-                  enabled:
-                    type: boolean
-                type: object
             required:
             - commonTemplates
             type: object

internal/operands/vm-console-proxy/reconcile.go

@@ -108,7 +108,7 @@ func (v *vmConsoleProxy) WatchClusterTypes() []operands.WatchType {
 }
 
 func (v *vmConsoleProxy) Reconcile(request *common.Request) ([]common.ReconcileResult, error) {
-	if request.Instance.Spec.TokenGenerationService == nil || !request.Instance.Spec.TokenGenerationService.Enabled {
+	if request.Instance.Spec.FeatureGates == nil || !request.Instance.Spec.FeatureGates.DeployVmConsoleProxy {
 		cleanupResults, err := v.Cleanup(request)
 		if err != nil {
 			return nil, err

internal/operands/vm-console-proxy/reconcile_test.go

@@ -249,7 +249,7 @@ var _ = Describe("VM Console Proxy Operand", func() {
 		}
 	})
 
-	It("should delete resources when TokenGenerationService is disabled", func() {
+	It("should delete resources when feature gate was disabled", func() {
 		_, err := operand.Reconcile(&request)
 		Expect(err).ToNot(HaveOccurred())
 
@@ -264,7 +264,7 @@ var _ = Describe("VM Console Proxy Operand", func() {
 		ExpectResourceExists(bundle.Deployment, request)
 		ExpectResourceExists(bundle.ApiService, request)
 
-		request.Instance.Spec.TokenGenerationService.Enabled = false
+		request.Instance.Spec.FeatureGates.DeployVmConsoleProxy = false
 
 		_, err = operand.Reconcile(&request)
 		Expect(err).ToNot(HaveOccurred())
@@ -310,8 +310,8 @@ func getMockedRequest() common.Request {
 				Namespace: namespace,
 			},
 			Spec: ssp.SSPSpec{
-				TokenGenerationService: &ssp.TokenGenerationService{
-					Enabled: true,
+				FeatureGates: &ssp.FeatureGates{
+					DeployVmConsoleProxy: true,
 				},
 			},
 		},

tests/tests_suite_test.go

@@ -121,8 +121,8 @@ func (s *newSspStrategy) Init() {
 			CommonTemplates: sspv1beta2.CommonTemplates{
 				Namespace: s.GetTemplatesNamespace(),
 			},
-			TokenGenerationService: &sspv1beta2.TokenGenerationService{
-				Enabled: true,
+			FeatureGates: &sspv1beta2.FeatureGates{
+				DeployVmConsoleProxy: true,
 			},
 		},
 	}

tests/vm_console_proxy_test.go

@@ -41,9 +41,10 @@ var _ = Describe("VM Console Proxy Operand", func() {
 		strategy.SkipSspUpdateTestsIfNeeded()
 
 		updateSsp(func(foundSsp *ssp.SSP) {
-			foundSsp.Spec.TokenGenerationService = &ssp.TokenGenerationService{
-				Enabled: true,
+			if foundSsp.Spec.FeatureGates == nil {
+				foundSsp.Spec.FeatureGates = &ssp.FeatureGates{}
 			}
+			foundSsp.Spec.FeatureGates.DeployVmConsoleProxy = true
 		})
 
 		expectedLabels := expectedLabelsFor("vm-console-proxy", "vm-console-proxy")