feat!: deprecating v1alpha1 api

Signed-off-by: Dario Tranchitella <dario@tranchitella.eu>

PROJECT

@@ -7,25 +7,6 @@ plugins:
 projectName: capsule
 repo: github.com/projectcapsule/capsule
 resources:
-- api:
-    crdVersion: v1
-  controller: true
-  domain: clastix.io
-  group: capsule
-  kind: Tenant
-  path: github.com/projectcapsule/capsule/api/v1alpha1
-  version: v1alpha1
-  webhooks:
-    conversion: true
-    webhookVersion: v1
-- api:
-    crdVersion: v1
-  controller: true
-  domain: clastix.io
-  group: capsule
-  kind: CapsuleConfiguration
-  path: github.com/projectcapsule/capsule/api/v1alpha1
-  version: v1alpha1
 - api:
     crdVersion: v1
   domain: clastix.io

api/v1alpha1/additional_metadata.go

@@ -1,9 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-type AdditionalMetadata struct {
-	Labels      map[string]string `json:"additionalLabels,omitempty"`
-	Annotations map[string]string `json:"additionalAnnotations,omitempty"`
-}

api/v1alpha1/capsuleconfiguration_annotations.go

@@ -1,15 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-const (
-	ForbiddenNodeLabelsAnnotation            = "capsule.clastix.io/forbidden-node-labels"
-	ForbiddenNodeLabelsRegexpAnnotation      = "capsule.clastix.io/forbidden-node-labels-regexp"
-	ForbiddenNodeAnnotationsAnnotation       = "capsule.clastix.io/forbidden-node-annotations"
-	ForbiddenNodeAnnotationsRegexpAnnotation = "capsule.clastix.io/forbidden-node-annotations-regexp"
-	TLSSecretNameAnnotation                  = "capsule.clastix.io/tls-secret-name"
-	MutatingWebhookConfigurationName         = "capsule.clastix.io/mutating-webhook-configuration-name"
-	ValidatingWebhookConfigurationName       = "capsule.clastix.io/validating-webhook-configuration-name"
-	EnableTLSConfigurationAnnotationName     = "capsule.clastix.io/enable-tls-configuration"
-)

api/v1alpha1/capsuleconfiguration_types.go

@@ -1,47 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// CapsuleConfigurationSpec defines the Capsule configuration.
-type CapsuleConfigurationSpec struct {
-	// Names of the groups for Capsule users.
-	// +kubebuilder:default={capsule.clastix.io}
-	UserGroups []string `json:"userGroups,omitempty"`
-	// Enforces the Tenant owner, during Namespace creation, to name it using the selected Tenant name as prefix,
-	// separated by a dash. This is useful to avoid Namespace name collision in a public CaaS environment.
-	// +kubebuilder:default=false
-	ForceTenantPrefix bool `json:"forceTenantPrefix,omitempty"`
-	// Disallow creation of namespaces, whose name matches this regexp
-	ProtectedNamespaceRegexpString string `json:"protectedNamespaceRegex,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-// +kubebuilder:resource:scope=Cluster
-
-// CapsuleConfiguration is the Schema for the Capsule configuration API.
-type CapsuleConfiguration struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec CapsuleConfigurationSpec `json:"spec,omitempty"`
-}
-
-func (in *CapsuleConfiguration) Hub() {}
-
-// +kubebuilder:object:root=true
-
-// CapsuleConfigurationList contains a list of CapsuleConfiguration.
-type CapsuleConfigurationList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []CapsuleConfiguration `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&CapsuleConfiguration{}, &CapsuleConfigurationList{})
-}

api/v1alpha1/capsuleconfiguration_webhook.go

@@ -1,21 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-import (
-	"os"
-
-	ctrl "sigs.k8s.io/controller-runtime"
-)
-
-func (in *CapsuleConfiguration) SetupWebhookWithManager(mgr ctrl.Manager) error {
-	certData, _ := os.ReadFile("/tmp/k8s-webhook-server/serving-certs/tls.crt")
-	if len(certData) == 0 {
-		return nil
-	}
-
-	return ctrl.NewWebhookManagedBy(mgr).
-		For(in).
-		Complete()
-}

api/v1alpha1/conversion_hub.go

