From ecb4035b4e5219bee55978e74bc871f9ec0504e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20B=C3=A4hler?= Date: Sun, 2 Jun 2024 11:13:37 +0200 Subject: [PATCH] chore: change default group name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Oliver Bähler --- e2e/custom_capsule_group_test.go | 2 +- e2e/suite_test.go | 2 +- hack/create-user-openshift.sh | 2 +- hack/create-user.sh | 2 +- pkg/configuration/client.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/e2e/custom_capsule_group_test.go b/e2e/custom_capsule_group_test.go index 03c93b0a..6f89544f 100644 --- a/e2e/custom_capsule_group_test.go +++ b/e2e/custom_capsule_group_test.go @@ -62,7 +62,7 @@ var _ = Describe("creating a Namespace as Tenant owner with custom --capsule-gro It("should succeed and be available in Tenant namespaces list with default single group", func() { ModifyCapsuleConfigurationOpts(func(configuration *capsulev1beta2.CapsuleConfiguration) { - configuration.Spec.UserGroups = []string{"capsule.clastix.io"} + configuration.Spec.UserGroups = []string{"projectcapsule.dev"} }) ns := NewNamespace("") diff --git a/e2e/suite_test.go b/e2e/suite_test.go index 5e016ecc..267ae0ce 100644 --- a/e2e/suite_test.go +++ b/e2e/suite_test.go @@ -68,7 +68,7 @@ var _ = AfterSuite(func() { func ownerClient(owner capsulev1beta2.OwnerSpec) (cs kubernetes.Interface) { c, err := config.GetConfig() Expect(err).ToNot(HaveOccurred()) - c.Impersonate.Groups = []string{capsulev1beta2.GroupVersion.Group, owner.Name} + c.Impersonate.Groups = []string{"projectcapsule.dev", owner.Name} c.Impersonate.UserName = owner.Name cs, err = kubernetes.NewForConfig(c) Expect(err).ToNot(HaveOccurred()) diff --git a/hack/create-user-openshift.sh b/hack/create-user-openshift.sh index 0fc7f5a1..80d31c3e 100755 --- a/hack/create-user-openshift.sh +++ b/hack/create-user-openshift.sh @@ -43,7 +43,7 @@ if [[ -z ${TENANT} ]]; then fi if [[ -z ${GROUP} ]]; then - GROUP=capsule.clastix.io + GROUP=projectcapsule.dev fi TMPDIR=$(mktemp -d) diff --git a/hack/create-user.sh b/hack/create-user.sh index 6ef609be..1a3b5073 100755 --- a/hack/create-user.sh +++ b/hack/create-user.sh @@ -38,7 +38,7 @@ if [[ -z ${TENANT} ]]; then fi if [[ -z ${GROUP} ]]; then - GROUP=capsule.clastix.io + GROUP=projectcapsule.dev fi diff --git a/pkg/configuration/client.go b/pkg/configuration/client.go index f2e032cc..b829c971 100644 --- a/pkg/configuration/client.go +++ b/pkg/configuration/client.go @@ -30,7 +30,7 @@ func NewCapsuleConfiguration(ctx context.Context, client client.Client, name str if apierrors.IsNotFound(err) { return &capsulev1beta2.CapsuleConfiguration{ Spec: capsulev1beta2.CapsuleConfigurationSpec{ - UserGroups: []string{"capsule.clastix.io"}, + UserGroups: []string{"projectcapsule.dev"}, ForceTenantPrefix: false, ProtectedNamespaceRegexpString: "", },