Merge pull request #1127 from akrejcir/update-api-version

Update API version to `v1beta3`

PROJECT

@@ -10,8 +10,8 @@ resources:
   domain: kubevirt.io
   group: ssp
   kind: SSP
-  path: kubevirt.io/ssp-operator/api/v1beta2
-  version: v1beta2
+  path: kubevirt.io/ssp-operator/api/v1beta3
+  version: v1beta3
   webhooks:
     # conversion: true
     # defaulting: true
@@ -24,8 +24,8 @@ resources:
   domain: kubevirt.io
   group: ssp
   kind: SSP
-  path: kubevirt.io/ssp-operator/api/v1beta1
-  version: v1beta1
+  path: kubevirt.io/ssp-operator/api/v1beta2
+  version: v1beta2
   webhooks:
     # conversion: true
     # defaulting: true

api/v1beta1/groupversion_info.go → api/v1beta3/groupversion_info.go

@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1beta1 contains API Schema definitions for the ssp v1beta1 API group
+// Package v1beta3 contains API Schema definitions for the ssp v1beta3 API group
 // +kubebuilder:object:generate=true
 // +groupName=ssp.kubevirt.io
-package v1beta1
+package v1beta3
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "ssp.kubevirt.io", Version: "v1beta1"}
+	GroupVersion = schema.GroupVersion{Group: "ssp.kubevirt.io", Version: "v1beta3"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

vendor/kubevirt.io/ssp-operator/api/v1beta1/ssp_types.go → api/v1beta3/ssp_types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1beta1
+package v1beta3
 
 import (
 	ocpv1 "github.com/openshift/api/config/v1"
@@ -43,38 +43,10 @@ type CommonTemplates struct {
 	//+kubebuilder:validation:Pattern=^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
 	Namespace string `json:"namespace"`
 
-	// DataImportCronTemplates defines a list of DataImportCrons managed by the SSP
-	// Operator. This is intended for images used by CommonTemplates.
+	// DataImportCronTemplates defines a list of DataImportCrons managed by the SSP Operator.
 	DataImportCronTemplates []DataImportCronTemplate `json:"dataImportCronTemplates,omitempty"`
 }
 
-type NodeLabeller struct {
-	// Placement describes the node scheduling configuration
-	Placement *lifecycleapi.NodePlacement `json:"placement,omitempty"`
-}
-
-type CommonInstancetypes struct {
-	// URL of a remote Kustomize target from which to generate and deploy resources.
-	//
-	// The following caveats apply to the provided URL:
-	//
-	// * Only 'https://' and 'git://' URLs are supported.
-	//
-	// * The URL must include '?ref=$ref' or '?version=$ref' pinning it to a specific
-	//   reference. It is recommended that the reference be a specific commit or tag
-	//   to ensure the generated contents does not change over time. As such it is
-	//   recommended not to use branches as the ref for the time being.
-	//
-	// * Only VirtualMachineClusterPreference and VirtualMachineClusterInstancetype
-	//   resources generated from the URL are deployed by the operand.
-	//
-	// See the following Kustomize documentation for more details:
-	//
-	// remote targets
-	// https://github.com/kubernetes-sigs/kustomize/blob/master/examples/remoteBuild.md
-	URL *string `json:"url,omitempty"`
-}
-
 // SSPSpec defines the desired state of SSP
 type SSPSpec struct {
 	// TemplateValidator is configuration of the template validator operand
@@ -83,38 +55,11 @@ type SSPSpec struct {
 	// CommonTemplates is the configuration of the common templates operand
 	CommonTemplates CommonTemplates `json:"commonTemplates"`
 
-	// NodeLabeller is configuration of the node-labeller operand
-	NodeLabeller *NodeLabeller `json:"nodeLabeller,omitempty"`
-
 	// TLSSecurityProfile is a configuration for the TLS.
 	TLSSecurityProfile *ocpv1.TLSSecurityProfile `json:"tlsSecurityProfile,omitempty"`
 
-	// CommonInstancetypes is the configuration of the common-instancetypes operand
-	CommonInstancetypes *CommonInstancetypes `json:"commonInstancetypes,omitempty"`
-
-	// TektonPipelines is the configuration of the tekton-pipelines operand
-	TektonPipelines *TektonPipelines `json:"tektonPipelines,omitempty"`
-
-	// TektonTasks is the configuration of the tekton-tasks operand
-	TektonTasks *TektonTasks `json:"tektonTasks,omitempty"`
-
-	// FeatureGates is the configuration of the tekton operands
-	FeatureGates *FeatureGates `json:"featureGates,omitempty"`
-}
-
-// TektonPipelines defines the desired state of pipelines
-type TektonPipelines struct {
-	Namespace string `json:"namespace,omitempty"`
-}
-
-// TektonTasks defines variables for configuration of tasks
-type TektonTasks struct {
-	Namespace string `json:"namespace,omitempty"`
-}
-
-// FeatureGates defines feature gate for tto operator
-type FeatureGates struct {
-	DeployTektonTaskResources bool `json:"deployTektonTaskResources,omitempty"`
+	// TokenGenerationService configures the service for generating tokens to access VNC for a VM.
+	TokenGenerationService *TokenGenerationService `json:"tokenGenerationService,omitempty"`
 }
 
 // DataImportCronTemplate defines the template type for DataImportCrons.
@@ -133,6 +78,11 @@ 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"`
@@ -146,9 +96,9 @@ type SSPStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:deprecatedversion:warning="ssp.kubevirt.io/v1beta1 ssp is deprecated"
-// SSP is the Schema for the ssps API
 // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
+
+// SSP is the Schema for the ssps API
 type SSP struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`