mirror of
https://github.com/projectcapsule/capsule.git
synced 2026-08-19 04:26:45 +00:00
Hristo HristovandGitHub
0378ea279e
Fix the OpenShift e2e bootstrap and skip the specs that still fail on OpenShift/MicroShift: - Drop the dev-setup-fluxcd prerequisite from dev-setup-cert-manager so the OpenShift path no longer re-applies the non-OpenShift flux manifests over the SCC-patched ones (which restored source-controller's fsGroup 1337, rejected by every OpenShift SCC and hanging the run). - Label the remaining OpenShift-failing specs with skip-on-openshift so they are excluded by the e2e-openshift label filter. Signed-off-by: Hristo Hristov <me@hhristov.info>
78 lines
2.0 KiB
Go
78 lines
2.0 KiB
Go
// Copyright 2020-2023 Project Capsule Authors.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package e2e
|
|
|
|
import (
|
|
"context"
|
|
|
|
. "github.com/onsi/ginkgo/v2"
|
|
. "github.com/onsi/gomega"
|
|
v1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/types"
|
|
|
|
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
|
|
"github.com/projectcapsule/capsule/pkg/api/meta"
|
|
"github.com/projectcapsule/capsule/pkg/api/rbac"
|
|
)
|
|
|
|
var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("namespace"), func() {
|
|
tnt := &capsulev1beta2.Tenant{
|
|
ObjectMeta: metav1.ObjectMeta{
|
|
Name: "e2e-managed-labels",
|
|
Labels: map[string]string{
|
|
"env": "e2e",
|
|
},
|
|
},
|
|
Spec: capsulev1beta2.TenantSpec{
|
|
Owners: rbac.OwnerListSpec{
|
|
{
|
|
CoreOwnerSpec: rbac.CoreOwnerSpec{
|
|
UserSpec: rbac.UserSpec{
|
|
Name: "e2e-managed-labels",
|
|
Kind: "User",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
JustBeforeEach(func() {
|
|
EventuallyCreation(func() error {
|
|
tnt.ResourceVersion = ""
|
|
return k8sClient.Create(context.TODO(), tnt)
|
|
}).Should(Succeed())
|
|
TenantReady(tnt, metav1.ConditionTrue, defaultTimeoutInterval)
|
|
})
|
|
|
|
JustAfterEach(func() {
|
|
EventuallyDeletion(tnt)
|
|
})
|
|
|
|
It("should contains the default Capsule label", Label("skip-on-openshift"), func() {
|
|
namespaces := []*v1.Namespace{
|
|
NewNamespace("", map[string]string{
|
|
meta.TenantLabel: tnt.GetName(),
|
|
}),
|
|
NewNamespace("", map[string]string{
|
|
meta.TenantLabel: tnt.GetName(),
|
|
}),
|
|
NewNamespace("", map[string]string{
|
|
meta.TenantLabel: tnt.GetName(),
|
|
}),
|
|
}
|
|
for _, ns := range namespaces {
|
|
NamespaceCreation(ns, tnt.Spec.Owners[0].UserSpec, defaultTimeoutInterval).Should(Succeed())
|
|
NamespaceIsPartOfTenant(tnt, ns).Should(Succeed())
|
|
|
|
Eventually(func() (ok bool) {
|
|
Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())
|
|
ok, _ = HaveKeyWithValue(meta.TenantLabel, tnt.Name).Match(ns.Labels)
|
|
return
|
|
}, defaultTimeoutInterval, defaultPollInterval).Should(BeTrue())
|
|
}
|
|
})
|
|
})
|