@@ -1,583 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-import (
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"github.com/pkg/errors"
-	"k8s.io/utils/pointer"
-	"sigs.k8s.io/controller-runtime/pkg/conversion"
-
-	capsulev1beta1 "github.com/projectcapsule/capsule/api/v1beta1"
-	"github.com/projectcapsule/capsule/pkg/api"
-)
-
-const (
-	resourceQuotaScopeAnnotation = "capsule.clastix.io/resource-quota-scope"
-
-	podAllowedImagePullPolicyAnnotation = "capsule.clastix.io/allowed-image-pull-policy"
-
-	podPriorityAllowedAnnotation      = "priorityclass.capsule.clastix.io/allowed"
-	podPriorityAllowedRegexAnnotation = "priorityclass.capsule.clastix.io/allowed-regex"
-
-	enableNodePortsAnnotation    = "capsule.clastix.io/enable-node-ports"
-	enableExternalNameAnnotation = "capsule.clastix.io/enable-external-name"
-	enableLoadBalancerAnnotation = "capsule.clastix.io/enable-loadbalancer-service"
-
-	ownerGroupsAnnotation         = "owners.capsule.clastix.io/group"
-	ownerUsersAnnotation          = "owners.capsule.clastix.io/user"
-	ownerServiceAccountAnnotation = "owners.capsule.clastix.io/serviceaccount"
-
-	enableNodeListingAnnotation           = "capsule.clastix.io/enable-node-listing"
-	enableNodeUpdateAnnotation            = "capsule.clastix.io/enable-node-update"
-	enableNodeDeletionAnnotation          = "capsule.clastix.io/enable-node-deletion"
-	enableStorageClassListingAnnotation   = "capsule.clastix.io/enable-storageclass-listing"
-	enableStorageClassUpdateAnnotation    = "capsule.clastix.io/enable-storageclass-update"
-	enableStorageClassDeletionAnnotation  = "capsule.clastix.io/enable-storageclass-deletion"
-	enableIngressClassListingAnnotation   = "capsule.clastix.io/enable-ingressclass-listing"
-	enableIngressClassUpdateAnnotation    = "capsule.clastix.io/enable-ingressclass-update"
-	enableIngressClassDeletionAnnotation  = "capsule.clastix.io/enable-ingressclass-deletion"
-	enablePriorityClassListingAnnotation  = "capsule.clastix.io/enable-priorityclass-listing"
-	enablePriorityClassUpdateAnnotation   = "capsule.clastix.io/enable-priorityclass-update"
-	enablePriorityClassDeletionAnnotation = "capsule.clastix.io/enable-priorityclass-deletion"
-
-	ingressHostnameCollisionScope = "ingress.capsule.clastix.io/hostname-collision-scope"
-)
-
-func (in *Tenant) convertV1Alpha1OwnerToV1Beta1() capsulev1beta1.OwnerListSpec {
-	serviceKindToAnnotationMap := map[capsulev1beta1.ProxyServiceKind][]string{
-		capsulev1beta1.NodesProxy:           {enableNodeListingAnnotation, enableNodeUpdateAnnotation, enableNodeDeletionAnnotation},
-		capsulev1beta1.StorageClassesProxy:  {enableStorageClassListingAnnotation, enableStorageClassUpdateAnnotation, enableStorageClassDeletionAnnotation},
-		capsulev1beta1.IngressClassesProxy:  {enableIngressClassListingAnnotation, enableIngressClassUpdateAnnotation, enableIngressClassDeletionAnnotation},
-		capsulev1beta1.PriorityClassesProxy: {enablePriorityClassListingAnnotation, enablePriorityClassUpdateAnnotation, enablePriorityClassDeletionAnnotation},
-	}
-	annotationToOperationMap := map[string]capsulev1beta1.ProxyOperation{
-		enableNodeListingAnnotation:           capsulev1beta1.ListOperation,
-		enableNodeUpdateAnnotation:            capsulev1beta1.UpdateOperation,
-		enableNodeDeletionAnnotation:          capsulev1beta1.DeleteOperation,
-		enableStorageClassListingAnnotation:   capsulev1beta1.ListOperation,
-		enableStorageClassUpdateAnnotation:    capsulev1beta1.UpdateOperation,
-		enableStorageClassDeletionAnnotation:  capsulev1beta1.DeleteOperation,
-		enableIngressClassListingAnnotation:   capsulev1beta1.ListOperation,
-		enableIngressClassUpdateAnnotation:    capsulev1beta1.UpdateOperation,
-		enableIngressClassDeletionAnnotation:  capsulev1beta1.DeleteOperation,
-		enablePriorityClassListingAnnotation:  capsulev1beta1.ListOperation,
-		enablePriorityClassUpdateAnnotation:   capsulev1beta1.UpdateOperation,
-		enablePriorityClassDeletionAnnotation: capsulev1beta1.DeleteOperation,
-	}
-	annotationToOwnerKindMap := map[string]capsulev1beta1.OwnerKind{
-		ownerUsersAnnotation:          capsulev1beta1.UserOwner,
-		ownerGroupsAnnotation:         capsulev1beta1.GroupOwner,
-		ownerServiceAccountAnnotation: capsulev1beta1.ServiceAccountOwner,
-	}
-
-	annotations := in.GetAnnotations()
-
-	operations := make(map[string]map[capsulev1beta1.ProxyServiceKind][]capsulev1beta1.ProxyOperation)
-
-	for serviceKind, operationAnnotations := range serviceKindToAnnotationMap {
-		for _, operationAnnotation := range operationAnnotations {
-			val, ok := annotations[operationAnnotation]
-			if ok {
-				for _, owner := range strings.Split(val, ",") {
-					if _, exists := operations[owner]; !exists {
-						operations[owner] = make(map[capsulev1beta1.ProxyServiceKind][]capsulev1beta1.ProxyOperation)
-					}
-
-					operations[owner][serviceKind] = append(operations[owner][serviceKind], annotationToOperationMap[operationAnnotation])
-				}
-			}
-		}
-	}
-
-	var owners capsulev1beta1.OwnerListSpec
-
-	getProxySettingsForOwner := func(ownerName string) (settings []capsulev1beta1.ProxySettings) {
-		ownerOperations, ok := operations[ownerName]
-		if ok {
-			for k, v := range ownerOperations {
-				settings = append(settings, capsulev1beta1.ProxySettings{
-					Kind:       k,
-					Operations: v,
-				})
-			}
-		}
-
-		return
-	}
-
-	owners = append(owners, capsulev1beta1.OwnerSpec{
-		Kind:            capsulev1beta1.OwnerKind(in.Spec.Owner.Kind),
-		Name:            in.Spec.Owner.Name,
-		ProxyOperations: getProxySettingsForOwner(in.Spec.Owner.Name),
-	})
-
-	for ownerAnnotation, ownerKind := range annotationToOwnerKindMap {
-		val, ok := annotations[ownerAnnotation]
-		if ok {
-			for _, owner := range strings.Split(val, ",") {
-				owners = append(owners, capsulev1beta1.OwnerSpec{
-					Kind:            ownerKind,
-					Name:            owner,
-					ProxyOperations: getProxySettingsForOwner(owner),
-				})
-			}
-		}
-	}
-
-	return owners
-}
-
-//nolint:gocognit,gocyclo,cyclop,maintidx
-func (in *Tenant) ConvertTo(dstRaw conversion.Hub) error {
-	dst, ok := dstRaw.(*capsulev1beta1.Tenant)
-	if !ok {
-		return fmt.Errorf("expected type *capsulev1beta1.Tenant, got %T", dst)
-	}
-
-	annotations := in.GetAnnotations()
-
-	// ObjectMeta
-	dst.ObjectMeta = in.ObjectMeta
-
-	// Spec
-	if in.Spec.NamespaceQuota != nil {
-		if dst.Spec.NamespaceOptions == nil {
-			dst.Spec.NamespaceOptions = &capsulev1beta1.NamespaceOptions{}
-		}
-
-		dst.Spec.NamespaceOptions.Quota = in.Spec.NamespaceQuota
-	}
-
-	dst.Spec.NodeSelector = in.Spec.NodeSelector
-
-	dst.Spec.Owners = in.convertV1Alpha1OwnerToV1Beta1()
-
-	if in.Spec.NamespacesMetadata != nil {
-		if dst.Spec.NamespaceOptions == nil {
-			dst.Spec.NamespaceOptions = &capsulev1beta1.NamespaceOptions{}
-		}
-
-		dst.Spec.NamespaceOptions.AdditionalMetadata = &api.AdditionalMetadataSpec{
-			Labels:      in.Spec.NamespacesMetadata.Labels,
-			Annotations: in.Spec.NamespacesMetadata.Annotations,
-		}
-	}
-
-	if in.Spec.ServicesMetadata != nil {
-		if dst.Spec.ServiceOptions == nil {
-			dst.Spec.ServiceOptions = &api.ServiceOptions{}
-		}
-
-		dst.Spec.ServiceOptions.AdditionalMetadata = &api.AdditionalMetadataSpec{
-			Labels:      in.Spec.ServicesMetadata.Labels,
-			Annotations: in.Spec.ServicesMetadata.Annotations,
-		}
-	}
-
-	if in.Spec.StorageClasses != nil {
-		dst.Spec.StorageClasses = in.Spec.StorageClasses
-	}
-
-	if v, annotationOk := in.Annotations[ingressHostnameCollisionScope]; annotationOk {
-		switch v {
-		case string(api.HostnameCollisionScopeCluster), string(api.HostnameCollisionScopeTenant), string(api.HostnameCollisionScopeNamespace):
-			dst.Spec.IngressOptions.HostnameCollisionScope = api.HostnameCollisionScope(v)
-		default:
-			dst.Spec.IngressOptions.HostnameCollisionScope = api.HostnameCollisionScopeDisabled
-		}
-	}
-
-	if in.Spec.IngressClasses != nil {
-		dst.Spec.IngressOptions.AllowedClasses = &api.AllowedListSpec{
-			Exact: in.Spec.IngressClasses.Exact,
-			Regex: in.Spec.IngressClasses.Regex,
-		}
-	}
-
-	if in.Spec.IngressHostnames != nil {
-		dst.Spec.IngressOptions.AllowedHostnames = &api.AllowedListSpec{
-			Exact: in.Spec.IngressHostnames.Exact,
-			Regex: in.Spec.IngressHostnames.Regex,
-		}
-	}
-
-	if in.Spec.ContainerRegistries != nil {
-		dst.Spec.ContainerRegistries = &api.AllowedListSpec{
-			Exact: in.Spec.ContainerRegistries.Exact,
-			Regex: in.Spec.ContainerRegistries.Regex,
-		}
-	}
-
-	if len(in.Spec.NetworkPolicies) > 0 {
-		dst.Spec.NetworkPolicies = api.NetworkPolicySpec{
-			Items: in.Spec.NetworkPolicies,
-		}
-	}
-
-	if len(in.Spec.LimitRanges) > 0 {
-		dst.Spec.LimitRanges = api.LimitRangesSpec{
-			Items: in.Spec.LimitRanges,
-		}
-	}
-
-	if len(in.Spec.ResourceQuota) > 0 {
-		dst.Spec.ResourceQuota = api.ResourceQuotaSpec{
-			Scope: func() api.ResourceQuotaScope {
-				if v, annotationOk := in.GetAnnotations()[resourceQuotaScopeAnnotation]; annotationOk {
-					switch v {
-					case string(api.ResourceQuotaScopeNamespace):
-						return api.ResourceQuotaScopeNamespace
-					case string(api.ResourceQuotaScopeTenant):
-						return api.ResourceQuotaScopeTenant
-					}
-				}
-
-				return api.ResourceQuotaScopeTenant
-			}(),
-			Items: in.Spec.ResourceQuota,
-		}
-	}
-
-	dst.Spec.AdditionalRoleBindings = in.Spec.AdditionalRoleBindings
-
-	if in.Spec.ExternalServiceIPs != nil {
-		if dst.Spec.ServiceOptions == nil {
-			dst.Spec.ServiceOptions = &api.ServiceOptions{}
-		}
-
-		dst.Spec.ServiceOptions.ExternalServiceIPs = in.Spec.ExternalServiceIPs
-	}
-
-	pullPolicies, ok := annotations[podAllowedImagePullPolicyAnnotation]
-	if ok {
-		for _, policy := range strings.Split(pullPolicies, ",") {
-			dst.Spec.ImagePullPolicies = append(dst.Spec.ImagePullPolicies, api.ImagePullPolicySpec(policy))
-		}
-	}
-
-	priorityClasses := api.AllowedListSpec{}
-
-	priorityClassAllowed, ok := annotations[podPriorityAllowedAnnotation]
-
-	if ok {
-		priorityClasses.Exact = strings.Split(priorityClassAllowed, ",")
-	}
-
-	priorityClassesRegexp, ok := annotations[podPriorityAllowedRegexAnnotation]
-
-	if ok {
-		priorityClasses.Regex = priorityClassesRegexp
-	}
-
-	if !reflect.ValueOf(priorityClasses).IsZero() {
-		dst.Spec.PriorityClasses = &priorityClasses
-	}
-
-	enableNodePorts, ok := annotations[enableNodePortsAnnotation]
-	if ok {
-		val, err := strconv.ParseBool(enableNodePorts)
-		if err != nil {
-			return errors.Wrap(err, fmt.Sprintf("unable to parse %s annotation on tenant %s", enableNodePortsAnnotation, in.GetName()))
-		}
-
-		if dst.Spec.ServiceOptions == nil {
-			dst.Spec.ServiceOptions = &api.ServiceOptions{}
-		}
-
-		if dst.Spec.ServiceOptions.AllowedServices == nil {
-			dst.Spec.ServiceOptions.AllowedServices = &api.AllowedServices{}
-		}
-
-		dst.Spec.ServiceOptions.AllowedServices.NodePort = pointer.Bool(val)
-	}
-
-	enableExternalName, ok := annotations[enableExternalNameAnnotation]
-	if ok {
-		val, err := strconv.ParseBool(enableExternalName)
-		if err != nil {
-			return errors.Wrap(err, fmt.Sprintf("unable to parse %s annotation on tenant %s", enableExternalNameAnnotation, in.GetName()))
-		}
-
-		if dst.Spec.ServiceOptions == nil {
-			dst.Spec.ServiceOptions = &api.ServiceOptions{}
-		}
-
-		if dst.Spec.ServiceOptions.AllowedServices == nil {
-			dst.Spec.ServiceOptions.AllowedServices = &api.AllowedServices{}
-		}
-
-		dst.Spec.ServiceOptions.AllowedServices.ExternalName = pointer.Bool(val)
-	}
-
-	loadBalancerService, ok := annotations[enableLoadBalancerAnnotation]
-	if ok {
-		val, err := strconv.ParseBool(loadBalancerService)
-		if err != nil {
-			return errors.Wrap(err, fmt.Sprintf("unable to parse %s annotation on tenant %s", enableLoadBalancerAnnotation, in.GetName()))
-		}
-
-		if dst.Spec.ServiceOptions == nil {
-			dst.Spec.ServiceOptions = &api.ServiceOptions{}
-		}
-
-		if dst.Spec.ServiceOptions.AllowedServices == nil {
-			dst.Spec.ServiceOptions.AllowedServices = &api.AllowedServices{}
-		}
-
-		dst.Spec.ServiceOptions.AllowedServices.LoadBalancer = pointer.Bool(val)
-	}
-	// Status
-	dst.Status = capsulev1beta1.TenantStatus{
-		Size:       in.Status.Size,
-		Namespaces: in.Status.Namespaces,
-	}
-	// Remove unneeded annotations
-	delete(dst.ObjectMeta.Annotations, podAllowedImagePullPolicyAnnotation)
-	delete(dst.ObjectMeta.Annotations, podPriorityAllowedAnnotation)
-	delete(dst.ObjectMeta.Annotations, podPriorityAllowedRegexAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableNodePortsAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableExternalNameAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableLoadBalancerAnnotation)
-	delete(dst.ObjectMeta.Annotations, ownerGroupsAnnotation)
-	delete(dst.ObjectMeta.Annotations, ownerUsersAnnotation)
-	delete(dst.ObjectMeta.Annotations, ownerServiceAccountAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableNodeListingAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableNodeUpdateAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableNodeDeletionAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableStorageClassListingAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableStorageClassUpdateAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableStorageClassDeletionAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableIngressClassListingAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableIngressClassUpdateAnnotation)
-	delete(dst.ObjectMeta.Annotations, enableIngressClassDeletionAnnotation)
-	delete(dst.ObjectMeta.Annotations, enablePriorityClassListingAnnotation)
-	delete(dst.ObjectMeta.Annotations, enablePriorityClassUpdateAnnotation)
-	delete(dst.ObjectMeta.Annotations, enablePriorityClassDeletionAnnotation)
-	delete(dst.ObjectMeta.Annotations, resourceQuotaScopeAnnotation)
-	delete(dst.ObjectMeta.Annotations, ingressHostnameCollisionScope)
-
-	return nil
-}
-
-//nolint:gocognit,gocyclo,cyclop
-func (in *Tenant) convertV1Beta1OwnerToV1Alpha1(src *capsulev1beta1.Tenant) {
-	ownersAnnotations := map[string][]string{
-		ownerGroupsAnnotation:         nil,
-		ownerUsersAnnotation:          nil,
-		ownerServiceAccountAnnotation: nil,
-	}
-
-	proxyAnnotations := map[string][]string{
-		enableNodeListingAnnotation:          nil,
-		enableNodeUpdateAnnotation:           nil,
-		enableNodeDeletionAnnotation:         nil,
-		enableStorageClassListingAnnotation:  nil,
-		enableStorageClassUpdateAnnotation:   nil,
-		enableStorageClassDeletionAnnotation: nil,
-		enableIngressClassListingAnnotation:  nil,
-		enableIngressClassUpdateAnnotation:   nil,
-		enableIngressClassDeletionAnnotation: nil,
-	}
-
-	for i, owner := range src.Spec.Owners {
-		if i == 0 {
-			in.Spec.Owner = OwnerSpec{
-				Name: owner.Name,
-				Kind: Kind(owner.Kind),
-			}
-		} else {
-			switch owner.Kind {
-			case capsulev1beta1.UserOwner:
-				ownersAnnotations[ownerUsersAnnotation] = append(ownersAnnotations[ownerUsersAnnotation], owner.Name)
-			case capsulev1beta1.GroupOwner:
-				ownersAnnotations[ownerGroupsAnnotation] = append(ownersAnnotations[ownerGroupsAnnotation], owner.Name)
-			case capsulev1beta1.ServiceAccountOwner:
-				ownersAnnotations[ownerServiceAccountAnnotation] = append(ownersAnnotations[ownerServiceAccountAnnotation], owner.Name)
-			}
-		}
-
-		for _, setting := range owner.ProxyOperations {
-			switch setting.Kind {
-			case capsulev1beta1.NodesProxy:
-				for _, operation := range setting.Operations {
-					switch operation {
-					case capsulev1beta1.ListOperation:
-						proxyAnnotations[enableNodeListingAnnotation] = append(proxyAnnotations[enableNodeListingAnnotation], owner.Name)
-					case capsulev1beta1.UpdateOperation:
-						proxyAnnotations[enableNodeUpdateAnnotation] = append(proxyAnnotations[enableNodeUpdateAnnotation], owner.Name)
-					case capsulev1beta1.DeleteOperation:
-						proxyAnnotations[enableNodeDeletionAnnotation] = append(proxyAnnotations[enableNodeDeletionAnnotation], owner.Name)
-					}
-				}
-			case capsulev1beta1.PriorityClassesProxy:
-				for _, operation := range setting.Operations {
-					switch operation {
-					case capsulev1beta1.ListOperation:
-						proxyAnnotations[enablePriorityClassListingAnnotation] = append(proxyAnnotations[enablePriorityClassListingAnnotation], owner.Name)
-					case capsulev1beta1.UpdateOperation:
-						proxyAnnotations[enablePriorityClassUpdateAnnotation] = append(proxyAnnotations[enablePriorityClassUpdateAnnotation], owner.Name)
-					case capsulev1beta1.DeleteOperation:
-						proxyAnnotations[enablePriorityClassDeletionAnnotation] = append(proxyAnnotations[enablePriorityClassDeletionAnnotation], owner.Name)
-					}
-				}
-			case capsulev1beta1.StorageClassesProxy:
-				for _, operation := range setting.Operations {
-					switch operation {
-					case capsulev1beta1.ListOperation:
-						proxyAnnotations[enableStorageClassListingAnnotation] = append(proxyAnnotations[enableStorageClassListingAnnotation], owner.Name)
-					case capsulev1beta1.UpdateOperation:
-						proxyAnnotations[enableStorageClassUpdateAnnotation] = append(proxyAnnotations[enableStorageClassUpdateAnnotation], owner.Name)
-					case capsulev1beta1.DeleteOperation:
-						proxyAnnotations[enableStorageClassDeletionAnnotation] = append(proxyAnnotations[enableStorageClassDeletionAnnotation], owner.Name)
-					}
-				}
-			case capsulev1beta1.IngressClassesProxy:
-				for _, operation := range setting.Operations {
-					switch operation {
-					case capsulev1beta1.ListOperation:
-						proxyAnnotations[enableIngressClassListingAnnotation] = append(proxyAnnotations[enableIngressClassListingAnnotation], owner.Name)
-					case capsulev1beta1.UpdateOperation:
-						proxyAnnotations[enableIngressClassUpdateAnnotation] = append(proxyAnnotations[enableIngressClassUpdateAnnotation], owner.Name)
-					case capsulev1beta1.DeleteOperation:
-						proxyAnnotations[enableIngressClassDeletionAnnotation] = append(proxyAnnotations[enableIngressClassDeletionAnnotation], owner.Name)
-					}
-				}
-			}
-		}
-	}
-
-	for k, v := range ownersAnnotations {
-		if len(v) > 0 {
-			in.Annotations[k] = strings.Join(v, ",")
-		}
-	}
-
-	for k, v := range proxyAnnotations {
-		if len(v) > 0 {
-			in.Annotations[k] = strings.Join(v, ",")
-		}
-	}
-}
-
-//nolint:cyclop
-func (in *Tenant) ConvertFrom(srcRaw conversion.Hub) error {
-	src, ok := srcRaw.(*capsulev1beta1.Tenant)
-	if !ok {
-		return fmt.Errorf("expected *capsulev1beta1.Tenant, got %T", srcRaw)
-	}
-
-	// ObjectMeta
-	in.ObjectMeta = src.ObjectMeta
-
-	// Spec
-	if src.Spec.NamespaceOptions != nil && src.Spec.NamespaceOptions.Quota != nil {
-		in.Spec.NamespaceQuota = src.Spec.NamespaceOptions.Quota
-	}
-
-	in.Spec.NodeSelector = src.Spec.NodeSelector
-
-	if in.Annotations == nil {
-		in.Annotations = make(map[string]string)
-	}
-
-	in.convertV1Beta1OwnerToV1Alpha1(src)
-
-	if src.Spec.NamespaceOptions != nil && src.Spec.NamespaceOptions.AdditionalMetadata != nil {
-		in.Spec.NamespacesMetadata = &AdditionalMetadata{
-			Labels:      src.Spec.NamespaceOptions.AdditionalMetadata.Labels,
-			Annotations: src.Spec.NamespaceOptions.AdditionalMetadata.Annotations,
-		}
-	}
-
-	if src.Spec.ServiceOptions != nil && src.Spec.ServiceOptions.AdditionalMetadata != nil {
-		in.Spec.ServicesMetadata = &AdditionalMetadata{
-			Labels:      src.Spec.ServiceOptions.AdditionalMetadata.Labels,
-			Annotations: src.Spec.ServiceOptions.AdditionalMetadata.Annotations,
-		}
-	}
-
-	if src.Spec.StorageClasses != nil {
-		in.Spec.StorageClasses = src.Spec.StorageClasses
-	}
-
-	in.Annotations[ingressHostnameCollisionScope] = string(src.Spec.IngressOptions.HostnameCollisionScope)
-
-	if src.Spec.IngressOptions.AllowedClasses != nil {
-		in.Spec.IngressClasses = src.Spec.IngressOptions.AllowedClasses
-	}
-
-	if src.Spec.IngressOptions.AllowedHostnames != nil {
-		in.Spec.IngressHostnames = src.Spec.IngressOptions.AllowedHostnames
-	}
-
-	if src.Spec.ContainerRegistries != nil {
-		in.Spec.ContainerRegistries = src.Spec.ContainerRegistries
-	}
-
-	if len(src.Spec.NetworkPolicies.Items) > 0 {
-		in.Spec.NetworkPolicies = src.Spec.NetworkPolicies.Items
-	}
-
-	if len(src.Spec.LimitRanges.Items) > 0 {
-		in.Spec.LimitRanges = src.Spec.LimitRanges.Items
-	}
-
-	if len(src.Spec.ResourceQuota.Items) > 0 {
-		in.Annotations[resourceQuotaScopeAnnotation] = string(src.Spec.ResourceQuota.Scope)
-		in.Spec.ResourceQuota = src.Spec.ResourceQuota.Items
-	}
-
-	in.Spec.AdditionalRoleBindings = src.Spec.AdditionalRoleBindings
-
-	if src.Spec.ServiceOptions != nil && src.Spec.ServiceOptions.ExternalServiceIPs != nil {
-		in.Spec.ExternalServiceIPs = src.Spec.ServiceOptions.ExternalServiceIPs
-	}
-
-	if len(src.Spec.ImagePullPolicies) != 0 {
-		var pullPolicies []string
-
-		for _, policy := range src.Spec.ImagePullPolicies {
-			pullPolicies = append(pullPolicies, string(policy))
-		}
-
-		in.Annotations[podAllowedImagePullPolicyAnnotation] = strings.Join(pullPolicies, ",")
-	}
-
-	if src.Spec.PriorityClasses != nil {
-		if len(src.Spec.PriorityClasses.Exact) != 0 {
-			in.Annotations[podPriorityAllowedAnnotation] = strings.Join(src.Spec.PriorityClasses.Exact, ",")
-		}
-
-		if src.Spec.PriorityClasses.Regex != "" {
-			in.Annotations[podPriorityAllowedRegexAnnotation] = src.Spec.PriorityClasses.Regex
-		}
-	}
-
-	if src.Spec.ServiceOptions != nil && src.Spec.ServiceOptions.AllowedServices != nil {
-		if src.Spec.ServiceOptions.AllowedServices.NodePort != nil {
-			in.Annotations[enableNodePortsAnnotation] = strconv.FormatBool(*src.Spec.ServiceOptions.AllowedServices.NodePort)
-		}
-
-		if src.Spec.ServiceOptions.AllowedServices.ExternalName != nil {
-			in.Annotations[enableExternalNameAnnotation] = strconv.FormatBool(*src.Spec.ServiceOptions.AllowedServices.ExternalName)
-		}
-
-		if src.Spec.ServiceOptions.AllowedServices.LoadBalancer != nil {
-			in.Annotations[enableLoadBalancerAnnotation] = strconv.FormatBool(*src.Spec.ServiceOptions.AllowedServices.LoadBalancer)
-		}
-	}
-
-	// Status
-	in.Status = TenantStatus{
-		Size:       src.Status.Size,
-		Namespaces: src.Status.Namespaces,
-	}
-
-	return nil
-}

