feat(v1alpha2): tenant spec

feat(v1alpha2): remove unused structs and functions from v1alpha1. Rename v1alpha1 structs to follow new naming. Move v1alpha1 structs to separate files
projectcapsule · Jun 30, 2021 · 564efc2 · 564efc2
1 parent c398f73
commit 564efc2
Show file tree

Hide file tree

Showing 30 changed files with 1,125 additions and 391 deletions.
diff --git a/api/v1alpha1/additional_metadata.go b/api/v1alpha1/additional_metadata.go
@@ -0,0 +1,9 @@
+// Copyright 2020-2021 Clastix Labs
+// SPDX-License-Identifier: Apache-2.0
+
+package v1alpha1
+
+type AdditionalMetadataSpec struct {
+	AdditionalLabels      map[string]string `json:"additionalLabels,omitempty"`
+	AdditionalAnnotations map[string]string `json:"additionalAnnotations,omitempty"`
+}
diff --git a/api/v1alpha1/additional_role_bindings.go b/api/v1alpha1/additional_role_bindings.go
@@ -0,0 +1,12 @@
+// Copyright 2020-2021 Clastix Labs
+// SPDX-License-Identifier: Apache-2.0
+
+package v1alpha1
+
+import rbacv1 "k8s.io/api/rbac/v1"
+
+type AdditionalRoleBindingsSpec struct {
+	ClusterRoleName string `json:"clusterRoleName"`
+	// kubebuilder:validation:Minimum=1
+	Subjects []rbacv1.Subject `json:"subjects"`
+}
diff --git a/api/v1alpha1/conversion_hub.go b/api/v1alpha1/conversion_hub.go
@@ -4,8 +4,9 @@
 package v1alpha1
 
 import (
-	"github.com/clastix/capsule/api/v1alpha2"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
+
+	"github.com/clastix/capsule/api/v1alpha2"
 )
 
 func (t *Tenant) ConvertTo(dstRaw conversion.Hub) error {
@@ -23,4 +24,3 @@ func (t *Tenant) ConvertFrom(srcRaw conversion.Hub) error {
 
 	return nil
 }
-
diff --git a/api/v1alpha1/domain/allowed.go b/api/v1alpha1/domain/allowed.go
diff --git a/api/v1alpha1/domain/imagepullpolicy.go b/api/v1alpha1/domain/imagepullpolicy.go
diff --git a/api/v1alpha1/domain/podpriority.go b/api/v1alpha1/domain/podpriority.go
diff --git a/api/v1alpha1/domain/registry.go b/api/v1alpha1/domain/registry.go
diff --git a/api/v1alpha1/domain/registry_test.go b/api/v1alpha1/domain/registry_test.go
diff --git a/api/v1alpha1/external_service_ips.go b/api/v1alpha1/external_service_ips.go
@@ -0,0 +1,11 @@
+// Copyright 2020-2021 Clastix Labs
+// SPDX-License-Identifier: Apache-2.0
+
+package v1alpha1
+
+// +kubebuilder:validation:Pattern="^([0-9]{1,3}.){3}[0-9]{1,3}(/([0-9]|[1-2][0-9]|3[0-2]))?$"
+type AllowedIP string
+
+type ExternalServiceIPsSpec struct {
+	Allowed []AllowedIP `json:"allowed"`
+}
diff --git a/api/v1alpha1/ingress_hostnames_list.go b/api/v1alpha1/ingress_hostnames_list.go
diff --git a/api/v1alpha1/owner.go b/api/v1alpha1/owner.go
@@ -0,0 +1,17 @@
+// Copyright 2020-2021 Clastix Labs
+// 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)
+}