diff --git a/api/v1alpha1/conversion_hub.go b/api/v1alpha1/conversion_hub.go index 611514ee..2342106e 100644 --- a/api/v1alpha1/conversion_hub.go +++ b/api/v1alpha1/conversion_hub.go @@ -134,13 +134,22 @@ func (t *Tenant) ConvertTo(dstRaw conversion.Hub) error { dst.ObjectMeta = t.ObjectMeta // Spec - dst.Spec.NamespaceQuota = t.Spec.NamespaceQuota + if t.Spec.NamespaceQuota != nil { + if dst.Spec.NamespaceOptions == nil { + dst.Spec.NamespaceOptions = &capsulev1beta1.NamespaceOptions{} + } + dst.Spec.NamespaceOptions.Quota = t.Spec.NamespaceQuota + } + dst.Spec.NodeSelector = t.Spec.NodeSelector dst.Spec.Owners = t.convertV1Alpha1OwnerToV1Beta1() if t.Spec.NamespacesMetadata != nil { - dst.Spec.NamespacesMetadata = &capsulev1beta1.AdditionalMetadataSpec{ + if dst.Spec.NamespaceOptions == nil { + dst.Spec.NamespaceOptions = &capsulev1beta1.NamespaceOptions{} + } + dst.Spec.NamespaceOptions.AdditionalMetadata = &capsulev1beta1.AdditionalMetadataSpec{ AdditionalLabels: t.Spec.NamespacesMetadata.AdditionalLabels, AdditionalAnnotations: t.Spec.NamespacesMetadata.AdditionalAnnotations, } @@ -414,7 +423,10 @@ func (t *Tenant) ConvertFrom(srcRaw conversion.Hub) error { t.ObjectMeta = src.ObjectMeta // Spec - t.Spec.NamespaceQuota = src.Spec.NamespaceQuota + if src.Spec.NamespaceOptions != nil && src.Spec.NamespaceOptions.Quota != nil { + t.Spec.NamespaceQuota = src.Spec.NamespaceOptions.Quota + } + t.Spec.NodeSelector = src.Spec.NodeSelector if t.Annotations == nil { @@ -423,10 +435,10 @@ func (t *Tenant) ConvertFrom(srcRaw conversion.Hub) error { t.convertV1Beta1OwnerToV1Alpha1(src) - if src.Spec.NamespacesMetadata != nil { + if src.Spec.NamespaceOptions != nil && src.Spec.NamespaceOptions.AdditionalMetadata != nil { t.Spec.NamespacesMetadata = &AdditionalMetadataSpec{ - AdditionalLabels: src.Spec.NamespacesMetadata.AdditionalLabels, - AdditionalAnnotations: src.Spec.NamespacesMetadata.AdditionalAnnotations, + AdditionalLabels: src.Spec.NamespaceOptions.AdditionalMetadata.AdditionalLabels, + AdditionalAnnotations: src.Spec.NamespaceOptions.AdditionalMetadata.AdditionalAnnotations, } } if src.Spec.ServiceOptions != nil && src.Spec.ServiceOptions.AdditionalMetadata != nil { diff --git a/api/v1alpha1/conversion_hub_test.go b/api/v1alpha1/conversion_hub_test.go index 76d26b24..c7efdae0 100644 --- a/api/v1alpha1/conversion_hub_test.go +++ b/api/v1alpha1/conversion_hub_test.go @@ -43,6 +43,10 @@ func generateTenantsSpecs() (Tenant, capsulev1beta1.Tenant) { "foo": "bar", }, } + var v1beta1NamespaceOptions = &capsulev1beta1.NamespaceOptions{ + Quota: &namespaceQuota, + AdditionalMetadata: v1beta1AdditionalMetadataSpec, + } var v1beta1ServiceOptions = &capsulev1beta1.ServiceOptions{ AdditionalMetadata: v1beta1AdditionalMetadataSpec, AllowedServices: &capsulev1beta1.AllowedServices{ @@ -225,8 +229,7 @@ func generateTenantsSpecs() (Tenant, capsulev1beta1.Tenant) { }, }, }, - NamespaceQuota: &namespaceQuota, - NamespacesMetadata: v1beta1AdditionalMetadataSpec, + NamespaceOptions: v1beta1NamespaceOptions, ServiceOptions: v1beta1ServiceOptions, StorageClasses: v1beta1AllowedListSpec, IngressClasses: v1beta1AllowedListSpec, diff --git a/api/v1beta1/namespace_options.go b/api/v1beta1/namespace_options.go new file mode 100644 index 00000000..58b34201 --- /dev/null +++ b/api/v1beta1/namespace_options.go @@ -0,0 +1,9 @@ +package v1beta1 + +type NamespaceOptions struct { + //+kubebuilder:validation:Minimum=1 + // Specifies the maximum number of namespaces allowed for that Tenant. Once the namespace quota assigned to the Tenant has been reached, the Tenant owner cannot create further namespaces. Optional. + Quota *int32 `json:"quota,omitempty"` + // Specifies additional labels and annotations the Capsule operator places on any Namespace resource in the Tenant. Optional. + AdditionalMetadata *AdditionalMetadataSpec `json:"additionalMetadata,omitempty"` +} diff --git a/api/v1beta1/tenant_func.go b/api/v1beta1/tenant_func.go index 77385262..f3bc16b7 100644 --- a/api/v1beta1/tenant_func.go +++ b/api/v1beta1/tenant_func.go @@ -18,10 +18,10 @@ func (t *Tenant) IsCordoned() bool { func (t *Tenant) IsFull() bool { // we don't have limits on assigned Namespaces - if t.Spec.NamespaceQuota == nil { + if t.Spec.NamespaceOptions == nil || t.Spec.NamespaceOptions.Quota == nil { return false } - return len(t.Status.Namespaces) >= int(*t.Spec.NamespaceQuota) + return len(t.Status.Namespaces) >= int(*t.Spec.NamespaceOptions.Quota) } func (t *Tenant) AssignNamespaces(namespaces []corev1.Namespace) { diff --git a/api/v1beta1/tenant_types.go b/api/v1beta1/tenant_types.go index 09f9752a..a0f59ba1 100644 --- a/api/v1beta1/tenant_types.go +++ b/api/v1beta1/tenant_types.go @@ -11,12 +11,8 @@ import ( type TenantSpec struct { // Specifies the owners of the Tenant. Mandatory. Owners OwnerListSpec `json:"owners"` - - //+kubebuilder:validation:Minimum=1 - // Specifies the maximum number of namespaces allowed for that Tenant. Once the namespace quota assigned to the Tenant has been reached, the Tenant owner cannot create further namespaces. Optional. - NamespaceQuota *int32 `json:"namespaceQuota,omitempty"` - // Specifies additional labels and annotations the Capsule operator places on any Namespace resource in the Tenant. Optional. - NamespacesMetadata *AdditionalMetadataSpec `json:"namespacesMetadata,omitempty"` + // Specifies options for the Namespaces, such as additional metadata or maximum number of namespaces allowed for that Tenant. Once the namespace quota assigned to the Tenant has been reached, the Tenant owner cannot create further namespaces. Optional. + NamespaceOptions *NamespaceOptions `json:"namespaceOptions,omitempty"` // Specifies options for the Service, such as additional metadata or block of certain type of Services. Optional. ServiceOptions *ServiceOptions `json:"serviceOptions,omitempty"` // Specifies the allowed StorageClasses assigned to the Tenant. Capsule assures that all PersistentVolumeClaim resources created in the Tenant can use only one of the allowed StorageClasses. Optional. @@ -48,7 +44,7 @@ type TenantSpec struct { //+kubebuilder:storageversion // +kubebuilder:resource:scope=Cluster,shortName=tnt // +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.state",description="The actual state of the Tenant" -// +kubebuilder:printcolumn:name="Namespace quota",type="integer",JSONPath=".spec.namespaceQuota",description="The max amount of Namespaces can be created" +// +kubebuilder:printcolumn:name="Namespace quota",type="integer",JSONPath=".spec.namespaceOptions.quota",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="Node selector",type="string",JSONPath=".spec.nodeSelector",description="Node Selector applied to Pods" // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Age" diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index 62f9fcf0..e66249f7 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -171,6 +171,31 @@ func (in *LimitRangesSpec) DeepCopy() *LimitRangesSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *NamespaceOptions) DeepCopyInto(out *NamespaceOptions) { + *out = *in + if in.Quota != nil { + in, out := &in.Quota, &out.Quota + *out = new(int32) + **out = **in + } + if in.AdditionalMetadata != nil { + in, out := &in.AdditionalMetadata, &out.AdditionalMetadata + *out = new(AdditionalMetadataSpec) + (*in).DeepCopyInto(*out) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamespaceOptions. +func (in *NamespaceOptions) DeepCopy() *NamespaceOptions { + if in == nil { + return nil + } + out := new(NamespaceOptions) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NetworkPolicySpec) DeepCopyInto(out *NetworkPolicySpec) { *out = *in @@ -377,14 +402,9 @@ func (in *TenantSpec) DeepCopyInto(out *TenantSpec) { (*in)[i].DeepCopyInto(&(*out)[i]) } } - 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(AdditionalMetadataSpec) + if in.NamespaceOptions != nil { + in, out := &in.NamespaceOptions, &out.NamespaceOptions + *out = new(NamespaceOptions) (*in).DeepCopyInto(*out) } if in.ServiceOptions != nil { diff --git a/controllers/tenant/namespaces.go b/controllers/tenant/namespaces.go index 738b10c0..0e5cf834 100644 --- a/controllers/tenant/namespaces.go +++ b/controllers/tenant/namespaces.go @@ -50,8 +50,8 @@ func (r *Manager) syncNamespaceMetadata(namespace string, tnt *capsulev1beta1.Te res, conflictErr = controllerutil.CreateOrUpdate(context.TODO(), r.Client, ns, func() error { annotations := make(map[string]string) - if tnt.Spec.NamespacesMetadata != nil { - for k, v := range tnt.Spec.NamespacesMetadata.AdditionalAnnotations { + if tnt.Spec.NamespaceOptions != nil && tnt.Spec.NamespaceOptions.AdditionalMetadata != nil { + for k, v := range tnt.Spec.NamespaceOptions.AdditionalMetadata.AdditionalAnnotations { annotations[k] = v } } @@ -98,8 +98,8 @@ func (r *Manager) syncNamespaceMetadata(namespace string, tnt *capsulev1beta1.Te capsuleLabel: tnt.GetName(), } - if tnt.Spec.NamespacesMetadata != nil { - for k, v := range tnt.Spec.NamespacesMetadata.AdditionalLabels { + if tnt.Spec.NamespaceOptions != nil && tnt.Spec.NamespaceOptions.AdditionalMetadata != nil { + for k, v := range tnt.Spec.NamespaceOptions.AdditionalMetadata.AdditionalLabels { newLabels[k] = v } }