api/v1alpha1/conversion_hub_test.go

@@ -1,393 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-import (
-	"sort"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	corev1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
-
-	capsulev1beta1 "github.com/projectcapsule/capsule/api/v1beta1"
-	"github.com/projectcapsule/capsule/pkg/api"
-)
-
-//nolint:maintidx
-func generateTenantsSpecs() (Tenant, capsulev1beta1.Tenant) {
-	var namespaceQuota int32 = 5
-
-	nodeSelector := map[string]string{
-		"foo": "bar",
-	}
-	v1alpha1AdditionalMetadataSpec := &AdditionalMetadata{
-		Labels: map[string]string{
-			"foo": "bar",
-		},
-		Annotations: map[string]string{
-			"foo": "bar",
-		},
-	}
-	v1alpha1AllowedListSpec := &api.AllowedListSpec{
-		Exact: []string{"foo", "bar"},
-		Regex: "^foo*",
-	}
-	v1beta1AdditionalMetadataSpec := &api.AdditionalMetadataSpec{
-		Labels: map[string]string{
-			"foo": "bar",
-		},
-		Annotations: map[string]string{
-			"foo": "bar",
-		},
-	}
-	v1beta1NamespaceOptions := &capsulev1beta1.NamespaceOptions{
-		Quota:              &namespaceQuota,
-		AdditionalMetadata: v1beta1AdditionalMetadataSpec,
-	}
-	v1beta1ServiceOptions := &api.ServiceOptions{
-		AdditionalMetadata: v1beta1AdditionalMetadataSpec,
-		AllowedServices: &api.AllowedServices{
-			NodePort:     pointer.Bool(false),
-			ExternalName: pointer.Bool(false),
-			LoadBalancer: pointer.Bool(false),
-		},
-		ExternalServiceIPs: &api.ExternalServiceIPsSpec{
-			Allowed: []api.AllowedIP{"192.168.0.1"},
-		},
-	}
-	v1beta2AllowedListSpec := &api.SelectorAllowedListSpec{
-		AllowedListSpec: api.AllowedListSpec{
-			Exact: []string{"foo", "bar"},
-			Regex: "^foo*",
-		},
-	}
-	networkPolicies := []networkingv1.NetworkPolicySpec{
-		{
-			Ingress: []networkingv1.NetworkPolicyIngressRule{
-				{
-					From: []networkingv1.NetworkPolicyPeer{
-						{
-							NamespaceSelector: &metav1.LabelSelector{
-								MatchLabels: map[string]string{
-									"foo": "tenant-resources",
-								},
-							},
-						},
-						{
-							PodSelector: &metav1.LabelSelector{},
-						},
-						{
-							IPBlock: &networkingv1.IPBlock{
-								CIDR: "192.168.0.0/12",
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-	limitRanges := []corev1.LimitRangeSpec{
-		{
-			Limits: []corev1.LimitRangeItem{
-				{
-					Type: corev1.LimitTypePod,
-					Min: map[corev1.ResourceName]resource.Quantity{
-						corev1.ResourceCPU:    resource.MustParse("50m"),
-						corev1.ResourceMemory: resource.MustParse("5Mi"),
-					},
-					Max: map[corev1.ResourceName]resource.Quantity{
-						corev1.ResourceCPU:    resource.MustParse("1"),
-						corev1.ResourceMemory: resource.MustParse("1Gi"),
-					},
-				},
-			},
-		},
-	}
-	resourceQuotas := []corev1.ResourceQuotaSpec{
-		{
-			Hard: map[corev1.ResourceName]resource.Quantity{
-				corev1.ResourceLimitsCPU:      resource.MustParse("8"),
-				corev1.ResourceLimitsMemory:   resource.MustParse("16Gi"),
-				corev1.ResourceRequestsCPU:    resource.MustParse("8"),
-				corev1.ResourceRequestsMemory: resource.MustParse("16Gi"),
-			},
-			Scopes: []corev1.ResourceQuotaScope{
-				corev1.ResourceQuotaScopeNotTerminating,
-			},
-		},
-	}
-
-	v1beta1Tnt := capsulev1beta1.Tenant{
-		TypeMeta: metav1.TypeMeta{},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "alice",
-			Labels: map[string]string{
-				"foo": "bar",
-			},
-			Annotations: map[string]string{
-				"foo": "bar",
-			},
-		},
-		Spec: capsulev1beta1.TenantSpec{
-			Owners: capsulev1beta1.OwnerListSpec{
-				{
-					Kind: "User",
-					Name: "alice",
-					ProxyOperations: []capsulev1beta1.ProxySettings{
-						{
-							Kind:       "IngressClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"List", "Update", "Delete"},
-						},
-						{
-							Kind:       "Nodes",
-							Operations: []capsulev1beta1.ProxyOperation{"Update", "Delete"},
-						},
-						{
-							Kind:       "StorageClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"Update", "Delete"},
-						},
-					},
-				},
-				{
-					Kind: "User",
-					Name: "bob",
-					ProxyOperations: []capsulev1beta1.ProxySettings{
-						{
-							Kind:       "IngressClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"Update"},
-						},
-						{
-							Kind:       "StorageClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"List"},
-						},
-					},
-				},
-				{
-					Kind: "User",
-					Name: "jack",
-					ProxyOperations: []capsulev1beta1.ProxySettings{
-						{
-							Kind:       "IngressClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"Delete"},
-						},
-						{
-							Kind:       "Nodes",
-							Operations: []capsulev1beta1.ProxyOperation{"Delete"},
-						},
-						{
-							Kind:       "StorageClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"List"},
-						},
-						{
-							Kind:       "PriorityClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"List"},
-						},
-					},
-				},
-				{
-					Kind: "Group",
-					Name: "owner-foo",
-					ProxyOperations: []capsulev1beta1.ProxySettings{
-						{
-							Kind:       "IngressClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"List"},
-						},
-					},
-				},
-				{
-					Kind: "Group",
-					Name: "owner-bar",
-					ProxyOperations: []capsulev1beta1.ProxySettings{
-						{
-							Kind:       "IngressClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"List"},
-						},
-						{
-							Kind:       "StorageClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"Delete"},
-						},
-					},
-				},
-				{
-					Kind: "ServiceAccount",
-					Name: "system:serviceaccount:oil-production:default",
-					ProxyOperations: []capsulev1beta1.ProxySettings{
-						{
-							Kind:       "Nodes",
-							Operations: []capsulev1beta1.ProxyOperation{"Update"},
-						},
-					},
-				},
-				{
-					Kind: "ServiceAccount",
-					Name: "system:serviceaccount:gas-production:gas",
-					ProxyOperations: []capsulev1beta1.ProxySettings{
-						{
-							Kind:       "StorageClasses",
-							Operations: []capsulev1beta1.ProxyOperation{"Update"},
-						},
-					},
-				},
-			},
-			NamespaceOptions: v1beta1NamespaceOptions,
-			ServiceOptions:   v1beta1ServiceOptions,
-			StorageClasses:   &v1beta2AllowedListSpec.AllowedListSpec,
-			IngressOptions: capsulev1beta1.IngressOptions{
-				HostnameCollisionScope: api.HostnameCollisionScopeDisabled,
-				AllowedClasses:         &v1beta2AllowedListSpec.AllowedListSpec,
-				AllowedHostnames:       &v1beta2AllowedListSpec.AllowedListSpec,
-			},
-			ContainerRegistries: &v1beta2AllowedListSpec.AllowedListSpec,
-			NodeSelector:        nodeSelector,
-			NetworkPolicies: api.NetworkPolicySpec{
-				Items: networkPolicies,
-			},
-			LimitRanges: api.LimitRangesSpec{
-				Items: limitRanges,
-			},
-			ResourceQuota: api.ResourceQuotaSpec{
-				Scope: api.ResourceQuotaScopeNamespace,
-				Items: resourceQuotas,
-			},
-			AdditionalRoleBindings: []api.AdditionalRoleBindingsSpec{
-				{
-					ClusterRoleName: "crds-rolebinding",
-					Subjects: []rbacv1.Subject{
-						{
-							Kind:     "Group",
-							APIGroup: rbacv1.GroupName,
-							Name:     "system:authenticated",
-						},
-					},
-				},
-			},
-			ImagePullPolicies: []api.ImagePullPolicySpec{"Always", "IfNotPresent"},
-			PriorityClasses: &api.AllowedListSpec{
-				Exact: []string{"default"},
-				Regex: "^tier-.*$",
-			},
-		},
-		Status: capsulev1beta1.TenantStatus{
-			Size:       1,
-			Namespaces: []string{"foo", "bar"},
-		},
-	}
-
-	v1alpha1Tnt := Tenant{
-		TypeMeta: metav1.TypeMeta{},
-		ObjectMeta: metav1.ObjectMeta{
-			Name: "alice",
-			Labels: map[string]string{
-				"foo": "bar",
-			},
-			Annotations: map[string]string{
-				"foo":                                "bar",
-				podAllowedImagePullPolicyAnnotation:  "Always,IfNotPresent",
-				enableExternalNameAnnotation:         "false",
-				enableNodePortsAnnotation:            "false",
-				enableLoadBalancerAnnotation:         "false",
-				podPriorityAllowedAnnotation:         "default",
-				podPriorityAllowedRegexAnnotation:    "^tier-.*$",
-				ownerGroupsAnnotation:                "owner-foo,owner-bar",
-				ownerUsersAnnotation:                 "bob,jack",
-				ownerServiceAccountAnnotation:        "system:serviceaccount:oil-production:default,system:serviceaccount:gas-production:gas",
-				enableNodeUpdateAnnotation:           "alice,system:serviceaccount:oil-production:default",
-				enableNodeDeletionAnnotation:         "alice,jack",
-				enableStorageClassListingAnnotation:  "bob,jack",
-				enableStorageClassUpdateAnnotation:   "alice,system:serviceaccount:gas-production:gas",
-				enableStorageClassDeletionAnnotation: "alice,owner-bar",
-				enableIngressClassListingAnnotation:  "alice,owner-foo,owner-bar",
-				enableIngressClassUpdateAnnotation:   "alice,bob",
-				enableIngressClassDeletionAnnotation: "alice,jack",
-				enablePriorityClassListingAnnotation: "jack",
-				resourceQuotaScopeAnnotation:         "Namespace",
-				ingressHostnameCollisionScope:        "Disabled",
-			},
-		},
-		Spec: TenantSpec{
-			Owner: OwnerSpec{
-				Name: "alice",
-				Kind: "User",
-			},
-			NamespaceQuota:      &namespaceQuota,
-			NamespacesMetadata:  v1alpha1AdditionalMetadataSpec,
-			ServicesMetadata:    v1alpha1AdditionalMetadataSpec,
-			StorageClasses:      v1alpha1AllowedListSpec,
-			IngressClasses:      v1alpha1AllowedListSpec,
-			IngressHostnames:    v1alpha1AllowedListSpec,
-			ContainerRegistries: v1alpha1AllowedListSpec,
-			NodeSelector:        nodeSelector,
-			NetworkPolicies:     networkPolicies,
-			LimitRanges:         limitRanges,
-			ResourceQuota:       resourceQuotas,
-			AdditionalRoleBindings: []api.AdditionalRoleBindingsSpec{
-				{
-					ClusterRoleName: "crds-rolebinding",
-					Subjects: []rbacv1.Subject{
-						{
-							Kind:     "Group",
-							APIGroup: rbacv1.GroupName,
-							Name:     "system:authenticated",
-						},
-					},
-				},
-			},
-			ExternalServiceIPs: &api.ExternalServiceIPsSpec{
-				Allowed: []api.AllowedIP{"192.168.0.1"},
-			},
-		},
-		Status: TenantStatus{
-			Size:       1,
-			Namespaces: []string{"foo", "bar"},
-		},
-	}
-
-	return v1alpha1Tnt, v1beta1Tnt
-}
-
-func TestConversionHub_ConvertTo(t *testing.T) {
-	v1beta1ConvertedTnt := capsulev1beta1.Tenant{}
-
-	v1alpha1Tnt, v1beta1tnt := generateTenantsSpecs()
-	err := v1alpha1Tnt.ConvertTo(&v1beta1ConvertedTnt)
-
-	if assert.NoError(t, err) {
-		sort.Slice(v1beta1tnt.Spec.Owners, func(i, j int) bool {
-			return v1beta1tnt.Spec.Owners[i].Name < v1beta1tnt.Spec.Owners[j].Name
-		})
-		sort.Slice(v1beta1ConvertedTnt.Spec.Owners, func(i, j int) bool {
-			return v1beta1ConvertedTnt.Spec.Owners[i].Name < v1beta1ConvertedTnt.Spec.Owners[j].Name
-		})
-
-		for _, owner := range v1beta1tnt.Spec.Owners {
-			sort.Slice(owner.ProxyOperations, func(i, j int) bool {
-				return owner.ProxyOperations[i].Kind < owner.ProxyOperations[j].Kind
-			})
-		}
-
-		for _, owner := range v1beta1ConvertedTnt.Spec.Owners {
-			sort.Slice(owner.ProxyOperations, func(i, j int) bool {
-				return owner.ProxyOperations[i].Kind < owner.ProxyOperations[j].Kind
-			})
-		}
-
-		assert.Equal(t, v1beta1tnt, v1beta1ConvertedTnt)
-	}
-}
-
-func TestConversionHub_ConvertFrom(t *testing.T) {
-	v1alpha1ConvertedTnt := Tenant{}
-
-	v1alpha1Tnt, v1beta1tnt := generateTenantsSpecs()
-
-	err := v1alpha1ConvertedTnt.ConvertFrom(&v1beta1tnt)
-	if assert.NoError(t, err) {
-		assert.EqualValues(t, v1alpha1Tnt, v1alpha1ConvertedTnt)
-	}
-}

api/v1alpha1/groupversion_info.go

@@ -1,23 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Package v1alpha1 contains API Schema definitions for the capsule.clastix.io v1alpha1 API group
-// +kubebuilder:object:generate=true
-// +groupName=capsule.clastix.io
-package v1alpha1
-
-import (
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
-)
-
-var (
-	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "capsule.clastix.io", Version: "v1alpha1"}
-
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
-
-	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
-)

api/v1alpha1/owner.go

@@ -1,17 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-// OwnerSpec defines tenant owner name and kind.
-type OwnerSpec struct {
-	Name string `json:"name"`
-	Kind Kind   `json:"kind"`
-}
-
-// +kubebuilder:validation:Enum=User;Group
-type Kind string
-
-func (k Kind) String() string {
-	return string(k)
-}

api/v1alpha1/tenant_func.go

@@ -1,34 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-import (
-	"sort"
-
-	corev1 "k8s.io/api/core/v1"
-)
-
-func (in *Tenant) IsFull() bool {
-	// we don't have limits on assigned Namespaces
-	if in.Spec.NamespaceQuota == nil {
-		return false
-	}
-
-	return len(in.Status.Namespaces) >= int(*in.Spec.NamespaceQuota)
-}
-
-func (in *Tenant) AssignNamespaces(namespaces []corev1.Namespace) {
-	var l []string
-
-	for _, ns := range namespaces {
-		if ns.Status.Phase == corev1.NamespaceActive {
-			l = append(l, ns.GetName())
-		}
-	}
-
-	sort.Strings(l)
-
-	in.Status.Namespaces = l
-	in.Status.Size = uint(len(l))
-}

api/v1alpha1/tenant_types.go

@@ -1,71 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-import (
-	corev1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
-	"github.com/projectcapsule/capsule/pkg/api"
-)
-
-// TenantSpec defines the desired state of Tenant.
-type TenantSpec struct {
-	Owner OwnerSpec `json:"owner"`
-
-	// +kubebuilder:validation:Minimum=1
-	NamespaceQuota         *int32                           `json:"namespaceQuota,omitempty"`
-	NamespacesMetadata     *AdditionalMetadata              `json:"namespacesMetadata,omitempty"`
-	ServicesMetadata       *AdditionalMetadata              `json:"servicesMetadata,omitempty"`
-	StorageClasses         *api.AllowedListSpec             `json:"storageClasses,omitempty"`
-	IngressClasses         *api.AllowedListSpec             `json:"ingressClasses,omitempty"`
-	IngressHostnames       *api.AllowedListSpec             `json:"ingressHostnames,omitempty"`
-	ContainerRegistries    *api.AllowedListSpec             `json:"containerRegistries,omitempty"`
-	NodeSelector           map[string]string                `json:"nodeSelector,omitempty"`
-	NetworkPolicies        []networkingv1.NetworkPolicySpec `json:"networkPolicies,omitempty"`
-	LimitRanges            []corev1.LimitRangeSpec          `json:"limitRanges,omitempty"`
-	ResourceQuota          []corev1.ResourceQuotaSpec       `json:"resourceQuotas,omitempty"`
-	AdditionalRoleBindings []api.AdditionalRoleBindingsSpec `json:"additionalRoleBindings,omitempty"`
-	ExternalServiceIPs     *api.ExternalServiceIPsSpec      `json:"externalServiceIPs,omitempty"`
-}
-
-// TenantStatus defines the observed state of Tenant.
-type TenantStatus struct {
-	Size       uint     `json:"size"`
-	Namespaces []string `json:"namespaces,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-// +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Cluster,shortName=tnt
-// +kubebuilder:printcolumn:name="Namespace quota",type="integer",JSONPath=".spec.namespaceQuota",description="The max amount of Namespaces can be created"
-// +kubebuilder:printcolumn:name="Namespace count",type="integer",JSONPath=".status.size",description="The total amount of Namespaces in use"
-// +kubebuilder:printcolumn:name="Owner name",type="string",JSONPath=".spec.owner.name",description="The assigned Tenant owner"
-// +kubebuilder:printcolumn:name="Owner kind",type="string",JSONPath=".spec.owner.kind",description="The assigned Tenant owner kind"
-// +kubebuilder:printcolumn:name="Node selector",type="string",JSONPath=".spec.nodeSelector",description="Node Selector applied to Pods"
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age"
-// +kubebuilder:deprecatedversion:warning="This version is going to be dropped in the upcoming version of Capsule; please, migrate to v1beta2 version."
-
-// Tenant is the Schema for the tenants API.
-type Tenant struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-
-	Spec   TenantSpec   `json:"spec,omitempty"`
-	Status TenantStatus `json:"status,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-
-// TenantList contains a list of Tenant.
-type TenantList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Tenant `json:"items"`
-}
-
-func init() {
-	SchemeBuilder.Register(&Tenant{}, &TenantList{})
-}

api/v1alpha1/tenant_webhook.go

@@ -1,21 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1alpha1
-
-import (
-	"os"
-
-	ctrl "sigs.k8s.io/controller-runtime"
-)
-
-func (in *Tenant) SetupWebhookWithManager(mgr ctrl.Manager) error {
-	certData, _ := os.ReadFile("/tmp/k8s-webhook-server/serving-certs/tls.crt")
-	if len(certData) == 0 {
-		return nil
-	}
-
-	return ctrl.NewWebhookManagedBy(mgr).
-		For(in).
-		Complete()
-}

api/v1alpha1/zz_generated.deepcopy.go

@@ -1,308 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-// Code generated by controller-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
-	"github.com/projectcapsule/capsule/pkg/api"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/api/networking/v1"
-	runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AdditionalMetadata) DeepCopyInto(out *AdditionalMetadata) {
-	*out = *in
-	if in.Labels != nil {
-		in, out := &in.Labels, &out.Labels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.Annotations != nil {
-		in, out := &in.Annotations, &out.Annotations
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AdditionalMetadata.
-func (in *AdditionalMetadata) DeepCopy() *AdditionalMetadata {
-	if in == nil {
-		return nil
-	}
-	out := new(AdditionalMetadata)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CapsuleConfiguration) DeepCopyInto(out *CapsuleConfiguration) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CapsuleConfiguration.
-func (in *CapsuleConfiguration) DeepCopy() *CapsuleConfiguration {
-	if in == nil {
-		return nil
-	}
-	out := new(CapsuleConfiguration)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *CapsuleConfiguration) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CapsuleConfigurationList) DeepCopyInto(out *CapsuleConfigurationList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]CapsuleConfiguration, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CapsuleConfigurationList.
-func (in *CapsuleConfigurationList) DeepCopy() *CapsuleConfigurationList {
-	if in == nil {
-		return nil
-	}
-	out := new(CapsuleConfigurationList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *CapsuleConfigurationList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *CapsuleConfigurationSpec) DeepCopyInto(out *CapsuleConfigurationSpec) {
-	*out = *in
-	if in.UserGroups != nil {
-		in, out := &in.UserGroups, &out.UserGroups
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CapsuleConfigurationSpec.
-func (in *CapsuleConfigurationSpec) DeepCopy() *CapsuleConfigurationSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(CapsuleConfigurationSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *OwnerSpec) DeepCopyInto(out *OwnerSpec) {
-	*out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OwnerSpec.
-func (in *OwnerSpec) DeepCopy() *OwnerSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(OwnerSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Tenant) DeepCopyInto(out *Tenant) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
-	in.Spec.DeepCopyInto(&out.Spec)
-	in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Tenant.
-func (in *Tenant) DeepCopy() *Tenant {
-	if in == nil {
-		return nil
-	}
-	out := new(Tenant)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Tenant) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TenantList) DeepCopyInto(out *TenantList) {
-	*out = *in
-	out.TypeMeta = in.TypeMeta
-	in.ListMeta.DeepCopyInto(&out.ListMeta)
-	if in.Items != nil {
-		in, out := &in.Items, &out.Items
-		*out = make([]Tenant, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantList.
-func (in *TenantList) DeepCopy() *TenantList {
-	if in == nil {
-		return nil
-	}
-	out := new(TenantList)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *TenantList) DeepCopyObject() runtime.Object {
-	if c := in.DeepCopy(); c != nil {
-		return c
-	}
-	return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TenantSpec) DeepCopyInto(out *TenantSpec) {
-	*out = *in
-	out.Owner = in.Owner
-	if in.NamespaceQuota != nil {
-		in, out := &in.NamespaceQuota, &out.NamespaceQuota
-		*out = new(int32)
-		**out = **in
-	}
-	if in.NamespacesMetadata != nil {
-		in, out := &in.NamespacesMetadata, &out.NamespacesMetadata
-		*out = new(AdditionalMetadata)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.ServicesMetadata != nil {
-		in, out := &in.ServicesMetadata, &out.ServicesMetadata
-		*out = new(AdditionalMetadata)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.StorageClasses != nil {
-		in, out := &in.StorageClasses, &out.StorageClasses
-		*out = new(api.AllowedListSpec)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.IngressClasses != nil {
-		in, out := &in.IngressClasses, &out.IngressClasses
-		*out = new(api.AllowedListSpec)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.IngressHostnames != nil {
-		in, out := &in.IngressHostnames, &out.IngressHostnames
-		*out = new(api.AllowedListSpec)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.ContainerRegistries != nil {
-		in, out := &in.ContainerRegistries, &out.ContainerRegistries
-		*out = new(api.AllowedListSpec)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.NodeSelector != nil {
-		in, out := &in.NodeSelector, &out.NodeSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	}
-	if in.NetworkPolicies != nil {
-		in, out := &in.NetworkPolicies, &out.NetworkPolicies
-		*out = make([]v1.NetworkPolicySpec, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.LimitRanges != nil {
-		in, out := &in.LimitRanges, &out.LimitRanges
-		*out = make([]corev1.LimitRangeSpec, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ResourceQuota != nil {
-		in, out := &in.ResourceQuota, &out.ResourceQuota
-		*out = make([]corev1.ResourceQuotaSpec, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.AdditionalRoleBindings != nil {
-		in, out := &in.AdditionalRoleBindings, &out.AdditionalRoleBindings
-		*out = make([]api.AdditionalRoleBindingsSpec, len(*in))
-		for i := range *in {
-			(*in)[i].DeepCopyInto(&(*out)[i])
-		}
-	}
-	if in.ExternalServiceIPs != nil {
-		in, out := &in.ExternalServiceIPs, &out.ExternalServiceIPs
-		*out = new(api.ExternalServiceIPsSpec)
-		(*in).DeepCopyInto(*out)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantSpec.
-func (in *TenantSpec) DeepCopy() *TenantSpec {
-	if in == nil {
-		return nil
-	}
-	out := new(TenantSpec)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TenantStatus) DeepCopyInto(out *TenantStatus) {
-	*out = *in
-	if in.Namespaces != nil {
-		in, out := &in.Namespaces, &out.Namespaces
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TenantStatus.
-func (in *TenantStatus) DeepCopy() *TenantStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(TenantStatus)
-	in.DeepCopyInto(out)
-	return out
-}

api/v1beta2/capsuleconfiguration_convertion_hub.go

@@ -1,142 +0,0 @@
-// Copyright 2020-2023 Project Capsule Authors.
-// SPDX-License-Identifier: Apache-2.0
-
-package v1beta2
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"sigs.k8s.io/controller-runtime/pkg/conversion"
-
-	capsulev1alpha1 "github.com/projectcapsule/capsule/api/v1alpha1"
-)
-
-func (in *CapsuleConfiguration) ConvertTo(raw conversion.Hub) error {
-	dst, ok := raw.(*capsulev1alpha1.CapsuleConfiguration)
-	if !ok {
-		return fmt.Errorf("expected type *capsulev1alpha1.CapsuleConfiguration, got %T", dst)
-	}
-
-	dst.ObjectMeta = in.ObjectMeta
-	dst.Spec.ProtectedNamespaceRegexpString = in.Spec.ProtectedNamespaceRegexpString
-	dst.Spec.UserGroups = in.Spec.UserGroups
-	dst.Spec.ProtectedNamespaceRegexpString = in.Spec.ProtectedNamespaceRegexpString
-
-	annotations := dst.GetAnnotations()
-	if annotations == nil {
-		annotations = make(map[string]string)
-	}
-
-	if in.Spec.NodeMetadata != nil {
-		if len(in.Spec.NodeMetadata.ForbiddenLabels.Exact) > 0 {
-			annotations[capsulev1alpha1.ForbiddenNodeLabelsAnnotation] = strings.Join(in.Spec.NodeMetadata.ForbiddenLabels.Exact, ",")
-		}
-
-		if len(in.Spec.NodeMetadata.ForbiddenLabels.Regex) > 0 {
-			annotations[capsulev1alpha1.ForbiddenNodeLabelsRegexpAnnotation] = in.Spec.NodeMetadata.ForbiddenLabels.Regex
-		}
-
-		if len(in.Spec.NodeMetadata.ForbiddenAnnotations.Exact) > 0 {
-			annotations[capsulev1alpha1.ForbiddenNodeAnnotationsAnnotation] = strings.Join(in.Spec.NodeMetadata.ForbiddenAnnotations.Exact, ",")
-		}
-
-		if len(in.Spec.NodeMetadata.ForbiddenAnnotations.Regex) > 0 {
-			annotations[capsulev1alpha1.ForbiddenNodeAnnotationsRegexpAnnotation] = in.Spec.NodeMetadata.ForbiddenAnnotations.Regex
-		}
-	}
-
-	annotations[capsulev1alpha1.EnableTLSConfigurationAnnotationName] = fmt.Sprintf("%t", in.Spec.EnableTLSReconciler)
-	annotations[capsulev1alpha1.TLSSecretNameAnnotation] = in.Spec.CapsuleResources.TLSSecretName
-	annotations[capsulev1alpha1.MutatingWebhookConfigurationName] = in.Spec.CapsuleResources.MutatingWebhookConfigurationName
-	annotations[capsulev1alpha1.ValidatingWebhookConfigurationName] = in.Spec.CapsuleResources.ValidatingWebhookConfigurationName
-
-	dst.SetAnnotations(annotations)
-
-	return nil
-}
-
-func (in *CapsuleConfiguration) ConvertFrom(raw conversion.Hub) error {
-	src, ok := raw.(*capsulev1alpha1.CapsuleConfiguration)
-	if !ok {
-		return fmt.Errorf("expected type *capsulev1alpha1.CapsuleConfiguration, got %T", src)
-	}
-
-	in.ObjectMeta = src.ObjectMeta
-	in.Spec.ProtectedNamespaceRegexpString = src.Spec.ProtectedNamespaceRegexpString
-	in.Spec.UserGroups = src.Spec.UserGroups
-	in.Spec.ProtectedNamespaceRegexpString = src.Spec.ProtectedNamespaceRegexpString
-
-	annotations := src.GetAnnotations()
-
-	if value, found := annotations[capsulev1alpha1.ForbiddenNodeLabelsAnnotation]; found {
-		if in.Spec.NodeMetadata == nil {
-			in.Spec.NodeMetadata = &NodeMetadata{}
-		}
-
-		in.Spec.NodeMetadata.ForbiddenLabels.Exact = strings.Split(value, ",")
-
-		delete(annotations, capsulev1alpha1.ForbiddenNodeLabelsAnnotation)
-	}
-
-	if value, found := annotations[capsulev1alpha1.ForbiddenNodeLabelsRegexpAnnotation]; found {
-		if in.Spec.NodeMetadata == nil {
-			in.Spec.NodeMetadata = &NodeMetadata{}
-		}
-
-		in.Spec.NodeMetadata.ForbiddenLabels.Regex = value
-
-		delete(annotations, capsulev1alpha1.ForbiddenNodeLabelsRegexpAnnotation)
-	}
-
-	if value, found := annotations[capsulev1alpha1.ForbiddenNodeAnnotationsAnnotation]; found {
-		if in.Spec.NodeMetadata == nil {
-			in.Spec.NodeMetadata = &NodeMetadata{}
-		}
-
-		in.Spec.NodeMetadata.ForbiddenAnnotations.Exact = strings.Split(value, ",")
-
-		delete(annotations, capsulev1alpha1.ForbiddenNodeAnnotationsAnnotation)
-	}
-
-	if value, found := annotations[capsulev1alpha1.ForbiddenNodeAnnotationsRegexpAnnotation]; found {
-		if in.Spec.NodeMetadata == nil {
-			in.Spec.NodeMetadata = &NodeMetadata{}
-		}
-
-		in.Spec.NodeMetadata.ForbiddenAnnotations.Regex = value
-
-		delete(annotations, capsulev1alpha1.ForbiddenNodeAnnotationsRegexpAnnotation)
-	}
-
-	if value, found := annotations[capsulev1alpha1.EnableTLSConfigurationAnnotationName]; found {
-		v, _ := strconv.ParseBool(value)
-
-		in.Spec.EnableTLSReconciler = v
-
-		delete(annotations, capsulev1alpha1.EnableTLSConfigurationAnnotationName)
-	}
-
-	if value, found := annotations[capsulev1alpha1.TLSSecretNameAnnotation]; found {
-		in.Spec.CapsuleResources.TLSSecretName = value
-
-		delete(annotations, capsulev1alpha1.TLSSecretNameAnnotation)
-	}
-
-	if value, found := annotations[capsulev1alpha1.MutatingWebhookConfigurationName]; found {
-		in.Spec.CapsuleResources.MutatingWebhookConfigurationName = value
-
-		delete(annotations, capsulev1alpha1.MutatingWebhookConfigurationName)
-	}
-
-	if value, found := annotations[capsulev1alpha1.ValidatingWebhookConfigurationName]; found {
-		in.Spec.CapsuleResources.ValidatingWebhookConfigurationName = value
-
-		delete(annotations, capsulev1alpha1.ValidatingWebhookConfigurationName)
-	}
-
-	in.SetAnnotations(annotations)
-
-	return nil
-}

config/samples/capsule_v1alpha1_capsuleconfiguration.yaml

@@ -1,9 +0,0 @@
----
-apiVersion: capsule.clastix.io/v1alpha1
-kind: CapsuleConfiguration
-metadata:
-  name: default
-spec:
-  userGroups: ["capsule.clastix.io"]
-  forceTenantPrefix: false
-  protectedNamespaceRegex: ""

config/samples/capsule_v1alpha1_tenant.yaml

@@ -1,101 +0,0 @@
----
-apiVersion: capsule.clastix.io/v1alpha1
-kind: Tenant
-metadata:
-  name: oil
-spec:
-  ingressHostnames:
-    allowed:
-      - my.oil.acmecorp.com
-      - my.gas.acmecorp.com
-    allowedRegex: "^.*acmecorp.com$"
-  ingressClasses:
-    allowed:
-      - default
-    allowedRegex: ""
-  limitRanges:
-    -
-      limits:
-        -
-          max:
-            cpu: "1"
-            memory: 1Gi
-          min:
-            cpu: 50m
-            memory: 5Mi
-          type: Pod
-        -
-          default:
-            cpu: 200m
-            memory: 100Mi
-          defaultRequest:
-            cpu: 100m
-            memory: 10Mi
-          max:
-            cpu: "1"
-            memory: 1Gi
-          min:
-            cpu: 50m
-            memory: 5Mi
-          type: Container
-        -
-          max:
-            storage: 10Gi
-          min:
-            storage: 1Gi
-          type: PersistentVolumeClaim
-  namespaceQuota: 3
-  networkPolicies:
-    -
-      egress:
-        -
-          to:
-            -
-              ipBlock:
-                cidr: 0.0.0.0/0
-                except:
-                  - 192.168.0.0/12
-      ingress:
-        -
-          from:
-            -
-              namespaceSelector:
-                matchLabels:
-                  capsule.clastix.io/tenant: oil
-            -
-              podSelector: {}
-            -
-              ipBlock:
-                cidr: 192.168.0.0/12
-      podSelector: {}
-      policyTypes:
-        - Ingress
-        - Egress
-  nodeSelector:
-    kubernetes.io/os: linux
-  owner:
-    kind: User
-    name: alice
-  resourceQuotas:
-    -
-      hard:
-        limits.cpu: "8"
-        limits.memory: 16Gi
-        requests.cpu: "8"
-        requests.memory: 16Gi
-      scopes:
-        - NotTerminating
-    -
-      hard:
-        pods: "10"
-    -
-      hard:
-        requests.storage: 100Gi
-  storageClasses:
-    allowed:
-      - default
-    allowedRegex: ""
-  containerRegistries:
-    allowed:
-      - docker.io
-    allowedRegex: ""

main.go

@@ -27,7 +27,6 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	capsulev1alpha1 "github.com/projectcapsule/capsule/api/v1alpha1"
 	capsulev1beta1 "github.com/projectcapsule/capsule/api/v1beta1"
 	capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
 	configcontroller "github.com/projectcapsule/capsule/controllers/config"
@@ -64,7 +63,6 @@ var (
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
-	utilruntime.Must(capsulev1alpha1.AddToScheme(scheme))
 	utilruntime.Must(capsulev1beta1.AddToScheme(scheme))
 	utilruntime.Must(capsulev1beta2.AddToScheme(scheme))
 	utilruntime.Must(apiextensionsv1.AddToScheme(scheme))
@@ -78,7 +76,7 @@ func printVersion() {
 	setupLog.Info(fmt.Sprintf("Go OS/Arch: %s/%s", goRuntime.GOOS, goRuntime.GOARCH))
 }
 
-//nolint:maintidx,cyclop
+//nolint:maintidx
 func main() {
 	var enableLeaderElection, version bool
 
@@ -200,16 +198,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&capsulev1alpha1.Tenant{}).SetupWebhookWithManager(manager); err != nil {
-		setupLog.Error(err, "unable to create conversion webhook", "webhook", "capsulev1alpha1.Tenant")
-		os.Exit(1)
-	}
-
-	if err = (&capsulev1alpha1.CapsuleConfiguration{}).SetupWebhookWithManager(manager); err != nil {
-		setupLog.Error(err, "unable to create conversion webhook", "webhook", "capsulev1alpha1.CapsuleConfiguration")
-		os.Exit(1)
-	}
-
 	if err = (&capsulev1beta1.Tenant{}).SetupWebhookWithManager(manager); err != nil {
 		setupLog.Error(err, "unable to create conversion webhook", "webhook", "capsulev1beta1.Tenant")
 		os.Exit(1)

pkg/utils/tenant_labels.go

@@ -11,14 +11,13 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/projectcapsule/capsule/api/v1alpha1"
 	"github.com/projectcapsule/capsule/api/v1beta1"
 	"github.com/projectcapsule/capsule/api/v1beta2"
 )
 
 func GetTypeLabel(t runtime.Object) (label string, err error) {
 	switch v := t.(type) {
-	case *v1alpha1.Tenant, *v1beta1.Tenant, *v1beta2.Tenant:
+	case *v1beta1.Tenant, *v1beta2.Tenant:
 		return "capsule.clastix.io/tenant", nil
 	case *corev1.LimitRange:
 		return "capsule.clastix.io/limit-range", nil