github/capsule
1
0
Fork 0
mirror of https://github.com/projectcapsule/capsule.git synced 2026-08-25 16:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(e2e): aligning tests to use new NamespaceOptions structure

Browse Source
This commit is contained in:
Maksim Fedotov
2021-08-09 20:25:03 +02:00
committed by Dario Tranchitella
parent 737fb26e39
commit 34614015a0
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/namespace_metadata_test.go
+12 -10
View File
@@ -28,14 +28,16 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata", f
Kind: "User",
},
},
NamespacesMetadata: &capsulev1beta1.AdditionalMetadataSpec{
AdditionalLabels: map[string]string{
"k8s.io/custom-label": "foo",
"clastix.io/custom-label": "bar",
},
AdditionalAnnotations: map[string]string{
"k8s.io/custom-annotation": "bizz",
"clastix.io/custom-annotation": "buzz",
NamespaceOptions: &capsulev1beta1.NamespaceOptions{
AdditionalMetadata: &capsulev1beta1.AdditionalMetadataSpec{
AdditionalLabels: map[string]string{
"k8s.io/custom-label": "foo",
"clastix.io/custom-label": "bar",
},
AdditionalAnnotations: map[string]string{
"k8s.io/custom-annotation": "bizz",
"clastix.io/custom-annotation": "buzz",
},
},
},
},
@@ -58,7 +60,7 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata", f
By("checking additional labels", func() {
Eventually(func() (ok bool) {
Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())
for k, v := range tnt.Spec.NamespacesMetadata.AdditionalLabels {
for k, v := range tnt.Spec.NamespaceOptions.AdditionalMetadata.AdditionalLabels {
if ok, _ = HaveKeyWithValue(k, v).Match(ns.Labels); !ok {
return
}
@@ -69,7 +71,7 @@ var _ = Describe("creating a Namespace for a Tenant with additional metadata", f
By("checking additional annotations", func() {
Eventually(func() (ok bool) {
Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: ns.GetName()}, ns)).Should(Succeed())
for k, v := range tnt.Spec.NamespacesMetadata.AdditionalAnnotations {
for k, v := range tnt.Spec.NamespaceOptions.AdditionalMetadata.AdditionalAnnotations {
if ok, _ = HaveKeyWithValue(k, v).Match(ns.Annotations); !ok {
return
}
e2e/overquota_namespace_test.go
+3 -1
View File
@@ -28,7 +28,9 @@ var _ = Describe("creating a Namespace in over-quota of three", func() {
Kind: "User",
},
},
NamespaceQuota: pointer.Int32Ptr(3),
NamespaceOptions: &capsulev1beta1.NamespaceOptions{
Quota: pointer.Int32Ptr(3),
},
},
}