Skip to content

Commit 83fc075

Browse files
authored
Using Kustomize to get YAML files (#1616)
1 parent 8dc000c commit 83fc075

File tree

4 files changed

+38
-4
lines changed

4 files changed

+38
-4
lines changed

portal-ui/tests/operator/list-tenants.ts

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,26 @@
1+
// This file is part of MinIO Console Server
2+
// Copyright (c) 2022 MinIO, Inc.
3+
//
4+
// This program is free software: you can redistribute it and/or modify
5+
// it under the terms of the GNU Affero General Public License as published by
6+
// the Free Software Foundation, either version 3 of the License, or
7+
// (at your option) any later version.
8+
//
9+
// This program is distributed in the hope that it will be useful,
10+
// but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
// GNU Affero General Public License for more details.
13+
//
14+
// You should have received a copy of the GNU Affero General Public License
15+
// along with this program. If not, see <http://www.gnu.org/licenses/>.
16+
117
import { diagnosticsElement, supportElement } from "../utils/elements-menu";
218
import { Selector } from 'testcafe';
319

420

521
fixture("For user with default permissions").page("http://localhost:9090");
622

7-
test("Create Tenant", async (t) => {
23+
test("Create Tenant and List Tenants", async (t) => {
824

925
const osCount = Selector(`#root > div > main > div[class] > div > div > div > div:nth-child(1) > div > div > div`).count;
1026

portal-ui/tests/scripts/operator.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ function setup_kind() {
4343

4444
function install_operator() {
4545

46-
echo "Installing Current Operator"
47-
try kubectl apply -k "${SCRIPT_DIR}/../../../operator/resources"
46+
echo "Installing Current Operator from kustomization.yaml"
47+
try kubectl apply -k "${SCRIPT_DIR}/resources"
4848

4949
echo "key, value for pod selector in kustomize test"
5050
key=name
@@ -142,7 +142,7 @@ function install_tenant() {
142142
value=storage-lite
143143
echo "Installing lite tenant"
144144

145-
try kubectl apply -k "${SCRIPT_DIR}/../../../operator/examples/kustomization/tenant-lite"
145+
try kubectl apply -k "${SCRIPT_DIR}/tenant"
146146

147147
echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
148148
echo $namespace
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: minio-operator
4+
5+
images:
6+
- name: minio/operator
7+
8+
resources:
9+
- github.com/minio/operator/resources/
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: tenant-lite
4+
5+
images:
6+
- name: minio/operator
7+
8+
resources:
9+
- github.com/minio/operator/examples/kustomization/tenant-lite

0 commit comments

Comments
 (0)