-
Notifications
You must be signed in to change notification settings - Fork 163
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support Groups as Subject Kind for Tenant Namespace RoleBindings crea…
…ted by Capsule (#71) Modified CRD to support Owner struct. Added Tenant name validation webhook. Rewrote owner_reference hook logic. Updated and added new e2e tests. Co-authored-by: Maksim Fedotov <[email protected]>
- Loading branch information
1 parent
10dcfea
commit 303fc4d
Showing
33 changed files
with
750 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| //+build e2e | ||
|
|
||
| /* | ||
| Copyright 2020 Clastix Labs. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package e2e | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
|
|
||
| "github.com/clastix/capsule/api/v1alpha1" | ||
| ) | ||
|
|
||
| var _ = Describe("creating a Namespace with --force-tenant-name flag", func() { | ||
| t1 := &v1alpha1.Tenant{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "first", | ||
| }, | ||
| Spec: v1alpha1.TenantSpec{ | ||
| Owner: v1alpha1.OwnerSpec{ | ||
| Name: "john", | ||
| Kind: "User", | ||
| }, | ||
| NamespacesMetadata: v1alpha1.AdditionalMetadata{}, | ||
| ServicesMetadata: v1alpha1.AdditionalMetadata{}, | ||
| StorageClasses: []string{}, | ||
| IngressClasses: []string{}, | ||
| LimitRanges: []corev1.LimitRangeSpec{}, | ||
| NamespaceQuota: 10, | ||
| NodeSelector: map[string]string{}, | ||
| ResourceQuota: []corev1.ResourceQuotaSpec{}, | ||
| }, | ||
| } | ||
| t2 := &v1alpha1.Tenant{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "second", | ||
| }, | ||
| Spec: v1alpha1.TenantSpec{ | ||
| Owner: v1alpha1.OwnerSpec{ | ||
| Name: "john", | ||
| Kind: "User", | ||
| }, | ||
| NamespacesMetadata: v1alpha1.AdditionalMetadata{}, | ||
| ServicesMetadata: v1alpha1.AdditionalMetadata{}, | ||
| StorageClasses: []string{}, | ||
| IngressClasses: []string{}, | ||
| LimitRanges: []corev1.LimitRangeSpec{}, | ||
| NamespaceQuota: 10, | ||
| NodeSelector: map[string]string{}, | ||
| ResourceQuota: []corev1.ResourceQuotaSpec{}, | ||
| }, | ||
| } | ||
| JustBeforeEach(func() { | ||
| t1.ResourceVersion = "" | ||
| t2.ResourceVersion = "" | ||
| Expect(k8sClient.Create(context.TODO(), t1)).Should(Succeed()) | ||
| Expect(k8sClient.Create(context.TODO(), t2)).Should(Succeed()) | ||
| }) | ||
| JustAfterEach(func() { | ||
| Expect(k8sClient.Delete(context.TODO(), t1)).Should(Succeed()) | ||
| Expect(k8sClient.Delete(context.TODO(), t2)).Should(Succeed()) | ||
| }) | ||
| It("should fail", func() { | ||
| args := append(defaulManagerPodArgs, []string{"--force-tenant-prefix"}...) | ||
| ModifyCapsuleManagerPodArgs(args) | ||
| ns := NewNamespace("test") | ||
| NamespaceCreationShouldNotSucceed(ns, t1, podRecreationTimeoutInterval) | ||
| }) | ||
| It("should be assigned to the second Tenant", func() { | ||
| ns := NewNamespace("second-test") | ||
| ns2 := NewNamespace("second-test2") | ||
| NamespaceCreationShouldSucceed(ns, t2, podRecreationTimeoutInterval) | ||
| NamespaceShouldBeManagedByTenant(ns, t2, podRecreationTimeoutInterval) | ||
| NamespaceCreationShouldNotSucceed(ns2, t1, podRecreationTimeoutInterval) | ||
| args := defaulManagerPodArgs | ||
| ModifyCapsuleManagerPodArgs(args) | ||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.