diff --git a/portal-ui/tests/operator/list-tenants.ts b/portal-ui/tests/operator/list-tenants.ts index 8665000de..4a499525d 100644 --- a/portal-ui/tests/operator/list-tenants.ts +++ b/portal-ui/tests/operator/list-tenants.ts @@ -1,10 +1,26 @@ +// This file is part of MinIO Console Server +// Copyright (c) 2022 MinIO, Inc. +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + import { diagnosticsElement, supportElement } from "../utils/elements-menu"; import { Selector } from 'testcafe'; fixture("For user with default permissions").page("http://localhost:9090"); -test("Create Tenant", async (t) => { +test("Create Tenant and List Tenants", async (t) => { const osCount = Selector(`#root > div > main > div[class] > div > div > div > div:nth-child(1) > div > div > div`).count; diff --git a/portal-ui/tests/scripts/operator.sh b/portal-ui/tests/scripts/operator.sh index ace94b78e..b64a7fd5e 100755 --- a/portal-ui/tests/scripts/operator.sh +++ b/portal-ui/tests/scripts/operator.sh @@ -43,8 +43,8 @@ function setup_kind() { function install_operator() { - echo "Installing Current Operator" - try kubectl apply -k "${SCRIPT_DIR}/../../../operator/resources" + echo "Installing Current Operator from kustomization.yaml" + try kubectl apply -k "${SCRIPT_DIR}/resources" echo "key, value for pod selector in kustomize test" key=name @@ -142,7 +142,7 @@ function install_tenant() { value=storage-lite echo "Installing lite tenant" - try kubectl apply -k "${SCRIPT_DIR}/../../../operator/examples/kustomization/tenant-lite" + try kubectl apply -k "${SCRIPT_DIR}/tenant" echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled" echo $namespace diff --git a/portal-ui/tests/scripts/resources/kustomization.yaml b/portal-ui/tests/scripts/resources/kustomization.yaml new file mode 100644 index 000000000..575aa220b --- /dev/null +++ b/portal-ui/tests/scripts/resources/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: minio-operator + +images: + - name: minio/operator + +resources: + - github.com/minio/operator/resources/ diff --git a/portal-ui/tests/scripts/tenant/kustomization.yaml b/portal-ui/tests/scripts/tenant/kustomization.yaml new file mode 100644 index 000000000..c21d1b18c --- /dev/null +++ b/portal-ui/tests/scripts/tenant/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: tenant-lite + +images: + - name: minio/operator + +resources: + - github.com/minio/operator/examples/kustomization/tenant-lite