Correcting doc links on Configuration pages

2022-04-29 10:53:02 -05:00
1362 changed files with 30691 additions and 56239 deletions
--- a/.github/workflows/common.sh
+++ b/.github/workflows/common.sh
@@ -41,7 +41,7 @@ function install_operator() {
    echo "Installing Current Operator"

    # TODO: Compile the current branch and create an overlay to use that image version
-    try kubectl apply -k "${SCRIPT_DIR}/../portal-ui/tests/scripts/resources"
+    try kubectl apply -k "${SCRIPT_DIR}/../../portal-ui/tests/scripts/resources"

    echo "Waiting for k8s api"
    sleep 10
@@ -91,4 +91,4 @@ function check_tenant_status() {
    kubectl run admin-mc -i --tty --image minio/mc --command -- bash -c "until (mc alias set minio/ https://minio.$1.svc.cluster.local $USER $PASSWORD); do echo \"...waiting... for 5secs\" && sleep 5; done; mc admin info minio/;"

    echo "Done."
-}
+}
--- a/.github/workflows/deploy-tenant.sh
+++ b/.github/workflows/deploy-tenant.sh
@@ -20,17 +20,17 @@ export SCRIPT_DIR

 source "${SCRIPT_DIR}/common.sh"

-function install_tenants() {
-	echo "Installing tenants"

-	# Install lite & kes tenants
-	try kubectl apply -k "${SCRIPT_DIR}/../portal-ui/tests/scripts/tenant-lite"
-	try kubectl apply -k "${SCRIPT_DIR}/../portal-ui/tests/scripts/tenant-kes-encryption"

-	echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
-	waitdone=0
-	totalwait=0
-	while true; do
+function install_tenant() {
+    echo "Installing lite tenant"
+
+	try kubectl apply -k "${SCRIPT_DIR}/../../portal-ui/tests/scripts/tenant"
+
+    echo "Waiting for the tenant statefulset, this indicates the tenant is being fulfilled"
+    waitdone=0
+    totalwait=0
+    while true; do
 	waitdone=$(kubectl -n tenant-lite get pods -l v1.min.io/tenant=storage-lite --no-headers | wc -l)
 	if [ "$waitdone" -ne 0 ]; then
 	    echo "Found $waitdone pods"
@@ -39,34 +39,33 @@ function install_tenants() {
 	sleep 5
 	totalwait=$((totalwait + 5))
 	if [ "$totalwait" -gt 300 ]; then
-		echo "Tenant never created statefulset after 5 minutes"
-		try false
+	    echo "Tenant never created statefulset after 5 minutes"
+	    try false
 	fi
-	done
+    done

-	echo "Waiting for tenant pods to come online (5m timeout)"
-	try kubectl wait --namespace tenant-lite \
+    echo "Waiting for tenant pods to come online (5m timeout)"
+    try kubectl wait --namespace tenant-lite \
 	--for=condition=ready pod \
 	--selector="v1.min.io/tenant=storage-lite" \
 	--timeout=300s

-	echo "Build passes basic tenant creation"
+    echo "Build passes basic tenant creation"
 }


 function main() {
-	destroy_kind
-	setup_kind
-	install_operator
-	install_tenants
-	check_tenant_status tenant-lite storage-lite
-	kubectl proxy &
-	# Beginning  Kubernetes 1.24 ----> Service Account Token Secrets are not 
-	# automatically generated, to generate them manually, users must manually
-	# create the secret, for our examples where we lead people to get the JWT
-	# from the console-sa service account, they additionally need to manually
-	# generate the secret via
-	kubectl apply -f "${SCRIPT_DIR}/console-sa-secret.yaml"
+    destroy_kind
+
+    setup_kind
+
+    install_operator
+
+    install_tenant
+
+    check_tenant_status tenant-lite storage-lite
+
+    kubectl proxy &
 }

 main "$@"
--- a/.github/workflows/jobs.yaml
+++ b/.github/workflows/jobs.yaml
@@ -24,12 +24,11 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ubuntu-latest

    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]

    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -93,12 +92,11 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ubuntu-latest

    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]

    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -135,7 +133,6 @@ jobs:
        run: |
          echo "The idea is to build minio image from downloaded repository";
          cd $GITHUB_WORKSPACE/minio_repository;
-          echo "replace github.com/minio/console => ../" >> go.mod
          echo "Get git version to build MinIO Image";
          VERSION=`git rev-parse HEAD`;
          echo $VERSION;
@@ -163,12 +160,11 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ubuntu-latest

    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]

    steps:

@@ -193,7 +189,7 @@ jobs:
          curl -sLO "https://dl.k8s.io/release/v1.23.1/bin/linux/amd64/kubectl" -o kubectl
          chmod +x kubectl
          mv kubectl /usr/local/bin
-          "${GITHUB_WORKSPACE}/tests/deploy-tenant.sh"
+          "${GITHUB_WORKSPACE}/.github/workflows/deploy-tenant.sh"
          echo "start ---> make test-operator-integration";
          make test-operator-integration;

@@ -210,7 +206,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -234,7 +230,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -260,28 +256,12 @@ jobs:
          curl -L -o nancy https://github.com/sonatype-nexus-community/nancy/releases/download/${nancy_version}/nancy-${nancy_version}-linux-amd64 && chmod +x nancy
          go list -deps -json ./... | jq -s 'unique_by(.Module.Path)|.[]|select(has("Module"))|.Module' | ./nancy sleuth

-  semgrep-static-code-analysis:
-    name: "semgrep checks"
-    runs-on: ${{ matrix.os }}
-    container:
-      image: "returntocorp/semgrep"
-    strategy:
-      matrix:
-        os: [ ubuntu-latest ]
-    steps:
-      - name: Check out source code
-        uses: actions/checkout@v2
-      - name: Scanning code on ${{ matrix.os }}
-        continue-on-error: false
-        run: |
-          semgrep --config semgrep.yaml $(pwd)/portal-ui --error
-
  no-warnings-and-make-assets:
-    name: "React Code Has No Warnings & is Prettified, then Make Assets"
+    name: "React Code Has No Warnings and then Make Assets"
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -289,17 +269,11 @@ jobs:
        with:
          go-version: ${{ matrix.go-version }}
        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-
      - uses: actions/setup-node@v2
        with:
-          node-version: ${{ env.NVMRC }}
+          node-version: '17'
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2

      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
@@ -336,18 +310,13 @@ jobs:
        continue-on-error: false
        run: |
          ./check-warnings.sh
-      - name: Check if Files are Prettified
-        working-directory: ./portal-ui
-        continue-on-error: false
-        run: |
-          ./check-prettier.sh

  reuse-golang-dependencies:
    name: reuse golang dependencies
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -381,11 +350,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -393,17 +361,11 @@ jobs:
        with:
          go-version: ${{ matrix.go-version }}
        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-
      - uses: actions/setup-node@v2
        with:
-          node-version: ${{ env.NVMRC }}
+          node-version: '16'
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2

      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
@@ -466,11 +428,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -478,17 +439,11 @@ jobs:
        with:
          go-version: ${{ matrix.go-version }}
        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-
      - uses: actions/setup-node@v2
        with:
-          node-version: ${{ env.NVMRC }}
+          node-version: '16'
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2

      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
@@ -551,11 +506,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -563,17 +517,11 @@ jobs:
        with:
          go-version: ${{ matrix.go-version }}
        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-
      - uses: actions/setup-node@v2
        with:
-          node-version: ${{ env.NVMRC }}
+          node-version: '16'
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2

      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
@@ -637,12 +585,11 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    timeout-minutes: 5
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -650,14 +597,11 @@ jobs:
        with:
          go-version: ${{ matrix.go-version }}
        id: go
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
      - uses: actions/setup-node@v2
        with:
-          node-version: ${{ env.NVMRC }}
+          node-version: '16'
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -710,11 +654,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -722,14 +665,11 @@ jobs:
        with:
          go-version: ${{ matrix.go-version }}
        id: go
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
      - uses: actions/setup-node@v2
        with:
-          node-version: ${{ env.NVMRC }}
+          node-version: '16'
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -782,11 +722,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -794,14 +733,11 @@ jobs:
        with:
          go-version: ${{ matrix.go-version }}
        id: go
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
      - uses: actions/setup-node@v2
        with:
-          node-version: ${{ env.NVMRC }}
+          node-version: '16'
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -847,235 +783,6 @@ jobs:
        with:
          args: '"chrome:headless" portal-ui/tests/permissions-6/ --skip-js-errors'

-  all-permissions-7:
-    name: Permissions Tests Part 7
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - reuse-golang-dependencies
-      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
-        os: [ ubuntu-latest ]
-    steps:
-      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-        id: go
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NVMRC }}
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        name: Yarn Cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            ./portal-ui/node_modules/
-            ./portal-ui/build/
-          key: ${{ runner.os }}-yarn-${{ hashFiles('./portal-ui/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - uses: actions/cache@v2
-        id: assets-cache
-        name: Assets Cache
-        with:
-          path: |
-            ./portal-ui/build/
-          key: ${{ runner.os }}-assets-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-assets-
-      - uses: actions/cache@v2
-        name: Go Mod Cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ github.run_id }}
-      - name: Build Console on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make console
-      - name: Start Console, front-end app and initialize users/policies
-        run: |
-          (./console server) & (make initialize-permissions)
-      - name: Run TestCafe Tests
-        timeout-minutes: 5
-        uses: DevExpress/testcafe-action@latest
-        with:
-          args: '"chrome:headless" portal-ui/tests/permissions-7/ --skip-js-errors'
-
-  all-permissions-8:
-    name: Permissions Tests Part 8
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - reuse-golang-dependencies
-      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
-        os: [ ubuntu-latest ]
-    steps:
-      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-        id: go
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NVMRC }}
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
-        id: yarn-cache
-        name: Yarn Cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            ./portal-ui/node_modules/
-            ./portal-ui/build/
-          key: ${{ runner.os }}-yarn-${{ hashFiles('./portal-ui/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - uses: actions/cache@v2
-        id: assets-cache
-        name: Assets Cache
-        with:
-          path: |
-            ./portal-ui/build/
-          key: ${{ runner.os }}-assets-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-assets-
-      - uses: actions/cache@v2
-        name: Go Mod Cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ github.run_id }}
-      - name: Build Console on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make console
-      - name: Start Console, front-end app and initialize users/policies
-        run: |
-          (./console server) & (make initialize-permissions)
-      - name: Run TestCafe Tests
-        timeout-minutes: 5
-        uses: DevExpress/testcafe-action@latest
-        with:
-          args: '"chrome:headless" portal-ui/tests/permissions-8/ --skip-js-errors'
-
-  all-permissions-9:
-    name: Permissions Tests Part 9
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - reuse-golang-dependencies
-      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
-        os: [ ubuntu-latest ]
-    steps:
-      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NVMRC }}
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        name: Yarn Cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            ./portal-ui/node_modules/
-            ./portal-ui/build/
-          key: ${{ runner.os }}-yarn-${{ hashFiles('./portal-ui/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - uses: actions/cache@v2
-        id: assets-cache
-        name: Assets Cache
-        with:
-          path: |
-            ./portal-ui/build/
-          key: ${{ runner.os }}-assets-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-assets-
-
-      - uses: actions/cache@v2
-        name: Go Mod Cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ github.run_id }}
-
-      - name: Build Console on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make console
-
-      - name: Start Console, front-end app and initialize users/policies
-        run: |
-          (./console server) & (make initialize-permissions)
-
-      - name: Run TestCafe Tests
-        uses: DevExpress/testcafe-action@latest
-        with:
-          args: '"chrome:headless" portal-ui/tests/permissions-9/ --skip-js-errors -c 3'
-
-      - name: Clean up users & policies
-        run: |
-          make cleanup-permissions
-
  all-operator-tests:
    name: Operator UI Tests
    needs:
@@ -1083,11 +790,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1095,18 +801,11 @@ jobs:
        with:
          go-version: ${{ matrix.go-version }}
        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Read .nvmrc
-        id: node_version
-        run: echo ::set-output name=NVMRC::$(cat .nvmrc)
-
      - uses: actions/setup-node@v2
        with:
-          node-version: ${{ env.NVMRC }}
-
+          node-version: '16'
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
      - uses: actions/cache@v2
        name: Go Mod Cache
        with:
@@ -1164,11 +863,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1202,11 +900,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1240,11 +937,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1278,11 +974,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1316,11 +1011,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1354,11 +1048,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1392,11 +1085,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1430,11 +1122,10 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1469,52 +1160,6 @@ jobs:
            ./restapi/coverage/
          key: ${{ runner.os }}-coverage-restapi-2-${{ github.run_id }}

-  test-operatorapi-on-go:
-    name: Test Operatorapi on Go ${{ matrix.go-version }} and ${{ matrix.os }}
-    needs:
-      - lint-job
-      - no-warnings-and-make-assets
-      - reuse-golang-dependencies
-      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
-        os: [ ubuntu-latest ]
-    steps:
-      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
-        uses: actions/setup-go@v2
-        with:
-          go-version: ${{ matrix.go-version }}
-        id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - uses: actions/cache@v2
-        name: Go Mod Cache
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ github.run_id }}
-
-      - name: Build on ${{ matrix.os }}
-        env:
-          GO111MODULE: on
-          GOOS: linux
-        run: |
-          make test-unit-test-operator
-
-      - uses: actions/cache@v2
-        id: coverage-cache-unittest-operatorapi
-        name: Coverage Cache unit test operatorAPI
-        with:
-          path: |
-            ./operatorapi/coverage/
-          key: ${{ runner.os }}-coverage-unittest-operatorapi-2-${{ github.run_id }}
-
  b-integration-tests:
    name: Integration Tests with Latest Distributed MinIO
    needs:
@@ -1522,12 +1167,11 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ubuntu-latest

    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]

    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1574,31 +1218,7 @@ jobs:
          echo "We are going to use the built image on test-integration";
          VERSION="minio/minio:$VERSION";
          echo $VERSION;
-          
-          echo "Create bucket for replication with versioning"
-          echo "Download mc for Ubuntu"
-          wget -q https://dl.min.io/client/mc/release/linux-amd64/mc
-          echo "Change the permissions to execute mc command"
-          chmod +x mc
-          echo "Create the folder to put the all.out file"
-          TARGET_BUCKET=`echo $RANDOM | md5sum | head -c 20; echo;`
-          echo "TARGET_BUCKET: ${TARGET_BUCKET}"
-          echo "Only run our test if play is up and running..."
-          PLAY_IS_ON=`wget --spider --server-response https://play.min.io:9443/login 2>&1 | grep '200\ OK' | wc -l`
-          if [ $PLAY_IS_ON == 1 ]
-          then
-            echo "Play is up and running, we will proceed with the test"
-          else
-            echo "Play is down, please report it on hack channel"
-            exit
-          fi
-          ./mc mb --ignore-existing play/${TARGET_BUCKET}/
-          ./mc version enable play/${TARGET_BUCKET}
-          # Via API we are going to test:
-          # mc admin bucket remote add myminio/source https://minioadmin:minioadmin@play.min.io/target --service "replication"
-          # expected output is: Remote ARN = `arn:minio:replication::f5bdb8d7-541d-415e-aaf4-592979484ba9:target`.
-          
-          make test-integration MINIO_VERSION=$VERSION TARGET_BUCKET=$TARGET_BUCKET;
+          make test-integration MINIO_VERSION=$VERSION;

      - uses: actions/cache@v2
        id: coverage-cache
@@ -1615,7 +1235,6 @@ jobs:
      - no-warnings-and-make-assets
      - reuse-golang-dependencies
      - vulnerable-dependencies-checks
-      - semgrep-static-code-analysis
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
@@ -1631,7 +1250,6 @@ jobs:
    needs:
      - b-integration-tests
      - test-restapi-on-go
-      - test-operatorapi-on-go
      - c-operator-api-tests
      - test-pkg-on-go
      - sso-integration
@@ -1639,7 +1257,7 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        go-version: [ 1.18.x, 1.19.x ]
+        go-version: [ 1.17.x ]
        os: [ ubuntu-latest ]
    steps:
      - name: Set up Go ${{ matrix.go-version }} on ${{ matrix.os }}
@@ -1702,14 +1320,6 @@ jobs:
            ./restapi/coverage/
          key: ${{ runner.os }}-coverage-restapi-2-${{ github.run_id }}

-      - uses: actions/cache@v2
-        id: coverage-cache-unittest-operatorapi
-        name: Coverage Cache unit test operatorAPI
-        with:
-          path: |
-            ./operatorapi/coverage/
-          key: ${{ runner.os }}-coverage-unittest-operatorapi-2-${{ github.run_id }}
-
      - uses: actions/cache@v2
        id: coverage-cache-pkg
        name: Coverage Cache Pkg
@@ -1729,42 +1339,17 @@ jobs:
          echo "go build gocoverage.go"
          go build gocovmerge.go
          echo "put together the outs for final coverage resolution"
-          ./gocovmerge ../integration/coverage/system.out ../replication/coverage/replication.out ../sso-integration/coverage/sso-system.out ../restapi/coverage/coverage.out ../pkg/coverage/coverage-pkg.out ../operator-integration/coverage/operator-api.out ../operatorapi/coverage/coverage-unit-test-operatorapi.out > all.out
-          echo "Download mc for Ubuntu"
-          wget -q https://dl.min.io/client/mc/release/linux-amd64/mc
-          echo "Change the permissions to execute mc command"
-          chmod +x mc
-          echo "Only run our test if play is up and running since we require it for replication tests here."
-          PLAY_IS_ON=`wget --spider --server-response https://play.min.io:9443/login 2>&1 | grep '200\ OK' | wc -l`
-          if [ $PLAY_IS_ON == 1 ]
-          then
-            echo "Play is up and running, we will proceed with the play part for coverage"
-            echo "Create the folder to put the all.out file"
-            ./mc mb --ignore-existing play/builds/
-            echo "Copy the all.out file to play bucket"
-            echo ${{ github.repository }}
-            echo ${{ github.event.number }}
-            echo ${{ github.run_id }}
-            # mc cp can fail due to lack of space: mc: <ERROR> Failed to copy `all.out`.
-            # Storage backend has reached its minimum free disk threshold. Please delete a few objects to proceed.
-            ./mc cp all.out play/builds/${{ github.repository }}/${{ github.event.number }}/${{ github.run_id }}/ || true
-            ./mc cp all.out play/builds/${{ github.repository }}/${{ github.event.number }}/latest/ || true
-            go tool cover -html=all.out -o coverage.html
-            ./mc cp coverage.html play/builds/${{ github.repository }}/${{ github.event.number }}/${{ github.run_id }}/ || true
-            ./mc cp coverage.html play/builds/${{ github.repository }}/${{ github.event.number }}/latest/ || true
-          else
-            echo "Play is down, please report it on hack channel, no coverage is going to be uploaded!!!"
-          fi
+          ./gocovmerge ../integration/coverage/system.out ../replication/coverage/replication.out ../sso-integration/coverage/sso-system.out ../restapi/coverage/coverage.out ../pkg/coverage/coverage-pkg.out ../operator-integration/coverage/operator-api.out > all.out
          echo "grep to obtain the result"
          go tool cover -func=all.out | grep total > tmp2
          result=`cat tmp2 | awk 'END {print $3}'`
          result=${result%\%}
-          threshold=53.40
-          echo "Result:"
-          echo "$result%"
+          echo "result:"
+          echo $result
+          threshold=41.2
          if (( $(echo "$result >= $threshold" |bc -l) )); then
-            echo "It is equal or greater than threshold ($threshold%), passed!"
+            echo "It is equal or greater than threshold, passed!"
          else
-            echo "It is smaller than threshold ($threshold%) value, failed!"
+            echo "It is smaller than threshold value, failed!"
            exit 1
          fi
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -5,12 +5,6 @@ linters-settings:
  misspell:
    locale: US

-  goheader:
-    values:
-      regexp:
-        copyright-holder: Copyright \(c\) (20\d\d\-20\d\d)|2021|({{year}})
-    template-path: .license.tmpl
-
 linters:
  disable-all: true
  enable:
@@ -22,17 +16,17 @@ linters:
    - ineffassign
    - gosimple
    - deadcode
-    - structcheck
-    - gomodguard
-    - gofmt
+    - unparam
    - unused
    - structcheck
-    - unconvert
-    - varcheck
-    - gocritic
-    - gofumpt
-    - tenv
-    - durationcheck
+    - goheader
+
+linters-settings:
+  goheader:
+    values:
+      regexp:
+        copyright-holder: Copyright \(c\) (20\d\d\-20\d\d)|2021|({{year}})
+    template-path: .license.tmpl

 service:
  golangci-lint-version: 1.43.0 # use the fixed version to not introduce new linters unexpectedly
@@ -40,15 +34,14 @@ service:
 issues:
  exclude-use-default: false
  exclude:
-    - should have a package comment
-    # TODO(y4m4): Remove once all exported ident. have comments!
-    - comment on exported function
-    - comment on exported type
-    - should have comment
-    - use leading k in Go names
-    - comment on exported const
+      - should have a package comment
+      # TODO(y4m4): Remove once all exported ident. have comments!      
+      - comment on exported function
+      - comment on exported type
+      - should have comment
+      - use leading k in Go names
+      - comment on exported const
 run:
  skip-dirs:
    - pkg/clientgen
    - pkg/apis/networking.gke.io
-    - restapi/operations
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +0,0 @@
-17
--- a/.semgrepignore
+++ b/.semgrepignore
@@ -1,33 +0,0 @@
-# Ignore git items
-.gitignore
-.git/
-:include .gitignore
-
-# Common large paths
-node_modules/
-portal-ui/node_modules/
-build/
-dist/
-.idea/
-vendor/
-.env/
-.venv/
-.tox/
-*.min.js
-
-# Common test paths
-test/
-tests/
-*_test.go
-
-# Semgrep rules folder
-.semgrep
-
-# Semgrep-action log folder
-.semgrep_logs/
-
-# Ignore VsCode files
-.vscode/
-*.code-workspace
-*~
-.eslintcache
--- a/2702
+++ b/2702
--- a/7
+++ b/7
@@ -1,5 +1,4 @@
-ARG NODE_VERSION
-FROM node:$NODE_VERSION as uilayer
+FROM node:17 as uilayer

 WORKDIR /app

@@ -13,7 +12,7 @@ RUN make build-static

 USER node

-FROM golang:1.18 as golayer
+FROM golang:1.17 as golayer

 RUN apt-get update -y && apt-get install -y ca-certificates

@@ -32,7 +31,7 @@ ENV CGO_ENABLED=0
 COPY --from=uilayer /app/build /go/src/github.com/minio/console/portal-ui/build
 RUN go build --tags=kqueue,operator -ldflags "-w -s" -a -o console ./cmd/console

-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
 MAINTAINER MinIO Development "dev@min.io"
 EXPOSE 9090

--- a/Dockerfile.assets
+++ b/Dockerfile.assets
@@ -1,5 +1,4 @@
-ARG NODE_VERSION
-FROM node:$NODE_VERSION as uilayer
+FROM node:17 as uilayer

 WORKDIR /app

--- a/94
+++ b/94
@@ -5,8 +5,6 @@ BUILD_VERSION:=$(shell git describe --exact-match --tags $(git log -n1 --pretty=
 BUILD_TIME:=$(shell date 2>/dev/null)
 TAG ?= "minio/console:$(BUILD_VERSION)-dev"
 MINIO_VERSION ?= "quay.io/minio/minio:latest"
-TARGET_BUCKET ?= "target"
-NODE_VERSION := $(shell cat .nvmrc)

 default: console

@@ -16,13 +14,13 @@ console:
 	@(GO111MODULE=on CGO_ENABLED=0 go build -trimpath --tags=kqueue,operator --ldflags "-s -w" -o console ./cmd/console)

 k8sdev:
-	@docker build -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' --build-arg NODE_VERSION='$(NODE_VERSION)' .
+	@docker build -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' .
 	@kind load docker-image $(TAG)
 	@echo "Done, now restart your console deployment"

 getdeps:
 	@mkdir -p ${GOPATH}/bin
-	@echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin
+	@which golangci-lint 1>/dev/null || (echo "Installing golangci-lint" && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GOPATH)/bin v1.43.0)

 verifiers: getdeps fmt lint

@@ -64,8 +62,7 @@ swagger-operator:
 	@swagger generate server -A operator --main-package=operator --server-package=operatorapi --exclude-main -P models.Principal -f ./swagger-operator.yml -r NOTICE

 assets:
-	@(if [ -f "${NVM_DIR}/nvm.sh" ]; then \. "${NVM_DIR}/nvm.sh" && nvm install && nvm use && npm install -g yarn ; fi &&\
-	  cd portal-ui; yarn install --prefer-offline; make build-static; yarn prettier --write . --loglevel warn; cd ..)
+	@(cd portal-ui; yarn install --prefer-offline; make build-static; yarn prettier --write . --loglevel warn; cd ..)

 test-integration:
 	@(docker stop pgsqlcontainer || true)
@@ -77,8 +74,8 @@ test-integration:
 	@echo $(MINIO_VERSION)
 	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 --net=mynet123 -d --name minio --rm -p 9000:9000 -p 9001:9001 -e MINIO_KMS_SECRET_KEY=my-minio-key:OSMM+vkKUTCvQs9YL/CVMIMt43HFhkUpqJxTmGl6rYw= $(MINIO_VERSION) server /data{1...4} --console-address ':9001' && sleep 5)
 	@(docker run --net=mynet123 --ip=173.18.0.3 --name pgsqlcontainer --rm -p 5432:5432 -e POSTGRES_PASSWORD=password -d postgres && sleep 5)
-	@echo "execute test and get coverage for test-integration:"
-	@(cd integration && go test -coverpkg=../restapi -c -tags testrunmain . && mkdir -p coverage && export THETARGET=$(TARGET_BUCKET) && echo "THETARGET: ${THETARGET}" && ./integration.test -test.v -test.run "^Test*" -test.coverprofile=coverage/system.out)
+	@echo "execute test and get coverage"
+	@(cd integration && go test -coverpkg=../restapi -c -tags testrunmain . && mkdir -p coverage && ./integration.test -test.v -test.run "^Test*" -test.coverprofile=coverage/system.out)
 	@(docker stop pgsqlcontainer)
 	@(docker stop minio)
 	@(docker network rm mynet123)
@@ -134,25 +131,29 @@ test-replication:
 test-sso-integration:
 	@echo "create the network in bridge mode to communicate all containers"
 	@(docker network create my-net)
-	@echo "run openldap container using MinIO Image: quay.io/minio/openldap:latest"
+	@echo "execute latest keycloak container"
 	@(docker run \
-		-e LDAP_ORGANIZATION="MinIO Inc" \
-		-e LDAP_DOMAIN="min.io" \
-		-e LDAP_ADMIN_PASSWORD="admin" \
-		--network my-net \
-		-p 389:389 \
-		-p 636:636 \
-		--name openldap \
-		--detach quay.io/minio/openldap:latest)
-	@echo "Run Dex container using MinIO Image: quay.io/minio/dex:latest"
+	--rm \
+	--name keycloak-container \
+	--network my-net \
+	-p 8080:8080 \
+	-e KEYCLOAK_USER=admin \
+	-e KEYCLOAK_PASSWORD=admin jboss/keycloak:latest -b 0.0.0.0 -bprivate 127.0.0.1 &)
+	@echo "wait 60 sec until keycloak is listenning on port, then go for minio server"
+	@(sleep 60)
+	@echo "execute keycloak-config-cli container to configure keycloak for Single Sign On with MinIO"
 	@(docker run \
-		-e DEX_ISSUER=http://dex:5556/dex \
-		-e DEX_CLIENT_REDIRECT_URI=http://127.0.0.1:9090/oauth_callback \
-		-e DEX_LDAP_SERVER=openldap:389 \
-		--network my-net \
-		-p 5556:5556 \
-		--name dex \
-		--detach quay.io/minio/dex:latest)
+	--rm \
+	--network my-net \
+	--name keycloak-config-cli \
+	-e KEYCLOAK_URL=http://keycloak-container:8080/auth \
+	-e KEYCLOAK_USER="admin" \
+	-e KEYCLOAK_PASSWORD="admin" \
+	-e KEYCLOAK_AVAILABILITYCHECK_ENABLED=true \
+	-e KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s \
+	-e IMPORT_FILES_LOCATIONS='/config/realm-export.json' \
+	-v /home/runner/work/console/console/sso-integration/config:/config \
+	adorsys/keycloak-config-cli:latest)
 	@echo "running minio server"
 	@(docker run \
 	-v /data1 -v /data2 -v /data3 -v /data4 \
@@ -162,22 +163,19 @@ test-sso-integration:
 	--rm \
 	-p 9000:9000 \
 	-p 9001:9001 \
-	-e MINIO_IDENTITY_OPENID_CLIENT_ID="minio-client-app" \
-	-e MINIO_IDENTITY_OPENID_CLIENT_SECRET="minio-client-app-secret" \
-	-e MINIO_IDENTITY_OPENID_CLAIM_NAME=name \
-	-e MINIO_IDENTITY_OPENID_CONFIG_URL=http://dex:5556/dex/.well-known/openid-configuration \
-	-e MINIO_IDENTITY_OPENID_REDIRECT_URI=http://127.0.0.1:9090/oauth_callback \
+	-e MINIO_IDENTITY_OPENID_CLIENT_SECRET=0nfJuqIt0iPnRIUJkvetve5l38C6gi9W \
 	-e MINIO_ROOT_USER=minio \
 	-e MINIO_ROOT_PASSWORD=minio123 $(MINIO_VERSION) server /data{1...4} --address :9000 --console-address :9001)
-	@echo "run mc commands to set the policy"
+	@(sleep 60)
+	@echo "run mc commands"
 	@(docker run --name minio-client --network my-net -dit --entrypoint=/bin/sh minio/mc)
 	@(docker exec minio-client mc alias set myminio/ http://minio:9000 minio minio123)
-	@echo "adding policy to Dillon Harper to be able to login:"
-	@(cd sso-integration && docker cp allaccess.json minio-client:/ && docker exec minio-client mc admin policy add myminio "Dillon Harper" allaccess.json)
+	@(docker exec minio-client mc admin config set myminio identity_openid config_url="http://keycloak-container:8080/auth/realms/myrealm/.well-known/openid-configuration" client_id="account")
+	@(docker exec minio-client mc admin service restart myminio)
 	@echo "starting bash script"
 	@(env bash $(PWD)/sso-integration/set-sso.sh)
-	@echo "add python module"
-	@(pip3 install bs4)
+	@echo "install jq"
+	@(sudo apt install jq)
 	@echo "Executing the test:"
 	@(cd sso-integration && go test -coverpkg=../restapi -c -tags testrunmain . && mkdir -p coverage && ./sso-integration.test -test.v -test.run "^Test*" -test.coverprofile=coverage/sso-system.out)

@@ -205,26 +203,6 @@ test-permissions-3:
 	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-3/")
 	@(docker stop minio)

-test-permissions-4:
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 -d --name minio --rm -p 9000:9000 quay.io/minio/minio:latest server /data{1...4})
-	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-4/")
-	@(docker stop minio)
-
-test-permissions-5:
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 -d --name minio --rm -p 9000:9000 quay.io/minio/minio:latest server /data{1...4})
-	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-5/")
-	@(docker stop minio)
-
-test-permissions-6:
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 -d --name minio --rm -p 9000:9000 quay.io/minio/minio:latest server /data{1...4})
-	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-6/")
-	@(docker stop minio)
-
-test-permissions-7:
-	@(docker run -v /data1 -v /data2 -v /data3 -v /data4 -d --name minio --rm -p 9000:9000 quay.io/minio/minio:latest server /data{1...4})
-	@(env bash $(PWD)/portal-ui/tests/scripts/permissions.sh "portal-ui/tests/permissions-7/")
-	@(docker stop minio)
-
 test-apply-permissions:
 	@(env bash $(PWD)/portal-ui/tests/scripts/initialize-env.sh)

@@ -245,10 +223,6 @@ test:
 	@echo "execute test and get coverage"
 	@(cd restapi && mkdir coverage && GO111MODULE=on go test -test.v -coverprofile=coverage/coverage.out)

-test-unit-test-operator:
-	@echo "execute unit test and get coverage for operatorapi"
-	@(cd operatorapi && mkdir coverage && GO111MODULE=on go test -test.v -coverprofile=coverage/coverage-unit-test-operatorapi.out)
-
 test-pkg:
 	@echo "execute test and get coverage"
 	@(cd pkg && mkdir coverage && GO111MODULE=on go test -test.v -coverprofile=coverage/coverage-pkg.out)
@@ -263,7 +237,7 @@ clean:
 	@rm -vf console

 docker:
-	@docker buildx build --output=type=docker --platform linux/amd64 -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' --build-arg NODE_VERSION='$(NODE_VERSION)' .
+	@docker buildx build --output=type=docker --platform linux/amd64 -t $(TAG) --build-arg build_version=$(BUILD_VERSION) --build-arg build_time='$(BUILD_TIME)' .

 release: swagger-gen
 	@echo "Generating Release: $(RELEASE)"
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -17,7 +17,6 @@
 package cluster

 import (
-	directpvclient "github.com/minio/directpv/pkg/client"
 	operator "github.com/minio/operator/pkg/client/clientset/versioned"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -26,8 +25,8 @@ import (

 // getTLSClientConfig will return the right TLS configuration for the K8S client based on the configured TLS certificate
 func getTLSClientConfig() rest.TLSClientConfig {
-	defaultRootCAFile := "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
-	customRootCAFile := getK8sAPIServerTLSRootCA()
+	var defaultRootCAFile = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
+	var customRootCAFile = getK8sAPIServerTLSRootCA()
 	tlsClientConfig := rest.TLSClientConfig{}
 	// if console is running inside k8s by default he will have access to the CA Cert from the k8s local authority
 	if _, err := certutil.NewPool(defaultRootCAFile); err == nil {
@@ -64,13 +63,3 @@ func OperatorClient(token string) (*operator.Clientset, error) {
 func K8sClient(token string) (*kubernetes.Clientset, error) {
 	return kubernetes.NewForConfig(GetK8sConfig(token))
 }
-
-// DirectPV interfaces  required to fetch information
-
-func DirectPVDriveInterface(token string) (*directpvclient.DirectCSIDriveInterface, error) {
-	return directpvclient.DirectCSIDriveInterfaceForConfig(GetK8sConfig(token))
-}
-
-func DirectPVVolumeInterface(token string) (*directpvclient.DirectCSIVolumeInterface, error) {
-	return directpvclient.DirectCSIVolumeInterfaceForConfig(GetK8sConfig(token))
-}
--- a/cmd/console/app_commands.go
+++ b/cmd/console/app_commands.go
@@ -40,6 +40,7 @@ var appCmds = []cli.Command{

 // StartServer starts the console service
 func StartServer(ctx *cli.Context) error {
+
 	// Load all certificates
 	if err := loadAllCerts(ctx); err != nil {
 		// Log this as a warning and continue running console without TLS certificates
--- a/cmd/console/operator.go
+++ b/cmd/console/operator.go
@@ -189,6 +189,7 @@ func loadOperatorAllCerts(ctx *cli.Context) error {

 // StartServer starts the console service
 func startOperatorServer(ctx *cli.Context) error {
+
 	if err := loadAllCerts(ctx); err != nil {
 		// Log this as a warning and continue running console without TLS certificates
 		restapi.LogError("Unable to load certs: %v", err)
--- a/go.mod
+++ b/go.mod
@@ -18,44 +18,36 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/jessevdk/go-flags v1.5.0
-	github.com/klauspost/compress v1.15.9
-	github.com/minio/cli v1.23.0
-	github.com/minio/directpv v1.4.4-0.20220805090942-948ca4731651
+	github.com/klauspost/compress v1.15.1
+	github.com/minio/cli v1.22.0
 	github.com/minio/highwayhash v1.0.2
 	github.com/minio/kes v0.19.2
-	github.com/minio/madmin-go v1.4.23
-	github.com/minio/mc v0.0.0-20220818165341-8c239d16aa37
-	github.com/minio/minio-go/v7 v7.0.34
+	github.com/minio/madmin-go v1.3.12
+	github.com/minio/mc v0.0.0-20220419155441-cc4ff3a0cc82
+	github.com/minio/minio-go/v7 v7.0.24
 	github.com/minio/operator v0.0.0-20220414212219-ba4c097324b2
-	github.com/minio/pkg v1.2.0
+	github.com/minio/pkg v1.1.21
 	github.com/minio/selfupdate v0.4.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/rs/xid v1.4.0
 	github.com/secure-io/sio-go v0.3.1
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.7.1
 	github.com/tidwall/gjson v1.14.0
 	github.com/unrolled/secure v1.10.0
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
-	golang.org/x/net v0.0.0-20220722155237-a158d28d115b
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
+	golang.org/x/net v0.0.0-20220421235706-1d1ef9303861
 	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.24.3
-	k8s.io/apimachinery v0.24.3
-	k8s.io/client-go v0.24.3
-	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
+	k8s.io/api v0.23.5
+	k8s.io/apimachinery v0.23.5
+	k8s.io/client-go v0.23.5
 )

 require (
-	cloud.google.com/go v0.81.0 // indirect
-	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
-	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
-	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
-	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
-	github.com/Azure/go-autorest/logger v0.2.1 // indirect
-	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/briandowns/spinner v1.18.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/charmbracelet/bubbles v0.10.3 // indirect
 	github.com/charmbracelet/bubbletea v0.20.0 // indirect
@@ -67,11 +59,8 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
-	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/gdamore/tcell/v2 v2.4.1-0.20210905002822-f057f0a857a1 // indirect
 	github.com/go-logr/logr v1.2.2 // indirect
@@ -83,20 +72,17 @@ require (
 	github.com/goccy/go-json v0.9.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.1.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.11 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
 	github.com/lestrrat-go/blackmagic v1.0.0 // indirect
 	github.com/lestrrat-go/httpcc v1.0.0 // indirect
@@ -105,14 +91,12 @@ require (
 	github.com/lestrrat-go/option v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-ieproxy v0.0.1 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4 // indirect
 	github.com/minio/colorjson v1.0.2 // indirect
 	github.com/minio/filepath v1.0.0 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
@@ -120,37 +104,27 @@ require (
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.6.6 // indirect
 	github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/navidys/tvxwidgets v0.1.0 // indirect
 	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/pelletier/go-toml v1.9.3 // indirect
 	github.com/philhofer/fwd v1.1.2-0.20210722190033-5c56ac6d0bb9 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pkg/xattr v0.4.5 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
-	github.com/prometheus/client_golang v1.12.2 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.33.0 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/prometheus/prom2json v1.3.1 // indirect
 	github.com/rivo/tview v0.0.0-20220216162559-96063d6082f3 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rjeczalik/notify v0.9.2 // indirect
-	github.com/shirou/gopsutil/v3 v3.22.7 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.8.1 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/shirou/gopsutil/v3 v3.22.2 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tinylib/msgp v1.1.7-0.20211026165309-e818a1881b0e // indirect
@@ -160,12 +134,12 @@ require (
 	go.etcd.io/etcd/api/v3 v3.5.2 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.2 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.2 // indirect
-	go.mongodb.org/mongo-driver v1.9.1 // indirect
+	go.mongodb.org/mongo-driver v1.8.4 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
+	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
@@ -175,11 +149,12 @@ require (
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/h2non/filetype.v1 v1.0.5 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.66.6 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.24.3 // indirect
-	k8s.io/klog/v2 v2.60.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/klog/v2 v2.40.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf // indirect
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
+	maze.io/x/duration v0.0.0-20160924141736-faac084b6075 // indirect
 	sigs.k8s.io/controller-runtime v0.11.1 // indirect
 	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
--- a/go.sum
+++ b/go.sum
--- a/integration/access_rules_test.go
+++ b/integration/access_rules_test.go
@@ -1,216 +0,0 @@
-// 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 <http://www.gnu.org/licenses/>.
-
-package integration
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"log"
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func Test_AddAccessRuleAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddBucket("testaccessruleadd", false, false, nil, nil)
-
-	type args struct {
-		bucket string
-		prefix string
-		access string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Create Access Rule - Valid",
-			args: args{
-				bucket: "testaccessruleadd",
-				prefix: "/test/",
-				access: "readonly",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Add Access Rule - Invalid",
-			args: args{
-				bucket: "testaccessruleadd",
-				prefix: "/test/",
-				access: "readonl",
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-		{
-			name: "Add Access Rule - Invalid Bucket",
-			args: args{
-				bucket: "fakebucket",
-				prefix: "/test/",
-				access: "readonl",
-			},
-			expectedStatus: 404,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-			requestDataPolicy["prefix"] = tt.args.prefix
-			requestDataPolicy["access"] = tt.args.access
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/bucket/%s/access-rules", tt.args.bucket), requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
-
-func Test_GetAccessRulesAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddBucket("testaccessruleget", false, false, nil, nil)
-
-	type args struct {
-		bucket string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Get Access Rule - Valid",
-			args: args{
-				bucket: "testaccessruleget",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/bucket/%s/access-rules", tt.args.bucket), nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
-
-func Test_DeleteAccessRuleAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddBucket("testaccessruledelete", false, false, nil, nil)
-
-	type args struct {
-		prefix string
-		access string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Delete Access Rule - Valid",
-			args: args{
-				prefix: "/test/",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-			requestDataPolicy["prefix"] = tt.args.prefix
-			requestDataPolicy["access"] = tt.args.access
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"DELETE", "http://localhost:9090/api/v1/bucket/testaccessruledelete/access-rules", requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
--- a/integration/admin_api_integration_test.go
+++ b/integration/admin_api_integration_test.go
@@ -154,6 +154,7 @@ func NotifyPostgres() (*http.Response, error) {
 }

 func TestNotifyPostgres(t *testing.T) {
+
 	// Variables
 	assert := assert.New(t)

@@ -169,9 +170,11 @@ func TestNotifyPostgres(t *testing.T) {
 	if response != nil {
 		assert.Equal(200, response.StatusCode, finalResponse)
 	}
+
 }

 func TestRestartService(t *testing.T) {
+
 	assert := assert.New(t)
 	restartResponse, restartError := RestartService()
 	assert.Nil(restartError)
@@ -187,6 +190,7 @@ func TestRestartService(t *testing.T) {
 			addObjRsp,
 		)
 	}
+
 }

 func ListPoliciesWithBucket(bucketName string) (*http.Response, error) {
@@ -210,6 +214,7 @@ func ListPoliciesWithBucket(bucketName string) (*http.Response, error) {
 }

 func TestListPoliciesWithBucket(t *testing.T) {
+
 	// Test Variables
 	bucketName := "testlistpolicieswithbucket"
 	assert := assert.New(t)
@@ -229,6 +234,7 @@ func TestListPoliciesWithBucket(t *testing.T) {
 			parsedResponse,
 		)
 	}
+
 }

 func ListUsersWithAccessToBucket(bucketName string) (*http.Response, error) {
@@ -252,6 +258,7 @@ func ListUsersWithAccessToBucket(bucketName string) (*http.Response, error) {
 }

 func TestListUsersWithAccessToBucket(t *testing.T) {
+
 	// Test Variables
 	bucketName := "testlistuserswithaccesstobucket1"
 	assert := assert.New(t)
@@ -271,9 +278,11 @@ func TestListUsersWithAccessToBucket(t *testing.T) {
 			parsedResponse,
 		)
 	}
+
 }

 func TestGetNodes(t *testing.T) {
+
 	assert := assert.New(t)
 	getNodesResponse, getNodesError := GetNodes()
 	assert.Nil(getNodesError)
@@ -289,6 +298,7 @@ func TestGetNodes(t *testing.T) {
 			addObjRsp,
 		)
 	}
+
 }

 func ArnList() (*http.Response, error) {
--- a/integration/buckets_test.go
+++ b/integration/buckets_test.go
@@ -56,7 +56,8 @@ func inspectHTTPResponse(httpResponse *http.Response) string {
 }

 func initConsoleServer() (*restapi.Server, error) {
-	// os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")
+
+	//os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")

 	swaggerSpec, err := loads.Embedded(restapi.SwaggerJSON, restapi.FlatSwaggerJSON)
 	if err != nil {
@@ -78,7 +79,7 @@ func initConsoleServer() (*restapi.Server, error) {
 	// register all APIs
 	server.ConfigureAPI()

-	// restapi.GlobalRootCAs, restapi.GlobalPublicCerts, restapi.GlobalTLSCertsManager = globalRootCAs, globalPublicCerts, globalTLSCerts
+	//restapi.GlobalRootCAs, restapi.GlobalPublicCerts, restapi.GlobalTLSCertsManager = globalRootCAs, globalPublicCerts, globalTLSCerts

 	consolePort, _ := strconv.Atoi("9090")

@@ -91,6 +92,7 @@ func initConsoleServer() (*restapi.Server, error) {
 }

 func TestMain(m *testing.M) {
+
 	// start console server
 	go func() {
 		fmt.Println("start server")
@@ -101,6 +103,7 @@ func TestMain(m *testing.M) {
 			return
 		}
 		srv.Serve()
+
 	}()

 	fmt.Println("sleeping")
@@ -129,6 +132,7 @@ func TestMain(m *testing.M) {
 	request.Header.Add("Content-Type", "application/json")

 	response, err := client.Do(request)
+
 	if err != nil {
 		log.Println(err)
 		return
@@ -158,7 +162,7 @@ func TestMain(m *testing.M) {

 	requestDataBody = bytes.NewReader(requestDataJSON)

-	// delete bucket
+	// get list of buckets
 	request, err = http.NewRequest("DELETE", "http://localhost:9090/api/v1/buckets/test1", requestDataBody)
 	if err != nil {
 		log.Println(err)
--- a/integration/config_test.go
+++ b/integration/config_test.go
@@ -31,48 +31,8 @@ import (
 func Test_ConfigAPI(t *testing.T) {
 	assert := assert.New(t)

-	tests := []struct {
-		name           string
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name:           "Config - Valid",
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	client := &http.Client{
-		Timeout: 3 * time.Second,
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			request, err := http.NewRequest("GET", "http://localhost:9090/api/v1/configs", nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
-	}
-}
-
-func Test_GetConfigAPI(t *testing.T) {
-	assert := assert.New(t)
-
 	type args struct {
-		name string
+		api string
 	}
 	tests := []struct {
 		name           string
@@ -81,146 +41,18 @@ func Test_GetConfigAPI(t *testing.T) {
 		expectedError  error
 	}{
 		{
-			name: "Get Config - Valid",
+			name: "Config - Valid",
 			args: args{
-				name: "storage_class",
+				api: "/configs",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
 		},
-		{
-			name: "Get Config - Invalid",
-			args: args{
-				name: "asdf",
-			},
-			expectedStatus: 404,
-			expectedError:  nil,
-		},
 	}

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}

-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/configs/%s", tt.args.name), nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
-	}
-}
-
-func Test_SetConfigAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	type args struct {
-		name      string
-		keyValues []map[string]interface{}
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Set Config - Valid",
-			args: args{
-				name:      "region",
-				keyValues: []map[string]interface{}{{"key": "name", "value": "testServer"}, {"key": "region", "value": "us-west-1"}},
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Set Config - Invalid",
-			args: args{
-				name:      "regiontest",
-				keyValues: []map[string]interface{}{{"key": "name", "value": "testServer"}, {"key": "region", "value": "us-west-1"}},
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-
-			requestDataPolicy["key_values"] = tt.args.keyValues
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/configs/%s", tt.args.name), requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
-	}
-}
-
-func Test_ResetConfigAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	type args struct {
-		name string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Reset Config - Valid",
-			args: args{
-				name: "region",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Reset Config - Invalid",
-			args: args{
-				name: "regiontest",
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -230,7 +62,7 @@ func Test_ResetConfigAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				"POST", fmt.Sprintf("http://localhost:9090/api/v1/configs/%s/reset", tt.args.name), requestDataBody)
+				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -247,4 +79,5 @@ func Test_ResetConfigAPI(t *testing.T) {
 			}
 		})
 	}
+
 }
--- a/integration/groups_test.go
+++ b/integration/groups_test.go
@@ -18,7 +18,6 @@ package integration

 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -35,6 +34,7 @@ func Test_AddGroupAPI(t *testing.T) {
 	AddUser("member1", "testtest", []string{}, []string{"consoleAdmin"})

 	type args struct {
+		api     string
 		group   string
 		members []string
 	}
@@ -47,6 +47,7 @@ func Test_AddGroupAPI(t *testing.T) {
 		{
 			name: "Create Group - Valid",
 			args: args{
+				api:     "/groups",
 				group:   "test",
 				members: []string{"member1"},
 			},
@@ -56,6 +57,7 @@ func Test_AddGroupAPI(t *testing.T) {
 		{
 			name: "Create Group - Invalid",
 			args: args{
+				api:     "/groups",
 				group:   "test",
 				members: []string{},
 			},
@@ -66,10 +68,13 @@ func Test_AddGroupAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}

+			// Add policy
+
 			requestDataPolicy := map[string]interface{}{}
 			requestDataPolicy["group"] = tt.args.group
 			requestDataPolicy["members"] = tt.args.members
@@ -77,7 +82,7 @@ func Test_AddGroupAPI(t *testing.T) {
 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				"POST", "http://localhost:9090/api/v1/groups", requestDataBody)
+				"POST", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -92,188 +97,10 @@ func Test_AddGroupAPI(t *testing.T) {
 			if response != nil {
 				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
 			}
+
 		})
 	}
-}

-func Test_GetGroupAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddUser("member2", "testtest", []string{}, []string{"consoleAdmin"})
-	AddGroup("getgroup1", []string{"member2"})
-
-	type args struct {
-		api string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Get Group - Valid",
-			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("getgroup1")),
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Get Group - Invalid",
-			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("askfjalkd")),
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
-
-func Test_ListGroupsAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	tests := []struct {
-		name           string
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name:           "Get Group - Valid",
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"GET", "http://localhost:9090/api/v1/groups", requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
-}
-
-func Test_PutGroupsAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	AddUser("member3", "testtest", []string{}, []string{"consoleAdmin"})
-	AddGroup("putgroup1", []string{})
-
-	type args struct {
-		api     string
-		members []string
-		status  string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Put Group - Valid",
-			args: args{
-				api:     base64.StdEncoding.EncodeToString([]byte("putgroup1")),
-				members: []string{"member3"},
-				status:  "enabled",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-		{
-			name: "Put Group - Invalid",
-			args: args{
-				api:     base64.StdEncoding.EncodeToString([]byte("gdgfdfgd")),
-				members: []string{"member3"},
-				status:  "enabled",
-			},
-			expectedStatus: 500,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			requestDataPolicy := map[string]interface{}{}
-
-			requestDataPolicy["members"] = tt.args.members
-			requestDataPolicy["status"] = tt.args.status
-
-			requestDataJSON, _ := json.Marshal(requestDataPolicy)
-			requestDataBody := bytes.NewReader(requestDataJSON)
-			request, err := http.NewRequest(
-				"PUT", fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
-			}
-		})
-	}
 }

 func Test_DeleteGroupAPI(t *testing.T) {
@@ -293,28 +120,19 @@ func Test_DeleteGroupAPI(t *testing.T) {
 	}{
 		{
 			name: "Delete Group - Valid",
+			verb: "DELETE",
 			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("grouptests1")),
+				api: "/group?name=grouptests1",
 			},
-			verb:           "DELETE",
 			expectedStatus: 204,
 			expectedError:  nil,
 		},
-		{
-			name: "Delete Group - Invalid",
-			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("grouptests12345")),
-			},
-			verb:           "DELETE",
-			expectedStatus: 404,
-			expectedError:  nil,
-		},
 		{
 			name: "Access Group After Delete - Invalid",
+			verb: "GET",
 			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("grouptests1")),
+				api: "/group?name=grouptests1",
 			},
-			verb:           "GET",
 			expectedStatus: 500,
 			expectedError:  nil,
 		},
@@ -322,16 +140,19 @@ func Test_DeleteGroupAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}

+			// Add policy
+
 			requestDataPolicy := map[string]interface{}{}

 			requestDataJSON, _ := json.Marshal(requestDataPolicy)
 			requestDataBody := bytes.NewReader(requestDataJSON)
 			request, err := http.NewRequest(
-				tt.verb, fmt.Sprintf("http://localhost:9090/api/v1/group/%s", tt.args.api), requestDataBody)
+				tt.verb, fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), requestDataBody)
 			if err != nil {
 				log.Println(err)
 				return
@@ -346,6 +167,8 @@ func Test_DeleteGroupAPI(t *testing.T) {
 			if response != nil {
 				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
 			}
+
 		})
 	}
+
 }
--- a/integration/inspect_test.go
+++ b/integration/inspect_test.go
@@ -1,106 +0,0 @@
-package integration
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func Inspect(volume string, file string, enc bool) (*http.Response, error) {
-	requestURL := fmt.Sprintf("http://localhost:9090/api/v1/admin/inspect?volume=%s&file=%s&encrypt=%t", volume, file, enc)
-	request, err := http.NewRequest(
-		"GET", requestURL, nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestInspect(t *testing.T) {
-	assert := assert.New(t)
-
-	type args struct {
-		volume  string
-		file    string
-		encrypt bool
-	}
-
-	// Inspect returns successful response always
-	tests := []struct {
-		name          string
-		args          args
-		expStatusCode int
-		expectedError bool
-	}{
-		{
-			name: "Test Invalid Path",
-			args: args{
-				volume:  "/test-with-slash",
-				file:    "/test-with-slash",
-				encrypt: false,
-			},
-			expStatusCode: 200,
-			expectedError: false,
-		},
-
-		{
-			name: "Test Invalid characters in Path",
-			args: args{
-				volume:  "//test",
-				file:    "//bucket",
-				encrypt: false,
-			},
-			expStatusCode: 200,
-			expectedError: true,
-		},
-		{
-			name: "Test valid bucket",
-			args: args{
-				volume:  "test-bucket",
-				file:    "test.txt",
-				encrypt: true,
-			},
-			expStatusCode: 200,
-			expectedError: false,
-		},
-		{
-			name: "Test Empty Path", // Un processable entity error
-			args: args{
-				volume:  "",
-				file:    "",
-				encrypt: false,
-			},
-			expStatusCode: 422,
-			expectedError: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resp, err := Inspect(tt.args.volume, tt.args.file, tt.args.encrypt)
-			if tt.expectedError {
-				assert.Nil(err)
-				if err != nil {
-					log.Println(err)
-					return
-				}
-			}
-			if resp != nil {
-				assert.Equal(
-					tt.expStatusCode,
-					resp.StatusCode,
-				)
-			}
-		})
-	}
-}
--- a/integration/login_test.go
+++ b/integration/login_test.go
@@ -32,6 +32,7 @@ import (
 )

 func TestLoginStrategy(t *testing.T) {
+
 	assert := assert.New(t)

 	// image for now:
@@ -69,9 +70,11 @@ func TestLoginStrategy(t *testing.T) {
 		assert.Equal(models.LoginDetailsLoginStrategyForm, loginDetails.LoginStrategy, "Login Details don't match")

 	}
+
 }

 func TestLogout(t *testing.T) {
+
 	assert := assert.New(t)

 	// image for now:
@@ -130,34 +133,5 @@ func TestLogout(t *testing.T) {
 	assert.NotNil(response, "Logout response is nil")
 	assert.Nil(err, "Logout errored out")
 	assert.Equal(response.StatusCode, 200)
-}
-
-func TestBadLogin(t *testing.T) {
-	assert := assert.New(t)
-
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	requestData := map[string]string{
-		"accessKey": "minioadmin",
-		"secretKey": "minioadminbad",
-	}
-
-	requestDataJSON, _ := json.Marshal(requestData)
-
-	requestDataBody := bytes.NewReader(requestDataJSON)
-
-	request, err := http.NewRequest("POST", "http://localhost:9090/api/v1/login", requestDataBody)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	request.Header.Add("Content-Type", "application/json")
-
-	response, err := client.Do(request)
-
-	assert.Equal(401, response.StatusCode, "Login request not rejected")
-	assert.NotNil(response, "Login response is  nil")
-	assert.Nil(err, "Login errored out")
+
 }
--- a/integration/objects_test.go
+++ b/integration/objects_test.go
@@ -34,6 +34,7 @@ import (
 )

 func TestObjectGet(t *testing.T) {
+
 	// for setup we'll create a bucket and upload a file
 	endpoint := "localhost:9000"
 	accessKeyID := "minioadmin"
@@ -193,4 +194,5 @@ func TestObjectGet(t *testing.T) {
 			}
 		})
 	}
+
 }
--- a/integration/policy_test.go
+++ b/integration/policy_test.go
@@ -18,7 +18,6 @@ package integration

 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -32,7 +31,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func AddPolicy(name, definition string) (*http.Response, error) {
+func AddPolicy(name string, definition string) (*http.Response, error) {
 	/*
 		This is an atomic function to add user and can be reused across
 		different functions.
@@ -60,7 +59,7 @@ func AddPolicy(name, definition string) (*http.Response, error) {
 	return response, err
 }

-func SetPolicy(policies []string, entityName, entityType string) (*http.Response, error) {
+func SetPolicy(policies []string, entityName string, entityType string) (*http.Response, error) {
 	/*
 		This is an atomic function to add user and can be reused across
 		different functions.
@@ -154,35 +153,11 @@ func Test_AddPolicyAPI(t *testing.T) {
 			expectedStatus: 500,
 			expectedError:  nil,
 		},
-		{
-			name: "Create Policy - Space in Name",
-			args: args{
-				api:  "/policies",
-				name: "space test",
-				policy: swag.String(`
-  {
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Effect": "Allow",
-      "Action": [
-        "s3:GetBucketLocation",
-        "s3:GetObject"
-      ],
-      "Resource": [
-        "arn:aws:s3:::*"
-      ]
-    }
-  ]
-}`),
-			},
-			expectedStatus: 400,
-			expectedError:  nil,
-		},
 	}

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -213,6 +188,7 @@ func Test_AddPolicyAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_SetPolicyAPI(t *testing.T) {
@@ -297,6 +273,7 @@ func Test_SetPolicyAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -328,6 +305,7 @@ func Test_SetPolicyAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_SetPolicyMultipleAPI(t *testing.T) {
@@ -409,6 +387,7 @@ func Test_SetPolicyMultipleAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -438,6 +417,7 @@ func Test_SetPolicyMultipleAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_ListPoliciesAPI(t *testing.T) {
@@ -464,6 +444,7 @@ func Test_ListPoliciesAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -486,6 +467,7 @@ func Test_ListPoliciesAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_GetPolicyAPI(t *testing.T) {
@@ -520,7 +502,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 		{
 			name: "Get Policies - Invalid",
 			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("test3")),
+				api: "/policy?name=test3",
 			},
 			expectedStatus: 500,
 			expectedError:  nil,
@@ -528,7 +510,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 		{
 			name: "Get Policies - Valid",
 			args: args{
-				api: base64.StdEncoding.EncodeToString([]byte("getpolicytest")),
+				api: "/policy?name=getpolicytest",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -537,12 +519,13 @@ func Test_GetPolicyAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}

 			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1/policy/%s", tt.args.api), nil)
+				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
 			if err != nil {
 				log.Println(err)
 				return
@@ -559,6 +542,7 @@ func Test_GetPolicyAPI(t *testing.T) {
 			}
 		})
 	}
+
 }

 func Test_PolicyListUsersAPI(t *testing.T) {
@@ -595,7 +579,7 @@ func Test_PolicyListUsersAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Valid",
 			args: args{
-				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("policylistusers")) + "/users",
+				api: "/policies/policylistusers/users",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -603,7 +587,7 @@ func Test_PolicyListUsersAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Invalid",
 			args: args{
-				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("test2")) + "/users",
+				api: "/policies/test2/users",
 			},
 			expectedStatus: 404,
 			expectedError:  nil,
@@ -612,6 +596,7 @@ func Test_PolicyListUsersAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -636,8 +621,10 @@ func Test_PolicyListUsersAPI(t *testing.T) {
 					assert.Equal("[\"policyuser4\"]\n", string(bodyBytes))
 				}
 			}
+
 		})
 	}
+
 }

 func Test_PolicyListGroupsAPI(t *testing.T) {
@@ -674,7 +661,7 @@ func Test_PolicyListGroupsAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Valid",
 			args: args{
-				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("policylistgroups")) + "/groups",
+				api: "/policies/policylistgroups/groups",
 			},
 			expectedStatus: 200,
 			expectedError:  nil,
@@ -682,7 +669,7 @@ func Test_PolicyListGroupsAPI(t *testing.T) {
 		{
 			name: "List Users for Policy - Invalid",
 			args: args{
-				api: "/policies/" + base64.StdEncoding.EncodeToString([]byte("test3")) + "/groups",
+				api: "/policies/test3/groups",
 			},
 			expectedStatus: 404,
 			expectedError:  nil,
@@ -691,6 +678,7 @@ func Test_PolicyListGroupsAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -715,8 +703,10 @@ func Test_PolicyListGroupsAPI(t *testing.T) {
 					assert.Equal("[\"testgroup12345\"]\n", string(bodyBytes))
 				}
 			}
+
 		})
 	}
+
 }

 func Test_DeletePolicyAPI(t *testing.T) {
@@ -751,7 +741,7 @@ func Test_DeletePolicyAPI(t *testing.T) {
 		{
 			name: "Delete Policies - Valid",
 			args: args{
-				api:    base64.StdEncoding.EncodeToString([]byte("testdelete")),
+				api:    "/policy?name=testdelete",
 				method: "DELETE",
 			},
 			expectedStatus: 204,
@@ -760,7 +750,7 @@ func Test_DeletePolicyAPI(t *testing.T) {
 		{
 			name: "Get Policy After Delete - Invalid",
 			args: args{
-				api:    base64.StdEncoding.EncodeToString([]byte("testdelete")),
+				api:    "/policy?name=testdelete",
 				method: "GET",
 			},
 			expectedStatus: 500,
@@ -770,12 +760,13 @@ func Test_DeletePolicyAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}

 			request, err := http.NewRequest(
-				tt.args.method, fmt.Sprintf("http://localhost:9090/api/v1/policy/%s", tt.args.api), nil)
+				tt.args.method, fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
 			if err != nil {
 				log.Println(err)
 				return
@@ -792,71 +783,5 @@ func Test_DeletePolicyAPI(t *testing.T) {
 			}
 		})
 	}
-}

-func Test_GetAUserPolicyAPI(t *testing.T) {
-	assert := assert.New(t)
-	// Create a User with a Policy to use for testing
-	groups := []string{}
-	policies := []string{"readwrite"}
-	_, err := AddUser("getuserpolicyuser", "secretKey", groups, policies)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	// encode usernames to pass to api
-	bName := []byte("getuserpolicyuser")
-	fName := []byte("failname")
-	encodedName := base64.URLEncoding.EncodeToString(bName)
-	encodedFailName := base64.URLEncoding.EncodeToString(fName)
-
-	type args struct {
-		api string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Get User Policy - Invalid",
-			args: args{
-				api: "/user/" + encodedFailName + "/policies",
-			},
-			expectedStatus: 401,
-			expectedError:  nil,
-		},
-		{
-			name: "Get User Policy - Valid",
-			args: args{
-				api: "/user/" + encodedName + "/policies",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
-	}
 }
--- a/integration/profiling_test.go
+++ b/integration/profiling_test.go
@@ -20,16 +20,18 @@ import (
 	"archive/zip"
 	"bytes"
 	"fmt"
+	"io"
 	"log"
 	"net/http"
+	"strings"
 	"testing"
+	"time"

-	"github.com/gorilla/websocket"
 	"github.com/stretchr/testify/assert"
 )

 func TestStartProfiling(t *testing.T) {
-	testAssert := assert.New(t)
+	testAsser := assert.New(t)

 	tests := []struct {
 		name string
@@ -41,6 +43,7 @@ func TestStartProfiling(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			files := map[string]bool{
 				"profile-127.0.0.1:9000-goroutines.txt":                false,
 				"profile-127.0.0.1:9000-goroutines-before.txt":         false,
@@ -56,28 +59,53 @@ func TestStartProfiling(t *testing.T) {
 				"profile-127.0.0.1:9000-mutex-before.pprof":            false,
 			}

-			wsDestination := "/ws/profile?types=cpu,mem,block,mutex,trace,threads,goroutines"
-			wsFinalURL := fmt.Sprintf("ws://localhost:9090%s", wsDestination)
-
-			ws, _, err := websocket.DefaultDialer.Dial(wsFinalURL, nil)
-			if err != nil {
-				log.Println(err)
-				return
+			client := &http.Client{
+				Timeout: 3 * time.Second,
 			}
-			defer ws.Close()

-			_, zipFileBytes, err := ws.ReadMessage()
+			destination := "/api/v1/profiling/start"
+			finalURL := fmt.Sprintf("http://localhost:9090%s", destination)
+			request, err := http.NewRequest("POST", finalURL, strings.NewReader("{\"type\":\"cpu,mem,block,mutex,trace,threads,goroutines\"}"))
 			if err != nil {
 				log.Println(err)
 				return
 			}

+			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
+			request.Header.Add("Content-Type", "application/json")
+
+			response, err := client.Do(request)
+
+			testAsser.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
+			testAsser.Equal(201, response.StatusCode)
+
+			time.Sleep(5 * time.Second)
+
+			destination = "/api/v1/profiling/stop"
+			finalURL = fmt.Sprintf("http://localhost:9090%s", destination)
+			request, err = http.NewRequest("POST", finalURL, nil)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+
+			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
+			request.Header.Add("Content-Type", "application/json")
+
+			response, err = client.Do(request)
+
+			testAsser.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
+			testAsser.Equal(200, response.StatusCode)
+			zipFileBytes, err := io.ReadAll(response.Body)
+			if err != nil {
+				testAsser.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
+			}
 			filetype := http.DetectContentType(zipFileBytes)
-			testAssert.Equal("application/zip", filetype)
+			testAsser.Equal("application/zip", filetype)

 			zipReader, err := zip.NewReader(bytes.NewReader(zipFileBytes), int64(len(zipFileBytes)))
 			if err != nil {
-				testAssert.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
+				testAsser.Nil(err, fmt.Sprintf("%s returned an error: %v", tt.name, err))
 			}

 			// Read all the files from zip archive
@@ -86,7 +114,7 @@ func TestStartProfiling(t *testing.T) {
 			}

 			for k, v := range files {
-				testAssert.Equal(true, v, fmt.Sprintf("%s : compressed file expected to have %v file inside", tt.name, k))
+				testAsser.Equal(true, v, fmt.Sprintf("%s : compressed file expected to have %v file inside", tt.name, k))
 			}
 		})
 	}
--- a/integration/service_account_test.go
+++ b/integration/service_account_test.go
@@ -18,7 +18,6 @@ package integration

 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -75,8 +74,7 @@ func TestAddServiceAccount(t *testing.T) {
 		assert.Equal(201, response.StatusCode, "Status Code is incorrect")
 	}

-	requestDataPolicy := map[string]interface{}{
-		"policy": `
+	requestDataPolicy := map[string]interface{}{"policy": `
  {
  "Version": "2012-10-17",
  "Statement": [
@@ -96,7 +94,7 @@ func TestAddServiceAccount(t *testing.T) {
 	requestDataJSON, _ = json.Marshal(requestDataPolicy)
 	requestDataBody = bytes.NewReader(requestDataJSON)
 	request, err = http.NewRequest(
-		"PUT", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1"))+"/policy", requestDataBody)
+		"PUT", "http://localhost:9090/api/v1/service-accounts/testuser1/policy", requestDataBody)
 	if err != nil {
 		log.Println(err)
 		return
@@ -115,7 +113,7 @@ func TestAddServiceAccount(t *testing.T) {

 	// Test policy
 	request, err = http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1"))+"/policy", nil)
+		"GET", "http://localhost:9090/api/v1/service-accounts/testuser1/policy", nil)
 	if err != nil {
 		log.Println(err)
 		return
@@ -147,7 +145,7 @@ func TestAddServiceAccount(t *testing.T) {
 	// {{baseUrl}}/user?name=proident velit
 	// Investiga como se borra en el browser.
 	request, err = http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/service-accounts/"+base64.StdEncoding.EncodeToString([]byte("testuser1")), nil)
+		"DELETE", "http://localhost:9090/api/v1/service-accounts/testuser1", nil)
 	if err != nil {
 		log.Println(err)
 		return
@@ -163,6 +161,7 @@ func TestAddServiceAccount(t *testing.T) {
 		fmt.Println("DELETE StatusCode:", response.StatusCode)
 		assert.Equal(204, response.StatusCode, "has to be 204 when delete user")
 	}
+
 }

 func Test_ServiceAccountsAPI(t *testing.T) {
@@ -239,6 +238,7 @@ func Test_ServiceAccountsAPI(t *testing.T) {

 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+
 			client := &http.Client{
 				Timeout: 3 * time.Second,
 			}
@@ -268,8 +268,10 @@ func Test_ServiceAccountsAPI(t *testing.T) {
 			if response != nil {
 				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
 			}
+
 		})
 	}
+
 }

 func DeleteMultipleServiceAccounts(serviceAccounts []string) (*http.Response, error) {
@@ -308,9 +310,9 @@ func TestCreateServiceAccountForUserWithCredentials(t *testing.T) {
 	serviceAccountLengthInBytes := 40 // As observed, update as needed

 	// 1. Create the user
-	groups := []string{}
-	policies := []string{}
-	secretKey := "testcreateserviceaccountforuserwithcrede"
+	var groups = []string{}
+	var policies = []string{}
+	var secretKey = "testcreateserviceaccountforuserwithcrede"
 	response, err := AddUser(userName, "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -403,4 +405,5 @@ func TestCreateServiceAccountForUserWithCredentials(t *testing.T) {
 			inspectHTTPResponse(response),
 		)
 	}
+
 }
--- a/integration/tiers_test.go
+++ b/integration/tiers_test.go
@@ -27,6 +27,7 @@ import (
 )

 func TestTiersList(t *testing.T) {
+
 	assert := assert.New(t)

 	// image for now:
@@ -50,4 +51,5 @@ func TestTiersList(t *testing.T) {
 	assert.NotNil(response, "Tiers List response is nil")
 	assert.Nil(err, "Tiers List errored out")
 	assert.Equal(response.StatusCode, 200)
+
 }
--- a/integration/user_api_bucket_test.go
+++ b/integration/user_api_bucket_test.go
--- a/integration/users_test.go
+++ b/integration/users_test.go
@@ -18,7 +18,6 @@ package integration

 import (
 	"bytes"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -32,7 +31,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func AddUser(accessKey, secretKey string, groups, policies []string) (*http.Response, error) {
+func AddUser(accessKey string, secretKey string, groups []string, policies []string) (*http.Response, error) {
 	/*
 		This is an atomic function to add user and can be reused across
 		different functions.
@@ -63,7 +62,6 @@ func AddUser(accessKey, secretKey string, groups, policies []string) (*http.Resp
 }

 func DeleteUser(userName string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		This is an atomic function to delete user and can be reused across
 		different functions.
@@ -72,7 +70,7 @@ func DeleteUser(userName string) (*http.Response, error) {
 		Timeout: 3 * time.Second,
 	}
 	request, err := http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/user/"+userName, nil)
+		"DELETE", "http://localhost:9090/api/v1/user?name="+userName, nil)
 	if err != nil {
 		log.Println(err)
 	}
@@ -82,7 +80,7 @@ func DeleteUser(userName string) (*http.Response, error) {
 	return response, err
 }

-func ListUsers(offset, limit string) (*http.Response, error) {
+func ListUsers(offset string, limit string) (*http.Response, error) {
 	/*
 		This is an atomic function to list users.
 		{{baseUrl}}/users?offset=-5480083&limit=-5480083
@@ -104,7 +102,6 @@ func ListUsers(offset, limit string) (*http.Response, error) {
 }

 func GetUserInformation(userName string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to get user information via API:
 		{{baseUrl}}/user?name=proident velit
@@ -114,7 +111,7 @@ func GetUserInformation(userName string) (*http.Response, error) {
 	}
 	request, err := http.NewRequest(
 		"GET",
-		"http://localhost:9090/api/v1/user/"+userName,
+		"http://localhost:9090/api/v1/user?name="+userName,
 		nil)
 	if err != nil {
 		log.Println(err)
@@ -125,8 +122,7 @@ func GetUserInformation(userName string) (*http.Response, error) {
 	return response, err
 }

-func UpdateUserInformation(name, status string, groups []string) (*http.Response, error) {
-	name = base64.StdEncoding.EncodeToString([]byte(name))
+func UpdateUserInformation(name string, status string, groups []string) (*http.Response, error) {
 	/*
 		Helper function to update user information:
 		PUT: {{baseUrl}}/user?name=proident velit
@@ -149,7 +145,7 @@ func UpdateUserInformation(name, status string, groups []string) (*http.Response
 	requestDataJSON, _ := json.Marshal(requestDataAdd)
 	requestDataBody := bytes.NewReader(requestDataJSON)
 	request, err := http.NewRequest(
-		"PUT", "http://localhost:9090/api/v1/user/"+name, requestDataBody)
+		"PUT", "http://localhost:9090/api/v1/user?name="+name, requestDataBody)
 	if err != nil {
 		log.Println(err)
 	}
@@ -160,7 +156,6 @@ func UpdateUserInformation(name, status string, groups []string) (*http.Response
 }

 func RemoveUser(name string) (*http.Response, error) {
-	name = base64.StdEncoding.EncodeToString([]byte(name))
 	/*
 		Helper function to remove user.
 		DELETE: {{baseUrl}}/user?name=proident velit
@@ -169,7 +164,7 @@ func RemoveUser(name string) (*http.Response, error) {
 		Timeout: 3 * time.Second,
 	}
 	request, err := http.NewRequest(
-		"DELETE", "http://localhost:9090/api/v1/user/"+name, nil)
+		"DELETE", "http://localhost:9090/api/v1/user?name="+name, nil)
 	if err != nil {
 		log.Println(err)
 	}
@@ -180,7 +175,6 @@ func RemoveUser(name string) (*http.Response, error) {
 }

 func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to update groups for a user
 		PUT: {{baseUrl}}/user/groups?name=username
@@ -201,7 +195,7 @@ func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, err
 	requestDataBody := bytes.NewReader(requestDataJSON)
 	request, err := http.NewRequest(
 		"PUT",
-		"http://localhost:9090/api/v1/user/"+userName+"/groups",
+		"http://localhost:9090/api/v1/user/groups?name="+userName,
 		requestDataBody,
 	)
 	if err != nil {
@@ -213,8 +207,7 @@ func UpdateGroupsForAUser(userName string, groups []string) (*http.Response, err
 	return response, err
 }

-func CreateServiceAccountForUser(userName, policy string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
+func CreateServiceAccountForUser(userName string, policy string) (*http.Response, error) {
 	/*
 		Helper function to Create Service Account for user
 		POST: api/v1/user/username/service-accounts
@@ -244,8 +237,7 @@ func CreateServiceAccountForUser(userName, policy string) (*http.Response, error
 	return response, err
 }

-func CreateServiceAccountForUserWithCredentials(userName, policy, accessKey, secretKey string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
+func CreateServiceAccountForUserWithCredentials(userName string, policy string, accessKey string, secretKey string) (*http.Response, error) {
 	// Helper function to test "Create Service Account for User With Credentials" end point.
 	client := &http.Client{
 		Timeout: 3 * time.Second,
@@ -272,7 +264,6 @@ func CreateServiceAccountForUserWithCredentials(userName, policy, accessKey, sec
 }

 func ReturnsAListOfServiceAccountsForAUser(userName string) (*http.Response, error) {
-	userName = base64.StdEncoding.EncodeToString([]byte(userName))
 	/*
 		Helper function to return a list of service accounts for a user.
 		GET: {{baseUrl}}/user/:name/service-accounts
@@ -321,7 +312,7 @@ func AddGroup(group string, members []string) (*http.Response, error) {
 	return response, err
 }

-func UsersGroupsBulk(users, groups []string) (*http.Response, error) {
+func UsersGroupsBulk(users []string, groups []string) (*http.Response, error) {
 	/*
 		Helper function to test Bulk functionality to Add Users to Groups.
 		PUT: {{baseUrl}}/users-groups-bulk
@@ -372,8 +363,8 @@ func TestAddUser(t *testing.T) {
 	assert := assert.New(t)

 	// With no groups & no policies
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	response, err := AddUser("accessKey", "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -393,6 +384,7 @@ func TestAddUser(t *testing.T) {
 		fmt.Println("DELETE StatusCode:", response.StatusCode)
 		assert.Equal(204, response.StatusCode, "has to be 204 when delete user")
 	}
+
 }

 func TestListUsers(t *testing.T) {
@@ -406,8 +398,8 @@ func TestListUsers(t *testing.T) {
 	assert := assert.New(t)

 	// With no groups & no policies
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}

 	// 1. Create the users
 	numberOfUsers := 5
@@ -462,6 +454,7 @@ func TestListUsers(t *testing.T) {
 				response.StatusCode, "has to be 204 when delete user")
 		}
 	}
+
 }

 func TestGetUserInfo(t *testing.T) {
@@ -472,8 +465,8 @@ func TestGetUserInfo(t *testing.T) {
 	// 1. Create the user
 	fmt.Println("TestGetUserInfo(): 1. Create the user")
 	assert := assert.New(t)
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	response, err := AddUser("accessKey", "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -507,6 +500,7 @@ func TestGetUserInfo(t *testing.T) {
 	expected := "{\"accessKey\":\"accessKey\",\"memberOf\":null,\"policy\":[],\"status\":\"enabled\"}\n"
 	obtained := string(b)
 	assert.Equal(expected, obtained, "User Information is wrong")
+
 }

 func TestUpdateUserInfoSuccessfulResponse(t *testing.T) {
@@ -517,8 +511,8 @@ func TestUpdateUserInfoSuccessfulResponse(t *testing.T) {
 	assert := assert.New(t)

 	// 1. Create an active user
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	addUserResponse, addUserError := AddUser(
 		"updateuser", "secretKey", groups, policies)
 	if addUserError != nil {
@@ -551,6 +545,7 @@ func TestUpdateUserInfoSuccessfulResponse(t *testing.T) {
 		log.Fatalln(err)
 	}
 	assert.True(strings.Contains(string(b), "disabled"))
+
 }

 func TestUpdateUserInfoGenericErrorResponse(t *testing.T) {
@@ -561,8 +556,8 @@ func TestUpdateUserInfoGenericErrorResponse(t *testing.T) {
 	assert := assert.New(t)

 	// 1. Create an active user
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	addUserResponse, addUserError := AddUser(
 		"updateusererror", "secretKey", groups, policies)
 	if addUserError != nil {
@@ -595,6 +590,7 @@ func TestUpdateUserInfoGenericErrorResponse(t *testing.T) {
 		log.Fatalln(err)
 	}
 	assert.True(strings.Contains(string(b), "status not valid"))
+
 }

 func TestRemoveUserSuccessfulResponse(t *testing.T) {
@@ -605,8 +601,8 @@ func TestRemoveUserSuccessfulResponse(t *testing.T) {
 	assert := assert.New(t)

 	// 1. Create an active user
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	addUserResponse, addUserError := AddUser(
 		"testremoveuser1", "secretKey", groups, policies)
 	if addUserError != nil {
@@ -648,6 +644,7 @@ func TestRemoveUserSuccessfulResponse(t *testing.T) {
 	fmt.Println(finalResponse)
 	assert.True(strings.Contains(
 		finalResponse, "The specified user does not exist"), finalResponse)
+
 }

 func TestUpdateGroupsForAUser(t *testing.T) {
@@ -660,8 +657,8 @@ func TestUpdateGroupsForAUser(t *testing.T) {
 	groupName := "updategroupforausergroup"
 	userName := "updategroupsforauser1"
 	assert := assert.New(t)
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	response, err := AddUser(userName, "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -673,7 +670,7 @@ func TestUpdateGroupsForAUser(t *testing.T) {
 	}

 	// 2. Update the groups of the created user with newGroups
-	newGroups := make([]string, 3)
+	var newGroups = make([]string, 3)
 	for i := 0; i < numberOfGroups; i++ {
 		newGroups[i] = groupName + strconv.Itoa(i)
 	}
@@ -704,6 +701,7 @@ func TestUpdateGroupsForAUser(t *testing.T) {
 		assert.True(strings.Contains(
 			finalResponse, groupName+strconv.Itoa(i)), finalResponse)
 	}
+
 }

 func TestCreateServiceAccountForUser(t *testing.T) {
@@ -718,8 +716,8 @@ func TestCreateServiceAccountForUser(t *testing.T) {
 	serviceAccountLengthInBytes := 40 // As observed, update as needed

 	// 1. Create the user
-	groups := []string{}
-	policies := []string{}
+	var groups = []string{}
+	var policies = []string{}
 	response, err := AddUser(userName, "secretKey", groups, policies)
 	if err != nil {
 		log.Println(err)
@@ -749,10 +747,8 @@ func TestCreateServiceAccountForUser(t *testing.T) {
 	}

 	// 3. Verify the service account for the user
-	listOfAccountsResponse, listOfAccountsError := ReturnsAListOfServiceAccountsForAUser(userName)
-
-	fmt.Println(listOfAccountsResponse, listOfAccountsError)
-
+	listOfAccountsResponse,
+		listOfAccountsError := ReturnsAListOfServiceAccountsForAUser(userName)
 	if listOfAccountsError != nil {
 		log.Println(listOfAccountsError)
 		assert.Fail("Error in listOfAccountsError")
@@ -765,8 +761,8 @@ func TestCreateServiceAccountForUser(t *testing.T) {
 			finalResponse,
 		)
 	}
-
 	assert.Equal(len(finalResponse), serviceAccountLengthInBytes, finalResponse)
+
 }

 func TestUsersGroupsBulk(t *testing.T) {
@@ -778,11 +774,11 @@ func TestUsersGroupsBulk(t *testing.T) {
 	assert := assert.New(t)
 	numberOfUsers := 5
 	numberOfGroups := 1
-	// var groups = []string{}
-	policies := []string{}
+	//var groups = []string{}
+	var policies = []string{}
 	username := "testusersgroupbulk"
 	groupName := "testusersgroupsbulkgroupone"
-	members := []string{}
+	var members = []string{}
 	users := make([]string, numberOfUsers)
 	groups := make([]string, numberOfGroups)

@@ -854,69 +850,7 @@ func TestUsersGroupsBulk(t *testing.T) {
 			assert.Equal(200, responseGetUserInfo.StatusCode, finalResponse)
 		}
 		// Make sure the user belongs to the created group
-		assert.True(strings.Contains(finalResponse, groupName))
-	}
-}
-
-func Test_GetUserPolicyAPI(t *testing.T) {
-	assert := assert.New(t)
-
-	// 1. Create an active user with valid policy
-	groups := []string{}
-	policies := []string{"readwrite"}
-	addUserResponse, addUserError := AddUser(
-		"getpolicyuser", "secretKey", groups, policies)
-	if addUserError != nil {
-		log.Println(addUserError)
-		return
-	}
-	if addUserResponse != nil {
-		fmt.Println("StatusCode:", addUserResponse.StatusCode)
-		assert.Equal(
-			201, addUserResponse.StatusCode, "Status Code is incorrect")
-	}
-
-	type args struct {
-		api string
-	}
-	tests := []struct {
-		name           string
-		args           args
-		expectedStatus int
-		expectedError  error
-	}{
-		{
-			name: "Get User Policies",
-			args: args{
-				api: "/user/policy",
-			},
-			expectedStatus: 200,
-			expectedError:  nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client := &http.Client{
-				Timeout: 3 * time.Second,
-			}
-
-			request, err := http.NewRequest(
-				"GET", fmt.Sprintf("http://localhost:9090/api/v1%s", tt.args.api), nil)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-			request.Header.Add("Content-Type", "application/json")
-			response, err := client.Do(request)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if response != nil {
-				assert.Equal(tt.expectedStatus, response.StatusCode, tt.name+" Failed")
-			}
-		})
+		assert.True(strings.Contains(string(finalResponse), groupName))
 	}
+
 }
--- a/integration/version_test.go
+++ b/integration/version_test.go
@@ -68,6 +68,8 @@ func Test_VersionAPI(t *testing.T) {
 			if response != nil {
 				assert.Equal(tt.expectedStatus, response.StatusCode, "Status Code is incorrect")
 			}
+
 		})
 	}
+
 }
--- a/k8s/operator-console/base/console-deployment.yaml
+++ b/k8s/operator-console/base/console-deployment.yaml
@@ -15,7 +15,7 @@ spec:
      serviceAccountName: console-sa
      containers:
        - name: console
-          image: 'minio/console:v0.20.0'
+          image: 'minio/console:v0.16.0'
          imagePullPolicy: "IfNotPresent"
          env:
            - name: CONSOLE_OPERATOR_MODE
--- a/k8s/operator-console/standalone/console-deployment.yaml
+++ b/k8s/operator-console/standalone/console-deployment.yaml
@@ -32,7 +32,7 @@ spec:
    spec:
      containers:
        - name: console
-          image: 'minio/console:v0.20.0'
+          image: 'minio/console:v0.16.0'
          imagePullPolicy: "IfNotPresent"
          env:
            - name: CONSOLE_MINIO_SERVER
--- a/models/a_user_policy_response.go
+++ b/models/a_user_policy_response.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// AUserPolicyResponse a user policy response
-//
-// swagger:model aUserPolicyResponse
-type AUserPolicyResponse struct {
-
-	// policy
-	Policy string `json:"policy,omitempty"`
-}
-
-// Validate validates this a user policy response
-func (m *AUserPolicyResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this a user policy response based on context it is used
-func (m *AUserPolicyResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *AUserPolicyResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *AUserPolicyResponse) UnmarshalBinary(b []byte) error {
-	var res AUserPolicyResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/api_key.go
+++ b/models/api_key.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// APIKey api key
-//
-// swagger:model apiKey
-type APIKey struct {
-
-	// api key
-	APIKey string `json:"apiKey,omitempty"`
-}
-
-// Validate validates this api key
-func (m *APIKey) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this api key based on context it is used
-func (m *APIKey) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *APIKey) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *APIKey) UnmarshalBinary(b []byte) error {
-	var res APIKey
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/condition.go
+++ b/models/condition.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Condition condition
-//
-// swagger:model condition
-type Condition struct {
-
-	// status
-	Status string `json:"status,omitempty"`
-
-	// type
-	Type string `json:"type,omitempty"`
-}
-
-// Validate validates this condition
-func (m *Condition) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this condition based on context it is used
-func (m *Condition) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Condition) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Condition) UnmarshalBinary(b []byte) error {
-	var res Condition
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/config_map.go
+++ b/models/config_map.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// ConfigMap config map
-//
-// swagger:model configMap
-type ConfigMap struct {
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// optional
-	Optional bool `json:"optional,omitempty"`
-}
-
-// Validate validates this config map
-func (m *ConfigMap) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this config map based on context it is used
-func (m *ConfigMap) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *ConfigMap) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *ConfigMap) UnmarshalBinary(b []byte) error {
-	var res ConfigMap
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/container.go
+++ b/models/container.go
@@ -1,309 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Container container
-//
-// swagger:model container
-type Container struct {
-
-	// args
-	Args []string `json:"args"`
-
-	// container ID
-	ContainerID string `json:"containerID,omitempty"`
-
-	// environment variables
-	EnvironmentVariables []*EnvironmentVariable `json:"environmentVariables"`
-
-	// host ports
-	HostPorts []string `json:"hostPorts"`
-
-	// image
-	Image string `json:"image,omitempty"`
-
-	// image ID
-	ImageID string `json:"imageID,omitempty"`
-
-	// last state
-	LastState *State `json:"lastState,omitempty"`
-
-	// mounts
-	Mounts []*Mount `json:"mounts"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// ports
-	Ports []string `json:"ports"`
-
-	// ready
-	Ready bool `json:"ready,omitempty"`
-
-	// restart count
-	RestartCount int64 `json:"restartCount,omitempty"`
-
-	// state
-	State *State `json:"state,omitempty"`
-}
-
-// Validate validates this container
-func (m *Container) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateEnvironmentVariables(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateLastState(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateMounts(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateState(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Container) validateEnvironmentVariables(formats strfmt.Registry) error {
-	if swag.IsZero(m.EnvironmentVariables) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.EnvironmentVariables); i++ {
-		if swag.IsZero(m.EnvironmentVariables[i]) { // not required
-			continue
-		}
-
-		if m.EnvironmentVariables[i] != nil {
-			if err := m.EnvironmentVariables[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *Container) validateLastState(formats strfmt.Registry) error {
-	if swag.IsZero(m.LastState) { // not required
-		return nil
-	}
-
-	if m.LastState != nil {
-		if err := m.LastState.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("lastState")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("lastState")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Container) validateMounts(formats strfmt.Registry) error {
-	if swag.IsZero(m.Mounts) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Mounts); i++ {
-		if swag.IsZero(m.Mounts[i]) { // not required
-			continue
-		}
-
-		if m.Mounts[i] != nil {
-			if err := m.Mounts[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("mounts" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("mounts" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *Container) validateState(formats strfmt.Registry) error {
-	if swag.IsZero(m.State) { // not required
-		return nil
-	}
-
-	if m.State != nil {
-		if err := m.State.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("state")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("state")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this container based on the context it is used
-func (m *Container) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateEnvironmentVariables(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateLastState(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateMounts(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateState(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Container) contextValidateEnvironmentVariables(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.EnvironmentVariables); i++ {
-
-		if m.EnvironmentVariables[i] != nil {
-			if err := m.EnvironmentVariables[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("environmentVariables" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *Container) contextValidateLastState(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.LastState != nil {
-		if err := m.LastState.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("lastState")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("lastState")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Container) contextValidateMounts(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Mounts); i++ {
-
-		if m.Mounts[i] != nil {
-			if err := m.Mounts[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("mounts" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("mounts" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *Container) contextValidateState(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.State != nil {
-		if err := m.State.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("state")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("state")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Container) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Container) UnmarshalBinary(b []byte) error {
-	var res Container
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/csr_element.go
+++ b/models/csr_element.go
@@ -1,154 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// CsrElement csr element
-//
-// swagger:model csrElement
-type CsrElement struct {
-
-	// annotations
-	Annotations []*Annotation `json:"annotations"`
-
-	// deletion grace period seconds
-	DeletionGracePeriodSeconds int64 `json:"deletion_grace_period_seconds,omitempty"`
-
-	// generate name
-	GenerateName string `json:"generate_name,omitempty"`
-
-	// generation
-	Generation int64 `json:"generation,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// namespace
-	Namespace string `json:"namespace,omitempty"`
-
-	// resource version
-	ResourceVersion string `json:"resource_version,omitempty"`
-
-	// status
-	Status string `json:"status,omitempty"`
-}
-
-// Validate validates this csr element
-func (m *CsrElement) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateAnnotations(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *CsrElement) validateAnnotations(formats strfmt.Registry) error {
-	if swag.IsZero(m.Annotations) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Annotations); i++ {
-		if swag.IsZero(m.Annotations[i]) { // not required
-			continue
-		}
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this csr element based on the context it is used
-func (m *CsrElement) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAnnotations(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *CsrElement) contextValidateAnnotations(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Annotations); i++ {
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *CsrElement) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *CsrElement) UnmarshalBinary(b []byte) error {
-	var res CsrElement
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/csr_elements.go
+++ b/models/csr_elements.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// CsrElements csr elements
-//
-// swagger:model csrElements
-type CsrElements struct {
-
-	// csr element
-	CsrElement []*CsrElement `json:"csrElement"`
-}
-
-// Validate validates this csr elements
-func (m *CsrElements) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCsrElement(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *CsrElements) validateCsrElement(formats strfmt.Registry) error {
-	if swag.IsZero(m.CsrElement) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.CsrElement); i++ {
-		if swag.IsZero(m.CsrElement[i]) { // not required
-			continue
-		}
-
-		if m.CsrElement[i] != nil {
-			if err := m.CsrElement[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("csrElement" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("csrElement" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this csr elements based on the context it is used
-func (m *CsrElements) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateCsrElement(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *CsrElements) contextValidateCsrElement(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.CsrElement); i++ {
-
-		if m.CsrElement[i] != nil {
-			if err := m.CsrElement[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("csrElement" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("csrElement" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *CsrElements) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *CsrElements) UnmarshalBinary(b []byte) error {
-	var res CsrElements
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/describe_p_v_c_wrapper.go
+++ b/models/describe_p_v_c_wrapper.go
@@ -1,217 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// DescribePVCWrapper describe p v c wrapper
-//
-// swagger:model describePVCWrapper
-type DescribePVCWrapper struct {
-
-	// access modes
-	AccessModes []string `json:"accessModes"`
-
-	// annotations
-	Annotations []*Annotation `json:"annotations"`
-
-	// capacity
-	Capacity string `json:"capacity,omitempty"`
-
-	// finalizers
-	Finalizers []string `json:"finalizers"`
-
-	// labels
-	Labels []*Label `json:"labels"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// namespace
-	Namespace string `json:"namespace,omitempty"`
-
-	// status
-	Status string `json:"status,omitempty"`
-
-	// storage class
-	StorageClass string `json:"storageClass,omitempty"`
-
-	// volume
-	Volume string `json:"volume,omitempty"`
-
-	// volume mode
-	VolumeMode string `json:"volumeMode,omitempty"`
-}
-
-// Validate validates this describe p v c wrapper
-func (m *DescribePVCWrapper) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateAnnotations(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateLabels(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *DescribePVCWrapper) validateAnnotations(formats strfmt.Registry) error {
-	if swag.IsZero(m.Annotations) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Annotations); i++ {
-		if swag.IsZero(m.Annotations[i]) { // not required
-			continue
-		}
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePVCWrapper) validateLabels(formats strfmt.Registry) error {
-	if swag.IsZero(m.Labels) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Labels); i++ {
-		if swag.IsZero(m.Labels[i]) { // not required
-			continue
-		}
-
-		if m.Labels[i] != nil {
-			if err := m.Labels[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("labels" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("labels" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this describe p v c wrapper based on the context it is used
-func (m *DescribePVCWrapper) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAnnotations(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateLabels(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *DescribePVCWrapper) contextValidateAnnotations(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Annotations); i++ {
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePVCWrapper) contextValidateLabels(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Labels); i++ {
-
-		if m.Labels[i] != nil {
-			if err := m.Labels[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("labels" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("labels" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *DescribePVCWrapper) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *DescribePVCWrapper) UnmarshalBinary(b []byte) error {
-	var res DescribePVCWrapper
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/describe_pod_wrapper.go
+++ b/models/describe_pod_wrapper.go
@@ -1,517 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// DescribePodWrapper describe pod wrapper
-//
-// swagger:model describePodWrapper
-type DescribePodWrapper struct {
-
-	// annotations
-	Annotations []*Annotation `json:"annotations"`
-
-	// conditions
-	Conditions []*Condition `json:"conditions"`
-
-	// containers
-	Containers []*Container `json:"containers"`
-
-	// controller ref
-	ControllerRef string `json:"controllerRef,omitempty"`
-
-	// deletion grace period seconds
-	DeletionGracePeriodSeconds int64 `json:"deletionGracePeriodSeconds,omitempty"`
-
-	// deletion timestamp
-	DeletionTimestamp string `json:"deletionTimestamp,omitempty"`
-
-	// labels
-	Labels []*Label `json:"labels"`
-
-	// message
-	Message string `json:"message,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// namespace
-	Namespace string `json:"namespace,omitempty"`
-
-	// node name
-	NodeName string `json:"nodeName,omitempty"`
-
-	// node selector
-	NodeSelector []*NodeSelector `json:"nodeSelector"`
-
-	// phase
-	Phase string `json:"phase,omitempty"`
-
-	// pod IP
-	PodIP string `json:"podIP,omitempty"`
-
-	// priority
-	Priority int64 `json:"priority,omitempty"`
-
-	// priority class name
-	PriorityClassName string `json:"priorityClassName,omitempty"`
-
-	// qos class
-	QosClass string `json:"qosClass,omitempty"`
-
-	// reason
-	Reason string `json:"reason,omitempty"`
-
-	// start time
-	StartTime string `json:"startTime,omitempty"`
-
-	// tolerations
-	Tolerations []*Toleration `json:"tolerations"`
-
-	// volumes
-	Volumes []*Volume `json:"volumes"`
-}
-
-// Validate validates this describe pod wrapper
-func (m *DescribePodWrapper) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateAnnotations(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateConditions(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateContainers(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateLabels(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateNodeSelector(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateTolerations(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateVolumes(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *DescribePodWrapper) validateAnnotations(formats strfmt.Registry) error {
-	if swag.IsZero(m.Annotations) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Annotations); i++ {
-		if swag.IsZero(m.Annotations[i]) { // not required
-			continue
-		}
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateConditions(formats strfmt.Registry) error {
-	if swag.IsZero(m.Conditions) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Conditions); i++ {
-		if swag.IsZero(m.Conditions[i]) { // not required
-			continue
-		}
-
-		if m.Conditions[i] != nil {
-			if err := m.Conditions[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("conditions" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("conditions" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateContainers(formats strfmt.Registry) error {
-	if swag.IsZero(m.Containers) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Containers); i++ {
-		if swag.IsZero(m.Containers[i]) { // not required
-			continue
-		}
-
-		if m.Containers[i] != nil {
-			if err := m.Containers[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("containers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("containers" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateLabels(formats strfmt.Registry) error {
-	if swag.IsZero(m.Labels) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Labels); i++ {
-		if swag.IsZero(m.Labels[i]) { // not required
-			continue
-		}
-
-		if m.Labels[i] != nil {
-			if err := m.Labels[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("labels" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("labels" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateNodeSelector(formats strfmt.Registry) error {
-	if swag.IsZero(m.NodeSelector) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.NodeSelector); i++ {
-		if swag.IsZero(m.NodeSelector[i]) { // not required
-			continue
-		}
-
-		if m.NodeSelector[i] != nil {
-			if err := m.NodeSelector[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("nodeSelector" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("nodeSelector" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateTolerations(formats strfmt.Registry) error {
-	if swag.IsZero(m.Tolerations) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Tolerations); i++ {
-		if swag.IsZero(m.Tolerations[i]) { // not required
-			continue
-		}
-
-		if m.Tolerations[i] != nil {
-			if err := m.Tolerations[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("tolerations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("tolerations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) validateVolumes(formats strfmt.Registry) error {
-	if swag.IsZero(m.Volumes) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Volumes); i++ {
-		if swag.IsZero(m.Volumes[i]) { // not required
-			continue
-		}
-
-		if m.Volumes[i] != nil {
-			if err := m.Volumes[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("volumes" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("volumes" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this describe pod wrapper based on the context it is used
-func (m *DescribePodWrapper) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAnnotations(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateConditions(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateContainers(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateLabels(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateNodeSelector(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateTolerations(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateVolumes(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateAnnotations(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Annotations); i++ {
-
-		if m.Annotations[i] != nil {
-			if err := m.Annotations[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("annotations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("annotations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateConditions(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Conditions); i++ {
-
-		if m.Conditions[i] != nil {
-			if err := m.Conditions[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("conditions" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("conditions" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateContainers(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Containers); i++ {
-
-		if m.Containers[i] != nil {
-			if err := m.Containers[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("containers" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("containers" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateLabels(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Labels); i++ {
-
-		if m.Labels[i] != nil {
-			if err := m.Labels[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("labels" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("labels" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateNodeSelector(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.NodeSelector); i++ {
-
-		if m.NodeSelector[i] != nil {
-			if err := m.NodeSelector[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("nodeSelector" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("nodeSelector" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateTolerations(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Tolerations); i++ {
-
-		if m.Tolerations[i] != nil {
-			if err := m.Tolerations[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("tolerations" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("tolerations" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (m *DescribePodWrapper) contextValidateVolumes(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Volumes); i++ {
-
-		if m.Volumes[i] != nil {
-			if err := m.Volumes[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("volumes" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("volumes" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *DescribePodWrapper) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *DescribePodWrapper) UnmarshalBinary(b []byte) error {
-	var res DescribePodWrapper
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/direct_p_v_drive_info.go
+++ b/models/direct_p_v_drive_info.go
@@ -1,85 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// DirectPVDriveInfo direct p v drive info
-//
-// swagger:model directPVDriveInfo
-type DirectPVDriveInfo struct {
-
-	// allocated
-	Allocated int64 `json:"allocated,omitempty"`
-
-	// capacity
-	Capacity int64 `json:"capacity,omitempty"`
-
-	// drive
-	Drive string `json:"drive,omitempty"`
-
-	// message
-	Message string `json:"message,omitempty"`
-
-	// node
-	Node string `json:"node,omitempty"`
-
-	// status
-	Status string `json:"status,omitempty"`
-
-	// volumes
-	Volumes int64 `json:"volumes,omitempty"`
-}
-
-// Validate validates this direct p v drive info
-func (m *DirectPVDriveInfo) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this direct p v drive info based on context it is used
-func (m *DirectPVDriveInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *DirectPVDriveInfo) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *DirectPVDriveInfo) UnmarshalBinary(b []byte) error {
-	var res DirectPVDriveInfo
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/direct_p_v_volume_info.go
+++ b/models/direct_p_v_volume_info.go
@@ -1,76 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// DirectPVVolumeInfo direct p v volume info
-//
-// swagger:model directPVVolumeInfo
-type DirectPVVolumeInfo struct {
-
-	// capacity
-	Capacity int64 `json:"capacity,omitempty"`
-
-	// drive
-	Drive string `json:"drive,omitempty"`
-
-	// node
-	Node string `json:"node,omitempty"`
-
-	// volume
-	Volume string `json:"volume,omitempty"`
-}
-
-// Validate validates this direct p v volume info
-func (m *DirectPVVolumeInfo) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this direct p v volume info based on context it is used
-func (m *DirectPVVolumeInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *DirectPVVolumeInfo) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *DirectPVVolumeInfo) UnmarshalBinary(b []byte) error {
-	var res DirectPVVolumeInfo
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/environment_variable.go
+++ b/models/environment_variable.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// EnvironmentVariable environment variable
-//
-// swagger:model environmentVariable
-type EnvironmentVariable struct {
-
-	// key
-	Key string `json:"key,omitempty"`
-
-	// value
-	Value string `json:"value,omitempty"`
-}
-
-// Validate validates this environment variable
-func (m *EnvironmentVariable) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this environment variable based on context it is used
-func (m *EnvironmentVariable) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *EnvironmentVariable) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *EnvironmentVariable) UnmarshalBinary(b []byte) error {
-	var res EnvironmentVariable
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/format_direct_p_v_drives_response.go
+++ b/models/format_direct_p_v_drives_response.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// FormatDirectPVDrivesResponse format direct p v drives response
-//
-// swagger:model formatDirectPVDrivesResponse
-type FormatDirectPVDrivesResponse struct {
-
-	// format issues list
-	FormatIssuesList []*PvFormatErrorResponse `json:"formatIssuesList"`
-}
-
-// Validate validates this format direct p v drives response
-func (m *FormatDirectPVDrivesResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateFormatIssuesList(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *FormatDirectPVDrivesResponse) validateFormatIssuesList(formats strfmt.Registry) error {
-	if swag.IsZero(m.FormatIssuesList) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.FormatIssuesList); i++ {
-		if swag.IsZero(m.FormatIssuesList[i]) { // not required
-			continue
-		}
-
-		if m.FormatIssuesList[i] != nil {
-			if err := m.FormatIssuesList[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("formatIssuesList" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("formatIssuesList" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this format direct p v drives response based on the context it is used
-func (m *FormatDirectPVDrivesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateFormatIssuesList(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *FormatDirectPVDrivesResponse) contextValidateFormatIssuesList(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.FormatIssuesList); i++ {
-
-		if m.FormatIssuesList[i] != nil {
-			if err := m.FormatIssuesList[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("formatIssuesList" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("formatIssuesList" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *FormatDirectPVDrivesResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *FormatDirectPVDrivesResponse) UnmarshalBinary(b []byte) error {
-	var res FormatDirectPVDrivesResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/get_direct_p_v_drive_list_response.go
+++ b/models/get_direct_p_v_drive_list_response.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// GetDirectPVDriveListResponse get direct p v drive list response
-//
-// swagger:model getDirectPVDriveListResponse
-type GetDirectPVDriveListResponse struct {
-
-	// drives
-	Drives []*DirectPVDriveInfo `json:"drives"`
-}
-
-// Validate validates this get direct p v drive list response
-func (m *GetDirectPVDriveListResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateDrives(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *GetDirectPVDriveListResponse) validateDrives(formats strfmt.Registry) error {
-	if swag.IsZero(m.Drives) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Drives); i++ {
-		if swag.IsZero(m.Drives[i]) { // not required
-			continue
-		}
-
-		if m.Drives[i] != nil {
-			if err := m.Drives[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("drives" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("drives" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this get direct p v drive list response based on the context it is used
-func (m *GetDirectPVDriveListResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateDrives(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *GetDirectPVDriveListResponse) contextValidateDrives(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Drives); i++ {
-
-		if m.Drives[i] != nil {
-			if err := m.Drives[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("drives" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("drives" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *GetDirectPVDriveListResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *GetDirectPVDriveListResponse) UnmarshalBinary(b []byte) error {
-	var res GetDirectPVDriveListResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/get_direct_p_v_volume_list_response.go
+++ b/models/get_direct_p_v_volume_list_response.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// GetDirectPVVolumeListResponse get direct p v volume list response
-//
-// swagger:model getDirectPVVolumeListResponse
-type GetDirectPVVolumeListResponse struct {
-
-	// volumes
-	Volumes []*DirectPVVolumeInfo `json:"volumes"`
-}
-
-// Validate validates this get direct p v volume list response
-func (m *GetDirectPVVolumeListResponse) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateVolumes(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *GetDirectPVVolumeListResponse) validateVolumes(formats strfmt.Registry) error {
-	if swag.IsZero(m.Volumes) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Volumes); i++ {
-		if swag.IsZero(m.Volumes[i]) { // not required
-			continue
-		}
-
-		if m.Volumes[i] != nil {
-			if err := m.Volumes[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("volumes" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("volumes" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this get direct p v volume list response based on the context it is used
-func (m *GetDirectPVVolumeListResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateVolumes(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *GetDirectPVVolumeListResponse) contextValidateVolumes(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Volumes); i++ {
-
-		if m.Volumes[i] != nil {
-			if err := m.Volumes[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("volumes" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("volumes" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *GetDirectPVVolumeListResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *GetDirectPVVolumeListResponse) UnmarshalBinary(b []byte) error {
-	var res GetDirectPVVolumeListResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/login_details.go
+++ b/models/login_details.go
@@ -37,9 +37,6 @@ import (
 // swagger:model loginDetails
 type LoginDetails struct {

-	// is direct p v
-	IsDirectPV bool `json:"isDirectPV,omitempty"`
-
 	// login strategy
 	// Enum: [form redirect service-account redirect-service-account]
 	LoginStrategy string `json:"loginStrategy,omitempty"`
--- a/models/login_request.go
+++ b/models/login_request.go
@@ -28,6 +28,7 @@ import (
 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 )

 // LoginRequest login request
@@ -36,32 +37,48 @@ import (
 type LoginRequest struct {

 	// access key
-	AccessKey string `json:"accessKey,omitempty"`
+	// Required: true
+	AccessKey *string `json:"accessKey"`

 	// features
 	Features *LoginRequestFeatures `json:"features,omitempty"`

 	// secret key
-	SecretKey string `json:"secretKey,omitempty"`
-
-	// sts
-	Sts string `json:"sts,omitempty"`
+	// Required: true
+	SecretKey *string `json:"secretKey"`
 }

 // Validate validates this login request
 func (m *LoginRequest) Validate(formats strfmt.Registry) error {
 	var res []error

+	if err := m.validateAccessKey(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateFeatures(formats); err != nil {
 		res = append(res, err)
 	}

+	if err := m.validateSecretKey(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
 	return nil
 }

+func (m *LoginRequest) validateAccessKey(formats strfmt.Registry) error {
+
+	if err := validate.Required("accessKey", "body", m.AccessKey); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (m *LoginRequest) validateFeatures(formats strfmt.Registry) error {
 	if swag.IsZero(m.Features) { // not required
 		return nil
@@ -81,6 +98,15 @@ func (m *LoginRequest) validateFeatures(formats strfmt.Registry) error {
 	return nil
 }

+func (m *LoginRequest) validateSecretKey(formats strfmt.Registry) error {
+
+	if err := validate.Required("secretKey", "body", m.SecretKey); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // ContextValidate validate this login request based on the context it is used
 func (m *LoginRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
--- a/models/mount.go
+++ b/models/mount.go
@@ -1,76 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Mount mount
-//
-// swagger:model mount
-type Mount struct {
-
-	// mount path
-	MountPath string `json:"mountPath,omitempty"`
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// read only
-	ReadOnly bool `json:"readOnly,omitempty"`
-
-	// sub path
-	SubPath string `json:"subPath,omitempty"`
-}
-
-// Validate validates this mount
-func (m *Mount) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this mount based on context it is used
-func (m *Mount) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Mount) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Mount) UnmarshalBinary(b []byte) error {
-	var res Mount
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/mp_integration.go
+++ b/models/mp_integration.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// MpIntegration mp integration
-//
-// swagger:model mpIntegration
-type MpIntegration struct {
-
-	// email
-	Email string `json:"email,omitempty"`
-
-	// is in e u
-	IsInEU bool `json:"isInEU,omitempty"`
-}
-
-// Validate validates this mp integration
-func (m *MpIntegration) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this mp integration based on context it is used
-func (m *MpIntegration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *MpIntegration) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *MpIntegration) UnmarshalBinary(b []byte) error {
-	var res MpIntegration
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_session_response.go
+++ b/models/operator_session_response.go
@@ -37,9 +37,6 @@ import (
 // swagger:model operatorSessionResponse
 type OperatorSessionResponse struct {

-	// direct p v
-	DirectPV bool `json:"directPV,omitempty"`
-
 	// features
 	Features []string `json:"features"`

--- a/models/operator_subnet_api_key.go
+++ b/models/operator_subnet_api_key.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetAPIKey operator subnet API key
-//
-// swagger:model operatorSubnetAPIKey
-type OperatorSubnetAPIKey struct {
-
-	// api key
-	APIKey string `json:"apiKey,omitempty"`
-}
-
-// Validate validates this operator subnet API key
-func (m *OperatorSubnetAPIKey) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet API key based on context it is used
-func (m *OperatorSubnetAPIKey) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetAPIKey) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetAPIKey) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetAPIKey
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_login_m_f_a_request.go
+++ b/models/operator_subnet_login_m_f_a_request.go
@@ -1,122 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-	"github.com/go-openapi/validate"
-)
-
-// OperatorSubnetLoginMFARequest operator subnet login m f a request
-//
-// swagger:model operatorSubnetLoginMFARequest
-type OperatorSubnetLoginMFARequest struct {
-
-	// mfa token
-	// Required: true
-	MfaToken *string `json:"mfa_token"`
-
-	// otp
-	// Required: true
-	Otp *string `json:"otp"`
-
-	// username
-	// Required: true
-	Username *string `json:"username"`
-}
-
-// Validate validates this operator subnet login m f a request
-func (m *OperatorSubnetLoginMFARequest) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateMfaToken(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateOtp(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateUsername(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *OperatorSubnetLoginMFARequest) validateMfaToken(formats strfmt.Registry) error {
-
-	if err := validate.Required("mfa_token", "body", m.MfaToken); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *OperatorSubnetLoginMFARequest) validateOtp(formats strfmt.Registry) error {
-
-	if err := validate.Required("otp", "body", m.Otp); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *OperatorSubnetLoginMFARequest) validateUsername(formats strfmt.Registry) error {
-
-	if err := validate.Required("username", "body", m.Username); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this operator subnet login m f a request based on context it is used
-func (m *OperatorSubnetLoginMFARequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetLoginMFARequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetLoginMFARequest) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetLoginMFARequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_login_request.go
+++ b/models/operator_subnet_login_request.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetLoginRequest operator subnet login request
-//
-// swagger:model operatorSubnetLoginRequest
-type OperatorSubnetLoginRequest struct {
-
-	// password
-	Password string `json:"password,omitempty"`
-
-	// username
-	Username string `json:"username,omitempty"`
-}
-
-// Validate validates this operator subnet login request
-func (m *OperatorSubnetLoginRequest) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet login request based on context it is used
-func (m *OperatorSubnetLoginRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetLoginRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetLoginRequest) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetLoginRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_login_response.go
+++ b/models/operator_subnet_login_response.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetLoginResponse operator subnet login response
-//
-// swagger:model operatorSubnetLoginResponse
-type OperatorSubnetLoginResponse struct {
-
-	// access token
-	AccessToken string `json:"access_token,omitempty"`
-
-	// mfa token
-	MfaToken string `json:"mfa_token,omitempty"`
-}
-
-// Validate validates this operator subnet login response
-func (m *OperatorSubnetLoginResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet login response based on context it is used
-func (m *OperatorSubnetLoginResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetLoginResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetLoginResponse) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetLoginResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_register_api_key.go
+++ b/models/operator_subnet_register_api_key.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetRegisterAPIKey operator subnet register API key
-//
-// swagger:model operatorSubnetRegisterAPIKey
-type OperatorSubnetRegisterAPIKey struct {
-
-	// registered
-	Registered bool `json:"registered,omitempty"`
-}
-
-// Validate validates this operator subnet register API key
-func (m *OperatorSubnetRegisterAPIKey) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet register API key based on context it is used
-func (m *OperatorSubnetRegisterAPIKey) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetRegisterAPIKey) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetRegisterAPIKey) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetRegisterAPIKey
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/operator_subnet_register_api_key_response.go
+++ b/models/operator_subnet_register_api_key_response.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// OperatorSubnetRegisterAPIKeyResponse operator subnet register API key response
-//
-// swagger:model operatorSubnetRegisterAPIKeyResponse
-type OperatorSubnetRegisterAPIKeyResponse struct {
-
-	// registered
-	Registered bool `json:"registered,omitempty"`
-}
-
-// Validate validates this operator subnet register API key response
-func (m *OperatorSubnetRegisterAPIKeyResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this operator subnet register API key response based on context it is used
-func (m *OperatorSubnetRegisterAPIKeyResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *OperatorSubnetRegisterAPIKeyResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *OperatorSubnetRegisterAPIKeyResponse) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetRegisterAPIKeyResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/permission_resource.go
+++ b/models/permission_resource.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// PermissionResource permission resource
-//
-// swagger:model permissionResource
-type PermissionResource struct {
-
-	// condition operator
-	ConditionOperator string `json:"conditionOperator,omitempty"`
-
-	// prefixes
-	Prefixes []string `json:"prefixes"`
-
-	// resource
-	Resource string `json:"resource,omitempty"`
-}
-
-// Validate validates this permission resource
-func (m *PermissionResource) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this permission resource based on context it is used
-func (m *PermissionResource) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *PermissionResource) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *PermissionResource) UnmarshalBinary(b []byte) error {
-	var res PermissionResource
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/principal.go
+++ b/models/principal.go
@@ -46,14 +46,8 @@ type Principal struct {
 	// account access key
 	AccountAccessKey string `json:"accountAccessKey,omitempty"`

-	// custom style ob
-	CustomStyleOb string `json:"customStyleOb,omitempty"`
-
 	// hm
 	Hm bool `json:"hm,omitempty"`
-
-	// ob
-	Ob bool `json:"ob,omitempty"`
 }

 // Validate validates this principal
--- a/models/projected_volume.go
+++ b/models/projected_volume.go
@@ -1,133 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// ProjectedVolume projected volume
-//
-// swagger:model projectedVolume
-type ProjectedVolume struct {
-
-	// sources
-	Sources []*ProjectedVolumeSource `json:"sources"`
-}
-
-// Validate validates this projected volume
-func (m *ProjectedVolume) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateSources(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *ProjectedVolume) validateSources(formats strfmt.Registry) error {
-	if swag.IsZero(m.Sources) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.Sources); i++ {
-		if swag.IsZero(m.Sources[i]) { // not required
-			continue
-		}
-
-		if m.Sources[i] != nil {
-			if err := m.Sources[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("sources" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("sources" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this projected volume based on the context it is used
-func (m *ProjectedVolume) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateSources(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *ProjectedVolume) contextValidateSources(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.Sources); i++ {
-
-		if m.Sources[i] != nil {
-			if err := m.Sources[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("sources" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("sources" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *ProjectedVolume) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *ProjectedVolume) UnmarshalBinary(b []byte) error {
-	var res ProjectedVolume
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/projected_volume_source.go
+++ b/models/projected_volume_source.go
@@ -1,216 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// ProjectedVolumeSource projected volume source
-//
-// swagger:model projectedVolumeSource
-type ProjectedVolumeSource struct {
-
-	// config map
-	ConfigMap *ConfigMap `json:"configMap,omitempty"`
-
-	// downward Api
-	DownwardAPI bool `json:"downwardApi,omitempty"`
-
-	// secret
-	Secret *Secret `json:"secret,omitempty"`
-
-	// service account token
-	ServiceAccountToken *ServiceAccountToken `json:"serviceAccountToken,omitempty"`
-}
-
-// Validate validates this projected volume source
-func (m *ProjectedVolumeSource) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateConfigMap(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateSecret(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateServiceAccountToken(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *ProjectedVolumeSource) validateConfigMap(formats strfmt.Registry) error {
-	if swag.IsZero(m.ConfigMap) { // not required
-		return nil
-	}
-
-	if m.ConfigMap != nil {
-		if err := m.ConfigMap.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("configMap")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("configMap")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *ProjectedVolumeSource) validateSecret(formats strfmt.Registry) error {
-	if swag.IsZero(m.Secret) { // not required
-		return nil
-	}
-
-	if m.Secret != nil {
-		if err := m.Secret.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("secret")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("secret")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *ProjectedVolumeSource) validateServiceAccountToken(formats strfmt.Registry) error {
-	if swag.IsZero(m.ServiceAccountToken) { // not required
-		return nil
-	}
-
-	if m.ServiceAccountToken != nil {
-		if err := m.ServiceAccountToken.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("serviceAccountToken")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("serviceAccountToken")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this projected volume source based on the context it is used
-func (m *ProjectedVolumeSource) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateConfigMap(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateSecret(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateServiceAccountToken(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *ProjectedVolumeSource) contextValidateConfigMap(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.ConfigMap != nil {
-		if err := m.ConfigMap.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("configMap")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("configMap")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *ProjectedVolumeSource) contextValidateSecret(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Secret != nil {
-		if err := m.Secret.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("secret")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("secret")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *ProjectedVolumeSource) contextValidateServiceAccountToken(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.ServiceAccountToken != nil {
-		if err := m.ServiceAccountToken.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("serviceAccountToken")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("serviceAccountToken")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *ProjectedVolumeSource) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *ProjectedVolumeSource) UnmarshalBinary(b []byte) error {
-	var res ProjectedVolumeSource
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/pv_format_error_response.go
+++ b/models/pv_format_error_response.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// PvFormatErrorResponse pv format error response
-//
-// swagger:model pvFormatErrorResponse
-type PvFormatErrorResponse struct {
-
-	// drive
-	Drive string `json:"drive,omitempty"`
-
-	// error
-	Error string `json:"error,omitempty"`
-
-	// node
-	Node string `json:"node,omitempty"`
-}
-
-// Validate validates this pv format error response
-func (m *PvFormatErrorResponse) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this pv format error response based on context it is used
-func (m *PvFormatErrorResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *PvFormatErrorResponse) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *PvFormatErrorResponse) UnmarshalBinary(b []byte) error {
-	var res PvFormatErrorResponse
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/pvc.go
+++ b/models/pvc.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Pvc pvc
-//
-// swagger:model pvc
-type Pvc struct {
-
-	// claim name
-	ClaimName string `json:"claimName,omitempty"`
-
-	// read only
-	ReadOnly bool `json:"readOnly,omitempty"`
-}
-
-// Validate validates this pvc
-func (m *Pvc) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this pvc based on context it is used
-func (m *Pvc) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Pvc) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Pvc) UnmarshalBinary(b []byte) error {
-	var res Pvc
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/secret.go
+++ b/models/secret.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Secret secret
-//
-// swagger:model secret
-type Secret struct {
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// optional
-	Optional bool `json:"optional,omitempty"`
-}
-
-// Validate validates this secret
-func (m *Secret) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this secret based on context it is used
-func (m *Secret) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Secret) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Secret) UnmarshalBinary(b []byte) error {
-	var res Secret
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/security_context.go
+++ b/models/security_context.go
@@ -37,10 +37,8 @@ import (
 type SecurityContext struct {

 	// fs group
-	FsGroup string `json:"fsGroup,omitempty"`
-
-	// fs group change policy
-	FsGroupChangePolicy string `json:"fsGroupChangePolicy,omitempty"`
+	// Required: true
+	FsGroup *string `json:"fsGroup"`

 	// run as group
 	// Required: true
@@ -59,6 +57,10 @@ type SecurityContext struct {
 func (m *SecurityContext) Validate(formats strfmt.Registry) error {
 	var res []error

+	if err := m.validateFsGroup(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateRunAsGroup(formats); err != nil {
 		res = append(res, err)
 	}
@@ -77,6 +79,15 @@ func (m *SecurityContext) Validate(formats strfmt.Registry) error {
 	return nil
 }

+func (m *SecurityContext) validateFsGroup(formats strfmt.Registry) error {
+
+	if err := validate.Required("fsGroup", "body", m.FsGroup); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func (m *SecurityContext) validateRunAsGroup(formats strfmt.Registry) error {

 	if err := validate.Required("runAsGroup", "body", m.RunAsGroup); err != nil {
--- a/models/service_account_token.go
+++ b/models/service_account_token.go
@@ -1,67 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// ServiceAccountToken service account token
-//
-// swagger:model serviceAccountToken
-type ServiceAccountToken struct {
-
-	// expiration seconds
-	ExpirationSeconds int64 `json:"expirationSeconds,omitempty"`
-}
-
-// Validate validates this service account token
-func (m *ServiceAccountToken) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this service account token based on context it is used
-func (m *ServiceAccountToken) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *ServiceAccountToken) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *ServiceAccountToken) UnmarshalBinary(b []byte) error {
-	var res ServiceAccountToken
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/session_response.go
+++ b/models/session_response.go
@@ -25,7 +25,6 @@ package models
 import (
 	"context"
 	"encoding/json"
-	"strconv"

 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -38,12 +37,6 @@ import (
 // swagger:model sessionResponse
 type SessionResponse struct {

-	// allow resources
-	AllowResources []*PermissionResource `json:"allowResources"`
-
-	// custom styles
-	CustomStyles string `json:"customStyles,omitempty"`
-
 	// distributed mode
 	DistributedMode bool `json:"distributedMode,omitempty"`

@@ -65,10 +58,6 @@ type SessionResponse struct {
 func (m *SessionResponse) Validate(formats strfmt.Registry) error {
 	var res []error

-	if err := m.validateAllowResources(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateStatus(formats); err != nil {
 		res = append(res, err)
 	}
@@ -79,32 +68,6 @@ func (m *SessionResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }

-func (m *SessionResponse) validateAllowResources(formats strfmt.Registry) error {
-	if swag.IsZero(m.AllowResources) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.AllowResources); i++ {
-		if swag.IsZero(m.AllowResources[i]) { // not required
-			continue
-		}
-
-		if m.AllowResources[i] != nil {
-			if err := m.AllowResources[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("allowResources" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("allowResources" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
 var sessionResponseTypeStatusPropEnum []interface{}

 func init() {
@@ -144,37 +107,8 @@ func (m *SessionResponse) validateStatus(formats strfmt.Registry) error {
 	return nil
 }

-// ContextValidate validate this session response based on the context it is used
+// ContextValidate validates this session response based on context it is used
 func (m *SessionResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateAllowResources(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *SessionResponse) contextValidateAllowResources(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.AllowResources); i++ {
-
-		if m.AllowResources[i] != nil {
-			if err := m.AllowResources[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("allowResources" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("allowResources" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
 	return nil
 }

--- a/models/set_administrators_request.go
+++ b/models/set_administrators_request.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// SetAdministratorsRequest set administrators request
-//
-// swagger:model setAdministratorsRequest
-type SetAdministratorsRequest struct {
-
-	// group dns
-	GroupDNS []string `json:"group_dns"`
-
-	// user dns
-	UserDNS []string `json:"user_dns"`
-}
-
-// Validate validates this set administrators request
-func (m *SetAdministratorsRequest) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this set administrators request based on context it is used
-func (m *SetAdministratorsRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *SetAdministratorsRequest) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *SetAdministratorsRequest) UnmarshalBinary(b []byte) error {
-	var res SetAdministratorsRequest
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/state.go
+++ b/models/state.go
@@ -1,85 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// State state
-//
-// swagger:model state
-type State struct {
-
-	// exit code
-	ExitCode int64 `json:"exitCode,omitempty"`
-
-	// finished
-	Finished string `json:"finished,omitempty"`
-
-	// message
-	Message string `json:"message,omitempty"`
-
-	// reason
-	Reason string `json:"reason,omitempty"`
-
-	// signal
-	Signal int64 `json:"signal,omitempty"`
-
-	// started
-	Started string `json:"started,omitempty"`
-
-	// state
-	State string `json:"state,omitempty"`
-}
-
-// Validate validates this state
-func (m *State) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this state based on context it is used
-func (m *State) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *State) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *State) UnmarshalBinary(b []byte) error {
-	var res State
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/tenant_logs.go
+++ b/models/tenant_logs.go
@@ -45,18 +45,12 @@ type TenantLogs struct {
 	// db image
 	DbImage string `json:"dbImage,omitempty"`

-	// db init image
-	DbInitImage string `json:"dbInitImage,omitempty"`
-
 	// db labels
 	DbLabels []*Label `json:"dbLabels"`

 	// db node selector
 	DbNodeSelector []*NodeSelector `json:"dbNodeSelector"`

-	// db security context
-	DbSecurityContext *SecurityContext `json:"dbSecurityContext,omitempty"`
-
 	// db service account name
 	DbServiceAccountName string `json:"dbServiceAccountName,omitempty"`

@@ -87,9 +81,6 @@ type TenantLogs struct {
 	// node selector
 	NodeSelector []*NodeSelector `json:"nodeSelector"`

-	// security context
-	SecurityContext *SecurityContext `json:"securityContext,omitempty"`
-
 	// service account name
 	ServiceAccountName string `json:"serviceAccountName,omitempty"`
 }
@@ -114,10 +105,6 @@ func (m *TenantLogs) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateDbSecurityContext(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateLabels(formats); err != nil {
 		res = append(res, err)
 	}
@@ -126,10 +113,6 @@ func (m *TenantLogs) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateSecurityContext(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -240,25 +223,6 @@ func (m *TenantLogs) validateDbNodeSelector(formats strfmt.Registry) error {
 	return nil
 }

-func (m *TenantLogs) validateDbSecurityContext(formats strfmt.Registry) error {
-	if swag.IsZero(m.DbSecurityContext) { // not required
-		return nil
-	}
-
-	if m.DbSecurityContext != nil {
-		if err := m.DbSecurityContext.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("dbSecurityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("dbSecurityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (m *TenantLogs) validateLabels(formats strfmt.Registry) error {
 	if swag.IsZero(m.Labels) { // not required
 		return nil
@@ -311,25 +275,6 @@ func (m *TenantLogs) validateNodeSelector(formats strfmt.Registry) error {
 	return nil
 }

-func (m *TenantLogs) validateSecurityContext(formats strfmt.Registry) error {
-	if swag.IsZero(m.SecurityContext) { // not required
-		return nil
-	}
-
-	if m.SecurityContext != nil {
-		if err := m.SecurityContext.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("securityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("securityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ContextValidate validate this tenant logs based on the context it is used
 func (m *TenantLogs) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -350,10 +295,6 @@ func (m *TenantLogs) ContextValidate(ctx context.Context, formats strfmt.Registr
 		res = append(res, err)
 	}

-	if err := m.contextValidateDbSecurityContext(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.contextValidateLabels(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -362,10 +303,6 @@ func (m *TenantLogs) ContextValidate(ctx context.Context, formats strfmt.Registr
 		res = append(res, err)
 	}

-	if err := m.contextValidateSecurityContext(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -452,22 +389,6 @@ func (m *TenantLogs) contextValidateDbNodeSelector(ctx context.Context, formats
 	return nil
 }

-func (m *TenantLogs) contextValidateDbSecurityContext(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.DbSecurityContext != nil {
-		if err := m.DbSecurityContext.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("dbSecurityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("dbSecurityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (m *TenantLogs) contextValidateLabels(ctx context.Context, formats strfmt.Registry) error {

 	for i := 0; i < len(m.Labels); i++ {
@@ -508,22 +429,6 @@ func (m *TenantLogs) contextValidateNodeSelector(ctx context.Context, formats st
 	return nil
 }

-func (m *TenantLogs) contextValidateSecurityContext(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.SecurityContext != nil {
-		if err := m.SecurityContext.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("securityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("securityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *TenantLogs) MarshalBinary() ([]byte, error) {
 	if m == nil {
--- a/models/tenant_monitoring_info.go
+++ b/models/tenant_monitoring_info.go
@@ -63,9 +63,6 @@ type TenantMonitoringInfo struct {
 	// prometheus enabled
 	PrometheusEnabled bool `json:"prometheusEnabled,omitempty"`

-	// security context
-	SecurityContext *SecurityContext `json:"securityContext,omitempty"`
-
 	// service account name
 	ServiceAccountName string `json:"serviceAccountName,omitempty"`

@@ -95,10 +92,6 @@ func (m *TenantMonitoringInfo) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateSecurityContext(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -183,25 +176,6 @@ func (m *TenantMonitoringInfo) validateNodeSelector(formats strfmt.Registry) err
 	return nil
 }

-func (m *TenantMonitoringInfo) validateSecurityContext(formats strfmt.Registry) error {
-	if swag.IsZero(m.SecurityContext) { // not required
-		return nil
-	}
-
-	if m.SecurityContext != nil {
-		if err := m.SecurityContext.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("securityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("securityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ContextValidate validate this tenant monitoring info based on the context it is used
 func (m *TenantMonitoringInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -218,10 +192,6 @@ func (m *TenantMonitoringInfo) ContextValidate(ctx context.Context, formats strf
 		res = append(res, err)
 	}

-	if err := m.contextValidateSecurityContext(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -288,22 +258,6 @@ func (m *TenantMonitoringInfo) contextValidateNodeSelector(ctx context.Context,
 	return nil
 }

-func (m *TenantMonitoringInfo) contextValidateSecurityContext(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.SecurityContext != nil {
-		if err := m.SecurityContext.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("securityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("securityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *TenantMonitoringInfo) MarshalBinary() ([]byte, error) {
 	if m == nil {
--- a/models/tenant_security_response.go
+++ b/models/tenant_security_response.go
@@ -41,9 +41,6 @@ type TenantSecurityResponse struct {

 	// custom certificates
 	CustomCertificates *TenantSecurityResponseCustomCertificates `json:"customCertificates,omitempty"`
-
-	// security context
-	SecurityContext *SecurityContext `json:"securityContext,omitempty"`
 }

 // Validate validates this tenant security response
@@ -54,10 +51,6 @@ func (m *TenantSecurityResponse) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateSecurityContext(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -83,25 +76,6 @@ func (m *TenantSecurityResponse) validateCustomCertificates(formats strfmt.Regis
 	return nil
 }

-func (m *TenantSecurityResponse) validateSecurityContext(formats strfmt.Registry) error {
-	if swag.IsZero(m.SecurityContext) { // not required
-		return nil
-	}
-
-	if m.SecurityContext != nil {
-		if err := m.SecurityContext.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("securityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("securityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ContextValidate validate this tenant security response based on the context it is used
 func (m *TenantSecurityResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -110,10 +84,6 @@ func (m *TenantSecurityResponse) ContextValidate(ctx context.Context, formats st
 		res = append(res, err)
 	}

-	if err := m.contextValidateSecurityContext(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -136,22 +106,6 @@ func (m *TenantSecurityResponse) contextValidateCustomCertificates(ctx context.C
 	return nil
 }

-func (m *TenantSecurityResponse) contextValidateSecurityContext(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.SecurityContext != nil {
-		if err := m.SecurityContext.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("securityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("securityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *TenantSecurityResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
--- a/models/toleration.go
+++ b/models/toleration.go
@@ -1,79 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Toleration toleration
-//
-// swagger:model toleration
-type Toleration struct {
-
-	// effect
-	Effect string `json:"effect,omitempty"`
-
-	// key
-	Key string `json:"key,omitempty"`
-
-	// operator
-	Operator string `json:"operator,omitempty"`
-
-	// toleration seconds
-	TolerationSeconds int64 `json:"tolerationSeconds,omitempty"`
-
-	// value
-	Value string `json:"value,omitempty"`
-}
-
-// Validate validates this toleration
-func (m *Toleration) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this toleration based on context it is used
-func (m *Toleration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Toleration) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Toleration) UnmarshalBinary(b []byte) error {
-	var res Toleration
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/update_tenant_security_request.go
+++ b/models/update_tenant_security_request.go
@@ -41,9 +41,6 @@ type UpdateTenantSecurityRequest struct {

 	// custom certificates
 	CustomCertificates *UpdateTenantSecurityRequestCustomCertificates `json:"customCertificates,omitempty"`
-
-	// security context
-	SecurityContext *SecurityContext `json:"securityContext,omitempty"`
 }

 // Validate validates this update tenant security request
@@ -54,10 +51,6 @@ func (m *UpdateTenantSecurityRequest) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateSecurityContext(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -83,25 +76,6 @@ func (m *UpdateTenantSecurityRequest) validateCustomCertificates(formats strfmt.
 	return nil
 }

-func (m *UpdateTenantSecurityRequest) validateSecurityContext(formats strfmt.Registry) error {
-	if swag.IsZero(m.SecurityContext) { // not required
-		return nil
-	}
-
-	if m.SecurityContext != nil {
-		if err := m.SecurityContext.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("securityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("securityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ContextValidate validate this update tenant security request based on the context it is used
 func (m *UpdateTenantSecurityRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -110,10 +84,6 @@ func (m *UpdateTenantSecurityRequest) ContextValidate(ctx context.Context, forma
 		res = append(res, err)
 	}

-	if err := m.contextValidateSecurityContext(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -136,22 +106,6 @@ func (m *UpdateTenantSecurityRequest) contextValidateCustomCertificates(ctx cont
 	return nil
 }

-func (m *UpdateTenantSecurityRequest) contextValidateSecurityContext(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.SecurityContext != nil {
-		if err := m.SecurityContext.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("securityContext")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("securityContext")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *UpdateTenantSecurityRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {
--- a/models/user_s_as.go
+++ b/models/user_s_as.go
@@ -1,73 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// UserSAs user s as
-//
-// swagger:model userSAs
-type UserSAs struct {
-
-	// path
-	Path string `json:"path,omitempty"`
-
-	// recursive
-	Recursive bool `json:"recursive,omitempty"`
-
-	// version ID
-	VersionID string `json:"versionID,omitempty"`
-}
-
-// Validate validates this user s as
-func (m *UserSAs) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this user s as based on context it is used
-func (m *UserSAs) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *UserSAs) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *UserSAs) UnmarshalBinary(b []byte) error {
-	var res UserSAs
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/user_service_account_item.go
+++ b/models/user_service_account_item.go
@@ -1,70 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// UserServiceAccountItem user service account item
-//
-// swagger:model userServiceAccountItem
-type UserServiceAccountItem struct {
-
-	// num s as
-	NumSAs int64 `json:"numSAs,omitempty"`
-
-	// user name
-	UserName string `json:"userName,omitempty"`
-}
-
-// Validate validates this user service account item
-func (m *UserServiceAccountItem) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this user service account item based on context it is used
-func (m *UserServiceAccountItem) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *UserServiceAccountItem) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *UserServiceAccountItem) UnmarshalBinary(b []byte) error {
-	var res UserServiceAccountItem
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/user_service_account_summary.go
+++ b/models/user_service_account_summary.go
@@ -1,136 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// UserServiceAccountSummary user service account summary
-//
-// swagger:model userServiceAccountSummary
-type UserServiceAccountSummary struct {
-
-	// has s a
-	HasSA bool `json:"hasSA,omitempty"`
-
-	// list of users with number of service accounts
-	UserServiceAccountList []*UserServiceAccountItem `json:"userServiceAccountList"`
-}
-
-// Validate validates this user service account summary
-func (m *UserServiceAccountSummary) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateUserServiceAccountList(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *UserServiceAccountSummary) validateUserServiceAccountList(formats strfmt.Registry) error {
-	if swag.IsZero(m.UserServiceAccountList) { // not required
-		return nil
-	}
-
-	for i := 0; i < len(m.UserServiceAccountList); i++ {
-		if swag.IsZero(m.UserServiceAccountList[i]) { // not required
-			continue
-		}
-
-		if m.UserServiceAccountList[i] != nil {
-			if err := m.UserServiceAccountList[i].Validate(formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("userServiceAccountList" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("userServiceAccountList" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// ContextValidate validate this user service account summary based on the context it is used
-func (m *UserServiceAccountSummary) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateUserServiceAccountList(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *UserServiceAccountSummary) contextValidateUserServiceAccountList(ctx context.Context, formats strfmt.Registry) error {
-
-	for i := 0; i < len(m.UserServiceAccountList); i++ {
-
-		if m.UserServiceAccountList[i] != nil {
-			if err := m.UserServiceAccountList[i].ContextValidate(ctx, formats); err != nil {
-				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("userServiceAccountList" + "." + strconv.Itoa(i))
-				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("userServiceAccountList" + "." + strconv.Itoa(i))
-				}
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *UserServiceAccountSummary) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *UserServiceAccountSummary) UnmarshalBinary(b []byte) error {
-	var res UserServiceAccountSummary
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/volume.go
+++ b/models/volume.go
@@ -1,170 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package models
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-import (
-	"context"
-
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
-)
-
-// Volume volume
-//
-// swagger:model volume
-type Volume struct {
-
-	// name
-	Name string `json:"name,omitempty"`
-
-	// projected
-	Projected *ProjectedVolume `json:"projected,omitempty"`
-
-	// pvc
-	Pvc *Pvc `json:"pvc,omitempty"`
-}
-
-// Validate validates this volume
-func (m *Volume) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateProjected(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validatePvc(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Volume) validateProjected(formats strfmt.Registry) error {
-	if swag.IsZero(m.Projected) { // not required
-		return nil
-	}
-
-	if m.Projected != nil {
-		if err := m.Projected.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("projected")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("projected")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Volume) validatePvc(formats strfmt.Registry) error {
-	if swag.IsZero(m.Pvc) { // not required
-		return nil
-	}
-
-	if m.Pvc != nil {
-		if err := m.Pvc.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("pvc")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("pvc")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this volume based on the context it is used
-func (m *Volume) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateProjected(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidatePvc(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *Volume) contextValidateProjected(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Projected != nil {
-		if err := m.Projected.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("projected")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("projected")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *Volume) contextValidatePvc(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Pvc != nil {
-		if err := m.Pvc.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("pvc")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("pvc")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *Volume) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *Volume) UnmarshalBinary(b []byte) error {
-	var res Volume
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/operator-integration/tenant_test.go
+++ b/operator-integration/tenant_test.go
@@ -39,10 +39,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-var (
-	token string
-	jwt   string
-)
+var token string

 func inspectHTTPResponse(httpResponse *http.Response) string {
 	/*
@@ -91,7 +88,8 @@ func printEndFunc(functionName string) {
 }

 func initConsoleServer() (*operatorapi.Server, error) {
-	// os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")
+
+	//os.Setenv("CONSOLE_MINIO_SERVER", "localhost:9000")

 	swaggerSpec, err := loads.Embedded(operatorapi.SwaggerJSON, operatorapi.FlatSwaggerJSON)
 	if err != nil {
@@ -129,37 +127,51 @@ func TestMain(m *testing.M) {
 	go func() {
 		fmt.Println("start server")
 		srv, err := initConsoleServer()
-		fmt.Println("Server has been started at this point")
 		if err != nil {
-			fmt.Println("There is an error in console server: ", err)
 			log.Println(err)
 			log.Println("init fail")
 			return
 		}
-		fmt.Println("Start serving with Serve() function")
 		srv.Serve()
-		fmt.Println("After Serve() function")
+
 	}()

 	fmt.Println("sleeping")
 	time.Sleep(2 * time.Second)
-	fmt.Println("after 2 seconds sleep")

-	fmt.Println("creating the client")
+	client := &http.Client{
+		Timeout: 2 * time.Second,
+	}

-	// SA_TOKEN=$(kubectl -n minio-operator  get secret console-sa-secret -o jsonpath="{.data.token}" | base64 --decode)
-	fmt.Println("Where we have the secret already: ")
+	// kubectl to get token
+	app := "kubectl"
+	arg0 := "get"
+	arg1 := "serviceaccount"
+	arg2 := "console-sa"
+	arg3 := "--namespace"
+	arg4 := "minio-operator"
+	arg5 := "-o"
+	arg6 := "jsonpath=\"{.secrets[0].name}\""
+	cmd := exec.Command(app, arg0, arg1, arg2, arg3, arg4, arg5, arg6)
+	var out bytes.Buffer
+	var stderr bytes.Buffer
+	cmd.Stdout = &out
+	cmd.Stderr = &stderr
+	err := cmd.Run()
+	if err != nil {
+		fmt.Println(fmt.Sprint(err) + ": " + stderr.String())
+		return
+	}
+	secret := out.String() // "console-sa-token-kxdw2" <-- secret
 	app2 := "kubectl"
 	argu0 := "--namespace"
 	argu1 := "minio-operator"
 	argu2 := "get"
 	argu3 := "secret"
-	argu4 := "console-sa-secret"
+	argu4 := secret[1 : len(secret)-1]
 	argu5 := "-o"
 	argu6 := "jsonpath=\"{.data.token}\""
-	fmt.Println("Prior executing second command to get the token")
 	cmd2 := exec.Command(app2, argu0, argu1, argu2, argu3, argu4, argu5, argu6)
-	fmt.Println("after executing second command to get the token")
 	var out2 bytes.Buffer
 	var stderr2 bytes.Buffer
 	cmd2.Stdout = &out2
@@ -170,12 +182,25 @@ func TestMain(m *testing.M) {
 		return
 	}
 	secret2 := out2.String()
-	jwt := decodeBase64(secret2[1 : len(secret2)-1])
-	if jwt == "" {
-		fmt.Println("jwt cannot be empty string")
-		os.Exit(-1)
+	secret3 := decodeBase64(secret2[1 : len(secret2)-1])
+	requestData := map[string]string{
+		"jwt": secret3,
 	}
-	response, err := LoginOperator()
+
+	requestDataJSON, _ := json.Marshal(requestData)
+
+	requestDataBody := bytes.NewReader(requestDataJSON)
+
+	request, err := http.NewRequest("POST", "http://localhost:9090/api/v1/login/operator", requestDataBody)
+	if err != nil {
+		log.Println(err)
+		return
+	}
+
+	request.Header.Add("Content-Type", "application/json")
+
+	response, err := client.Do(request)
+
 	if err != nil {
 		log.Println(err)
 		return
@@ -243,7 +268,7 @@ func TestListTenants(t *testing.T) {
 	}
 	TenantName := &result.Tenants[0].Name // The array has to be empty, no index accessible
 	fmt.Println(*TenantName)
-	assert.Equal("storage-kms-encrypted", *TenantName, *TenantName)
+	assert.Equal("storage-lite", *TenantName, *TenantName)
 	printEndFunc("TestListTenants")
 }

@@ -293,29 +318,6 @@ func CreateTenant(tenantName string, namespace string, accessKey string, secretK
 	return response, err
 }

-func DeleteTenant(nameSpace, tenant string) (*http.Response, error) {
-	/*
-		URL: /namespaces/{namespace}/tenants/{tenant}:
-		HTTP Verb: DELETE
-		Summary: Delete tenant and underlying pvcs
-	*/
-	request, err := http.NewRequest(
-		"DELETE",
-		"http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant,
-		nil,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
 func TestCreateTenant(t *testing.T) {
 	printStartFunc("TestCreateTenant")

@@ -442,159 +444,6 @@ func TestCreateTenant(t *testing.T) {
 	printEndFunc("TestCreateTenant")
 }

-func TestDeleteTenant(t *testing.T) {
-	printStartFunc("TestCreateTenant")
-
-	// Variables
-	assert := assert.New(t)
-	erasureCodingParity := 2
-	tenantName := "new-tenant-3"
-	namespace := "new-namespace-3"
-
-	// 0. Create the namespace
-	resp, err := CreateNamespace(namespace)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			201, resp.StatusCode, inspectHTTPResponse(resp))
-	}
-
-	accessKey := ""
-	secretKey := ""
-	var accessKeys []string
-	var secretKeys []string
-	var minio []string
-	var caCertificates []string
-	var consoleCAcertificates []string
-	enableTLS := true
-	enableConsole := true
-	enablePrometheus := true
-	serviceName := ""
-	image := ""
-	exposeMinIO := true
-	exposeConsole := true
-	values := make([]string, 1)
-	values[0] = "new-tenant"
-	values2 := make([]string, 1)
-	values2[0] = "pool-0"
-	keys := make([]map[string]interface{}, 1)
-	keys[0] = map[string]interface{}{
-		"access_key": "IGLksSXdiU3fjcRI",
-		"secret_key": "EqeCPZ1xBYdnygizxxRWnkH09N2350nO",
-	}
-	pools := make([]map[string]interface{}, 1)
-	matchExpressions := make([]map[string]interface{}, 2)
-	matchExpressions[0] = map[string]interface{}{
-		"key":      "v1.min.io/tenant",
-		"operator": "In",
-		"values":   values,
-	}
-	matchExpressions[1] = map[string]interface{}{
-		"key":      "v1.min.io/pool",
-		"operator": "In",
-		"values":   values2,
-	}
-	requiredDuringSchedulingIgnoredDuringExecution := make([]map[string]interface{}, 1)
-	requiredDuringSchedulingIgnoredDuringExecution[0] = map[string]interface{}{
-		"labelSelector": map[string]interface{}{
-			"matchExpressions": matchExpressions,
-		},
-		"topologyKey": "kubernetes.io/hostname",
-	}
-	pools0 := map[string]interface{}{
-		"name":               "pool-0",
-		"servers":            4,
-		"volumes_per_server": 1,
-		"volume_configuration": map[string]interface{}{
-			"size":               26843545600,
-			"storage_class_name": "standard",
-		},
-		"securityContext": nil,
-		"affinity": map[string]interface{}{
-			"podAntiAffinity": map[string]interface{}{
-				"requiredDuringSchedulingIgnoredDuringExecution": requiredDuringSchedulingIgnoredDuringExecution,
-			},
-		},
-		"resources": map[string]interface{}{
-			"requests": map[string]interface{}{
-				"cpu":    2,
-				"memory": 2,
-			},
-		},
-	}
-	logSearchConfiguration := map[string]interface{}{
-		"image":               "",
-		"postgres_image":      "",
-		"postgres_init_image": "",
-	}
-	prometheusConfiguration := map[string]interface{}{
-		"image":         "",
-		"sidecar_image": "",
-		"init_image":    "",
-	}
-	tls := map[string]interface{}{
-		"minio":                   minio,
-		"ca_certificates":         caCertificates,
-		"console_ca_certificates": consoleCAcertificates,
-	}
-	idp := map[string]interface{}{
-		"keys": keys,
-	}
-	pools[0] = pools0
-
-	// 1. Create Tenant
-	resp, err = CreateTenant(
-		tenantName,
-		namespace,
-		accessKey,
-		secretKey,
-		accessKeys,
-		idp,
-		tls,
-		prometheusConfiguration,
-		logSearchConfiguration,
-		erasureCodingParity,
-		pools,
-		exposeConsole,
-		exposeMinIO,
-		image,
-		serviceName,
-		enablePrometheus,
-		enableConsole,
-		enableTLS,
-		secretKeys,
-	)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, "Status Code is incorrect")
-	}
-
-	// 2. Delete tenant
-	resp, err = DeleteTenant(namespace, tenantName)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			204,
-			resp.StatusCode,
-			inspectHTTPResponse(resp),
-		)
-	}
-
-	printEndFunc("TestCreateTenant")
-}
-
 func ListTenantsByNameSpace(namespace string) (*http.Response, error) {
 	/*
 		Helper function to list buckets
@@ -635,10 +484,7 @@ func TestListTenantsByNameSpace(t *testing.T) {
 		log.Println(err)
 		assert.Nil(err)
 	}
-	if len(result.Tenants) == 0 {
-		assert.Fail("FAIL: There are no tenants in the array")
-	}
-	TenantName := &result.Tenants[0].Name
+	TenantName := &result.Tenants[0].Name // The array has to be empty, no index accessible
 	fmt.Println(*TenantName)
 	assert.Equal("new-tenant", *TenantName, *TenantName)
 }
@@ -718,590 +564,3 @@ func TestGetPodEvents(t *testing.T) {
 			200, resp.StatusCode, "Status Code is incorrect")
 	}
 }
-
-func GetPodDescribe(nameSpace string, tenant string, podName string) (*http.Response, error) {
-	/*
-		Helper function to get events for pod
-		URL: /namespaces/{namespace}/tenants/{tenant}/pods/{podName}/events
-		HTTP Verb: GET
-	*/
-	fmt.Println(nameSpace)
-	fmt.Println(tenant)
-	fmt.Println(podName)
-	request, err := http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant+"/pods/"+podName+"/describe", nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestGetPodDescribe(t *testing.T) {
-	assert := assert.New(t)
-	namespace := "tenant-lite"
-	tenant := "storage-lite"
-	podName := "storage-lite-pool-0-0"
-	resp, err := GetPodDescribe(namespace, tenant, podName)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	finalResponse := inspectHTTPResponse(resp)
-	if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, finalResponse)
-	}
-	/*if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, "Status Code is incorrect")
-	}*/
-}
-
-func GetCSR(nameSpace string, tenant string) (*http.Response, error) {
-	/*
-		Helper function to get events for pod
-		URL: /namespaces/{namespace}/tenants/{tenant}/csr
-		HTTP Verb: GET
-	*/
-	request, err := http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant+"/csr/", nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestGetCSR(t *testing.T) {
-	assert := assert.New(t)
-	namespace := "tenant-lite"
-	tenant := "storage-lite"
-	resp, err := GetCSR(namespace, tenant)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	finalResponse := inspectHTTPResponse(resp)
-	if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, finalResponse)
-	}
-	assert.Equal(strings.Contains(finalResponse, "Automatically approved by MinIO Operator"), true, finalResponse)
-}
-
-func TestGetMultipleCSRs(t *testing.T) {
-	/*
-		We can have multiple CSRs per tenant, the idea is to support them in our API and test them here, making sure we
-		can retrieve them all, as an example I found this tenant:
-		storage-kms-encrypted  -client  -tenant-kms-encrypted-csr
-		storage-kms-encrypted  -kes     -tenant-kms-encrypted-csr
-		storage-kms-encrypted           -tenant-kms-encrypted-csr
-		Notice the nomenclature of it:
-		<tenant-name>-<*>-<namespace>-csr
-		where * is anything either nothing or something, anything.
-	*/
-	assert := assert.New(t)
-	namespace := "tenant-kms-encrypted"
-	tenant := "storage-kms-encrypted"
-	resp, err := GetCSR(namespace, tenant)
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	finalResponse := inspectHTTPResponse(resp)
-	if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, finalResponse)
-	}
-	var expectedMessages [3]string
-	expectedMessages[0] = "storage-kms-encrypted-tenant-kms-encrypted-csr"
-	expectedMessages[1] = "storage-kms-encrypted-kes-tenant-kms-encrypted-csr"
-	expectedMessages[2] = "Automatically approved by MinIO Operator"
-	for _, element := range expectedMessages {
-		assert.Equal(strings.Contains(finalResponse, element), true)
-	}
-}
-
-func ListPVCsForTenant(nameSpace string, tenant string) (*http.Response, error) {
-	/*
-		URL: /namespaces/{namespace}/tenants/{tenant}/pvcs
-		HTTP Verb: GET
-	*/
-	request, err := http.NewRequest(
-		"GET", "http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant+"/pvcs/", nil)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestListPVCsForTenant(t *testing.T) {
-	/*
-		Function to list and verify the Tenant's Persistent Volume Claims
-	*/
-	assert := assert.New(t)
-	namespace := "tenant-lite"
-	tenant := "storage-lite"
-	resp, err := ListPVCsForTenant(namespace, tenant)
-	bodyResponse := resp.Body
-	assert.Nil(err)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			200, resp.StatusCode, "failed")
-	}
-	bodyBytes, _ := ioutil.ReadAll(bodyResponse)
-	listObjs := models.ListPVCsResponse{}
-	err = json.Unmarshal(bodyBytes, &listObjs)
-	if err != nil {
-		log.Println(err)
-		assert.Nil(err)
-	}
-	var pvcArray [4]string
-	pvcArray[0] = "data0-storage-lite-pool-0-0"
-	pvcArray[1] = "data0-storage-lite-pool-0-1"
-	pvcArray[2] = "data0-storage-lite-pool-0-2"
-	pvcArray[3] = "data0-storage-lite-pool-0-3"
-	for i := 0; i < len(pvcArray); i++ {
-		assert.Equal(strings.Contains(listObjs.Pvcs[i].Name, pvcArray[i]), true)
-	}
-}
-
-func CreateNamespace(nameSpace string) (*http.Response, error) {
-	/*
-		Description: Creates a new Namespace with given information
-		URL: /namespace
-		HTTP Verb: POST
-	*/
-	requestDataAdd := map[string]interface{}{
-		"name": nameSpace,
-	}
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"POST",
-		"http://localhost:9090/api/v1/namespace/",
-		requestDataBody,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestCreateNamespace(t *testing.T) {
-	/*
-		Function to Create a Namespace only once.
-	*/
-	assert := assert.New(t)
-	namespace := "new-namespace-thujun2208pm"
-	tests := []struct {
-		name           string
-		nameSpace      string
-		expectedStatus int
-	}{
-		{
-			name:           "Create Namespace for the first time",
-			expectedStatus: 201,
-			nameSpace:      namespace,
-		},
-		{
-			name:           "Create repeated namespace for second time",
-			expectedStatus: 500,
-			nameSpace:      namespace,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			resp, err := CreateNamespace(tt.nameSpace)
-			assert.Nil(err)
-			if err != nil {
-				log.Println(err)
-				return
-			}
-			if resp != nil {
-				assert.Equal(
-					tt.expectedStatus, resp.StatusCode, "failed")
-			} else {
-				assert.Fail("resp cannot be nil")
-			}
-		})
-	}
-}
-
-func LoginOperator() (*http.Response, error) {
-	/*
-		Description: Login to Operator Console.
-		URL: /login/operator
-		Params in the Body: jwt
-	*/
-	requestData := map[string]string{
-		"jwt": jwt,
-	}
-	fmt.Println("requestData: ", requestData)
-
-	requestDataJSON, _ := json.Marshal(requestData)
-
-	requestDataBody := bytes.NewReader(requestDataJSON)
-
-	request, err := http.NewRequest("POST", "http://localhost:9090/api/v1/login/operator", requestDataBody)
-	if err != nil {
-		log.Println(err)
-	}
-
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func LogoutOperator() (*http.Response, error) {
-	/*
-		Description: Logout from Operator.
-		URL: /logout
-	*/
-	request, err := http.NewRequest(
-		"POST",
-		"http://localhost:9090/api/v1/logout",
-		nil,
-	)
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestLogout(t *testing.T) {
-	// Vars
-	assert := assert.New(t)
-
-	// 1. Logout
-	response, err := LogoutOperator()
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if response != nil {
-		assert.Equal(
-			200,
-			response.StatusCode,
-			inspectHTTPResponse(response),
-		)
-	}
-
-	// 2. Login to recover token
-	response, err = LoginOperator()
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if response != nil {
-		for _, cookie := range response.Cookies() {
-			if cookie.Name == "token" {
-				token = cookie.Value
-				break
-			}
-		}
-	}
-
-	// Verify token
-	if token == "" {
-		assert.Fail("authentication token not found in cookies response")
-	}
-}
-
-func EnableTenantLogging(namespace, tenant string) (*http.Response, error) {
-	/*
-		Description: Enable Tenant Logging
-		HTTP Verb: POST
-	*/
-	request, err := http.NewRequest(
-		"POST",
-		"http://localhost:9090/api/v1/namespaces/"+namespace+"/tenants/"+tenant+"/enable-logging",
-		nil,
-	)
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func DisableTenantLogging(namespace, tenant string) (*http.Response, error) {
-	/*
-		Description: Disable Tenant Logging
-	*/
-	request, err := http.NewRequest(
-		"POST",
-		"http://localhost:9090/api/v1/namespaces/"+namespace+"/tenants/"+tenant+"/disable-logging",
-		nil,
-	)
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestEnableTenantLogging(t *testing.T) {
-	// Vars
-	assert := assert.New(t)
-	namespace := "tenant-lite"
-	tenant := "storage-lite"
-
-	// Enable tenant logging
-	resp, err := EnableTenantLogging(namespace, tenant)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			200,
-			resp.StatusCode,
-			inspectHTTPResponse(resp),
-		)
-	}
-}
-
-func TestDisableTenantLogging(t *testing.T) {
-	// Vars
-	assert := assert.New(t)
-	namespace := "tenant-lite"
-	tenant := "storage-lite"
-
-	// Disable tenant logging
-	resp, err := DisableTenantLogging(namespace, tenant)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			200,
-			resp.StatusCode,
-			inspectHTTPResponse(resp),
-		)
-	}
-}
-
-func GetTenantLogs(nameSpace, tenant string) (*http.Response, error) {
-	/*
-		URL: /namespaces/{namespace}/tenants/{tenant}/log
-		summary: Get Tenant Logs
-		HTTP Verb:GET
-	*/
-	request, err := http.NewRequest(
-		"GET",
-		"http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant+"/log",
-		nil,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func SetTenantLogs(labels, annotations, nodeSelector, dbLabels, dbAnnotations, dbNodeSelector []string, nameSpace, tenant, dbServiceAccountName, logMemRequest, logDBMemRequest, diskCapacityGB, serviceAccountName string) (*http.Response, error) {
-	/*
-		URL: /namespaces/{namespace}/tenants/{tenant}/log
-		summary: Set Tenant Logs
-		HTTP Verb: PUT
-	*/
-	requestDataAdd := map[string]interface{}{
-		"labels":               labels,
-		"annotations":          annotations,
-		"dbAnnotations":        dbAnnotations,
-		"dbLabels":             dbLabels,
-		"dbNodeSelector":       dbNodeSelector,
-		"diskCapacityGB":       diskCapacityGB,
-		"nodeSelector":         nodeSelector,
-		"serviceAccountName":   serviceAccountName,
-		"dbServiceAccountName": dbServiceAccountName,
-		"logMemRequest":        logMemRequest,
-		"logDBMemRequest":      logDBMemRequest,
-	}
-	requestDataJSON, _ := json.Marshal(requestDataAdd)
-	requestDataBody := bytes.NewReader(requestDataJSON)
-	request, err := http.NewRequest(
-		"PUT",
-		"http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant+"/log",
-		requestDataBody,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestGetTenantLogs(t *testing.T) {
-	// Vars
-	assert := assert.New(t)
-	namespace := "tenant-lite"
-	tenant := "storage-lite"
-
-	// Get Log Settings
-	resp, err := GetTenantLogs(namespace, tenant)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			200,
-			resp.StatusCode,
-			inspectHTTPResponse(resp),
-		)
-	}
-}
-
-func TestSetTenantLogs(t *testing.T) {
-	// Vars
-	assert := assert.New(t)
-	nameSpace := "tenant-lite"
-	tenant := "storage-lite"
-	var nodeSelector []string
-	var labels []string
-	var annotations []string
-	var dbAnnotations []string
-	var dbNodeSelector []string
-	var dbLabels []string
-	diskCapacityGB := "2"
-	dbServiceAccountName := ""
-	logMemRequest := "0Gi"
-	logDBMemRequest := "0Gi"
-	serviceAccountName := ""
-
-	// Set Tenant Logs
-	resp, err := SetTenantLogs(
-		labels,
-		annotations,
-		nodeSelector,
-		dbLabels,
-		dbAnnotations,
-		dbNodeSelector,
-		nameSpace,
-		tenant,
-		dbServiceAccountName,
-		logMemRequest,
-		logDBMemRequest,
-		diskCapacityGB,
-		serviceAccountName,
-	)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			200,
-			resp.StatusCode,
-			inspectHTTPResponse(resp),
-		)
-	}
-}
-
-func TenantDetails(nameSpace, tenant string) (*http.Response, error) {
-	/*
-		url: /namespaces/{namespace}/tenants/{tenant}
-		summary: Tenant Details
-		operationId: TenantDetails
-		HTTP Verb: GET
-	*/
-	request, err := http.NewRequest(
-		"GET",
-		"http://localhost:9090/api/v1/namespaces/"+nameSpace+"/tenants/"+tenant,
-		nil,
-	)
-	if err != nil {
-		log.Println(err)
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("token=%s", token))
-	request.Header.Add("Content-Type", "application/json")
-	client := &http.Client{
-		Timeout: 2 * time.Second,
-	}
-	response, err := client.Do(request)
-	return response, err
-}
-
-func TestTenantDetails(t *testing.T) {
-	// Vars
-	assert := assert.New(t)
-	nameSpace := "tenant-lite"
-	tenant := "storage-lite"
-	resp, err := TenantDetails(nameSpace, tenant)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-	if resp != nil {
-		assert.Equal(
-			200,
-			resp.StatusCode,
-			inspectHTTPResponse(resp),
-		)
-	}
-}
--- a/operatorapi/config.go
+++ b/operatorapi/config.go
@@ -69,10 +69,3 @@ func getK8sSAToken() string {
 func getMarketplace() string {
 	return env.Get(ConsoleMarketplace, "")
 }
-
-// Get DirectPVMode
-func getDirectPVEnabled() bool {
-	currentMode := env.Get(DirectPVMode, "off")
-
-	return currentMode == "on"
-}
--- a/operatorapi/config_test.go
+++ b/operatorapi/config_test.go
@@ -1,98 +0,0 @@
-// 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 <http://www.gnu.org/licenses/>.
-
-package operatorapi
-
-import (
-	"os"
-	"testing"
-)
-
-func Test_getK8sSAToken(t *testing.T) {
-	tests := []struct {
-		name string
-		want string
-		envs map[string]string
-	}{
-		{
-			name: "Missing file, empty",
-			want: "",
-			envs: nil,
-		},
-		{
-			name: "Missing file, return env",
-			want: "x",
-			envs: map[string]string{
-				ConsoleOperatorSAToken: "x",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.envs != nil {
-				for k, v := range tt.envs {
-					os.Setenv(k, v)
-				}
-			}
-			if got := getK8sSAToken(); got != tt.want {
-				t.Errorf("getK8sSAToken() = %v, want %v", got, tt.want)
-			}
-			if tt.envs != nil {
-				for k := range tt.envs {
-					os.Unsetenv(k)
-				}
-			}
-		})
-	}
-}
-
-func Test_getMarketplace(t *testing.T) {
-	tests := []struct {
-		name string
-		want string
-		envs map[string]string
-	}{
-		{
-			name: "Nothing set",
-			want: "",
-			envs: nil,
-		},
-		{
-			name: "Value set",
-			want: "x",
-			envs: map[string]string{
-				ConsoleMarketplace: "x",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if tt.envs != nil {
-				for k, v := range tt.envs {
-					os.Setenv(k, v)
-				}
-			}
-			if got := getMarketplace(); got != tt.want {
-				t.Errorf("getMarketplace() = %v, want %v", got, tt.want)
-			}
-			if tt.envs != nil {
-				for k := range tt.envs {
-					os.Unsetenv(k)
-				}
-			}
-		})
-	}
-}
--- a/operatorapi/configure_operator.go
+++ b/operatorapi/configure_operator.go
@@ -52,6 +52,7 @@ func configureFlags(api *operations.OperatorAPI) {
 }

 func configureAPI(api *operations.OperatorAPI) http.Handler {
+
 	// Applies when the "x-token" header is set
 	api.KeyAuth = func(token string, scopes []string) (*models.Principal, error) {
 		// we are validating the session token by decrypting the claims inside, if the operation succeed that means the jwt
@@ -89,12 +90,6 @@ func configureAPI(api *operations.OperatorAPI) http.Handler {
 	registerVolumesHandlers(api)
 	// Namespaces handlers
 	registerNamespaceHandlers(api)
-	// Marketplace handlers
-	registerMarketplaceHandlers(api)
-	// Subnet handlers
-	registerOperatorSubnetHandlers(api)
-	// Direct PV handlers
-	registerDirectPVHandlers(api)

 	api.PreServerShutdown = func() {}

--- a/operatorapi/consts.go
+++ b/operatorapi/consts.go
@@ -25,9 +25,6 @@ const (
 	prometheusPath   = "prometheus.io/path"
 	prometheusPort   = "prometheus.io/port"
 	prometheusScrape = "prometheus.io/scrape"
-
-	// Constants for DirectPV
-	DirectPVMode = "DIRECTPV_MODE"
 )

 // Image versions
--- a/operatorapi/directpv.go
+++ b/operatorapi/directpv.go
@@ -1,328 +0,0 @@
-// 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 <http://www.gnu.org/licenses/>.
-
-package operatorapi
-
-import (
-	"context"
-	"errors"
-	"sort"
-	"strings"
-
-	"github.com/minio/directpv/pkg/utils"
-
-	"github.com/go-openapi/runtime/middleware"
-	"github.com/minio/console/cluster"
-	"github.com/minio/console/models"
-	"github.com/minio/console/operatorapi/operations"
-	"github.com/minio/console/operatorapi/operations/operator_api"
-	xerrors "github.com/minio/console/restapi"
-	directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
-	"github.com/minio/directpv/pkg/sys"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-const XFS = "xfs"
-
-func registerDirectPVHandlers(api *operations.OperatorAPI) {
-	api.OperatorAPIGetDirectPVDriveListHandler = operator_api.GetDirectPVDriveListHandlerFunc(func(params operator_api.GetDirectPVDriveListParams, session *models.Principal) middleware.Responder {
-		resp, err := getDirectPVDrivesListResponse(session)
-		if err != nil {
-			return operator_api.NewGetDirectPVDriveListDefault(int(err.Code)).WithPayload(err)
-		}
-		return operator_api.NewGetDirectPVDriveListOK().WithPayload(resp)
-	})
-	api.OperatorAPIGetDirectPVVolumeListHandler = operator_api.GetDirectPVVolumeListHandlerFunc(func(params operator_api.GetDirectPVVolumeListParams, session *models.Principal) middleware.Responder {
-		resp, err := getDirectPVVolumesListResponse(session)
-		if err != nil {
-			return operator_api.NewGetDirectPVVolumeListDefault(int(err.Code)).WithPayload(err)
-		}
-		return operator_api.NewGetDirectPVVolumeListOK().WithPayload(resp)
-	})
-	api.OperatorAPIDirectPVFormatDriveHandler = operator_api.DirectPVFormatDriveHandlerFunc(func(params operator_api.DirectPVFormatDriveParams, session *models.Principal) middleware.Responder {
-		resp, err := formatVolumesResponse(session, params)
-		if err != nil {
-			return operator_api.NewDirectPVFormatDriveDefault(int(err.Code)).WithPayload(err)
-		}
-		return operator_api.NewDirectPVFormatDriveOK().WithPayload(resp)
-	})
-}
-
-// getDirectPVVolumesList returns directPV drives
-func getDirectPVDriveList(ctx context.Context, driveInterface DirectPVDrivesClientI) (*models.GetDirectPVDriveListResponse, error) {
-	drivesList, err := driveInterface.List(ctx, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-	res := &models.GetDirectPVDriveListResponse{}
-
-	// implementation same as directPV `drives ls` command
-	driveName := func(val string) string {
-		dr := strings.ReplaceAll(val, sys.DirectCSIDevRoot+"/", "")
-		dr = strings.ReplaceAll(dr, sys.HostDevRoot+"/", "")
-		return strings.ReplaceAll(dr, sys.DirectCSIPartitionInfix, "")
-	}
-	drivesSorted := drivesList.Items
-	// sort by nodename, path and status
-	sort.Slice(drivesSorted, func(i, j int) bool {
-		d1 := drivesSorted[i]
-		d2 := drivesSorted[j]
-
-		if v := strings.Compare(d1.Status.NodeName, d2.Status.NodeName); v != 0 {
-			return v < 0
-		}
-
-		if v := strings.Compare(d1.Status.Path, d2.Status.Path); v != 0 {
-			return v < 0
-		}
-
-		return strings.Compare(string(d1.Status.DriveStatus), string(d2.Status.DriveStatus)) < 0
-	})
-
-	for _, d := range drivesSorted {
-		volumes := 0
-
-		if len(d.Finalizers) > 1 {
-			volumes = len(d.Finalizers) - 1
-		}
-
-		dr := driveName(d.Status.Path)
-		dr = strings.ReplaceAll("/dev/"+dr, sys.DirectCSIPartitionInfix, "")
-
-		status := d.Status.DriveStatus
-		msg := ""
-		for _, c := range d.Status.Conditions {
-			switch c.Type {
-			case string(directcsi.DirectCSIDriveConditionInitialized), string(directcsi.DirectCSIDriveConditionOwned), string(directcsi.DirectCSIDriveConditionReady):
-				if c.Status != metav1.ConditionTrue {
-					msg = c.Message
-					if msg != "" {
-						status = d.Status.DriveStatus + "*"
-						msg = strings.ReplaceAll(msg, d.Name, "")
-						msg = strings.ReplaceAll(msg, sys.DirectCSIDevRoot, "/dev")
-						msg = strings.ReplaceAll(msg, sys.DirectCSIPartitionInfix, "")
-						msg = strings.Split(msg, "\n")[0]
-					}
-				}
-			}
-		}
-
-		var allocatedCapacity int64
-		if status == directcsi.DriveStatusInUse {
-			allocatedCapacity = d.Status.AllocatedCapacity
-		}
-
-		drStatus := d.Status.DriveStatus
-
-		driveInfo := &models.DirectPVDriveInfo{
-			Drive:     dr,
-			Capacity:  d.Status.TotalCapacity,
-			Allocated: allocatedCapacity,
-			Node:      d.Status.NodeName,
-			Status:    string(drStatus),
-			Message:   msg,
-			Volumes:   int64(volumes),
-		}
-		res.Drives = append(res.Drives, driveInfo)
-	}
-
-	return res, nil
-}
-
-func getDirectPVDrivesListResponse(session *models.Principal) (*models.GetDirectPVDriveListResponse, *models.Error) {
-	ctx := context.Background()
-
-	driveInterface, err := cluster.DirectPVDriveInterface(session.STSSessionToken)
-	if err != nil {
-		return nil, xerrors.ErrorWithContext(ctx, err)
-	}
-
-	directPVDrvClient := &directPVDrivesClient{
-		client: driveInterface,
-	}
-
-	drives, err := getDirectPVDriveList(ctx, directPVDrvClient)
-	if err != nil {
-		return nil, xerrors.ErrorWithContext(ctx, err)
-	}
-	return drives, nil
-}
-
-// getDirectPVVolumesList returns directPV volumes
-func getDirectPVVolumesList(ctx context.Context, volumeInterface DirectPVVolumesClientI) (*models.GetDirectPVVolumeListResponse, error) {
-	volList, err := volumeInterface.List(ctx, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	driveName := func(val string) string {
-		dr := strings.ReplaceAll(val, sys.DirectCSIDevRoot+"/", "")
-		return strings.ReplaceAll(dr, sys.HostDevRoot+"/", "")
-	}
-
-	getLabelValue := func(obj metav1.Object, key string) string {
-		if labels := obj.GetLabels(); labels != nil {
-			return labels[key]
-		}
-		return ""
-	}
-
-	var volumes []*models.DirectPVVolumeInfo
-	for _, v := range volList.Items {
-		vol := &models.DirectPVVolumeInfo{
-			Volume:   v.Name,
-			Capacity: v.Status.TotalCapacity,
-			Drive:    driveName(getLabelValue(&v, string(utils.DrivePathLabelKey))),
-			Node:     v.Status.NodeName,
-		}
-
-		volumes = append(volumes, vol)
-	}
-
-	res := &models.GetDirectPVVolumeListResponse{
-		Volumes: volumes,
-	}
-	return res, nil
-}
-
-func getDirectPVVolumesListResponse(session *models.Principal) (*models.GetDirectPVVolumeListResponse, *models.Error) {
-	ctx := context.Background()
-
-	volumeInterface, err := cluster.DirectPVVolumeInterface(session.STSSessionToken)
-	if err != nil {
-		return nil, xerrors.ErrorWithContext(ctx, err)
-	}
-
-	directPVVolClient := &directPVVolumesClient{
-		client: volumeInterface,
-	}
-
-	volumes, err := getDirectPVVolumesList(ctx, directPVVolClient)
-	if err != nil {
-		return nil, xerrors.ErrorWithContext(ctx, err)
-	}
-	return volumes, nil
-}
-
-func formatDrives(ctx context.Context, driveInterface DirectPVDrivesClientI, drives []string, force bool) (*models.FormatDirectPVDrivesResponse, error) {
-	if len(drives) == 0 {
-		return nil, errors.New("at least one drive needs to be set")
-	}
-
-	driveList, err := driveInterface.List(ctx, metav1.ListOptions{})
-	if err != nil {
-		return nil, err
-	}
-
-	driveName := func(val string) string {
-		dr := strings.ReplaceAll(val, sys.DirectCSIDevRoot+"/", "")
-		dr = strings.ReplaceAll(dr, sys.HostDevRoot+"/", "")
-		return strings.ReplaceAll(dr, sys.DirectCSIPartitionInfix, "")
-	}
-
-	drivesArray := map[string]string{}
-
-	for _, driveFromAPI := range drives {
-		drivesArray[driveFromAPI] = driveFromAPI
-	}
-
-	if len(driveList.Items) == 0 {
-		return nil, errors.New("no resources found globally")
-	}
-
-	var errorResponses []*models.PvFormatErrorResponse
-
-	for _, driveItem := range driveList.Items {
-		drName := "/dev/" + driveName(driveItem.Status.Path)
-		driveName := driveItem.Status.NodeName + ":" + drName
-
-		base := &models.PvFormatErrorResponse{
-			Node:  driveItem.Status.NodeName,
-			Drive: drName,
-			Error: "",
-		}
-
-		// Element is requested to be formatted
-		if _, ok := drivesArray[driveName]; ok {
-			if driveItem.Status.DriveStatus == directcsi.DriveStatusUnavailable {
-				base.Error = "Status is unavailable"
-				errorResponses = append(errorResponses, base)
-				continue
-			}
-
-			if driveItem.Status.DriveStatus == directcsi.DriveStatusInUse {
-				base.Error = "Drive in use. Cannot be formatted"
-				errorResponses = append(errorResponses, base)
-				continue
-			}
-
-			if driveItem.Status.DriveStatus == directcsi.DriveStatusReady {
-				base.Error = "Drive already owned and managed."
-				errorResponses = append(errorResponses, base)
-				continue
-			}
-			if driveItem.Status.Filesystem != "" && !force {
-				base.Error = "Drive already has a fs. Use force to overwrite"
-				errorResponses = append(errorResponses, base)
-				continue
-			}
-
-			if driveItem.Status.DriveStatus == directcsi.DriveStatusReleased {
-				base.Error = "Drive is in 'released state'. Please wait until it becomes available"
-				errorResponses = append(errorResponses, base)
-				continue
-			}
-
-			// Validation passes, we request format
-			driveItem.Spec.DirectCSIOwned = true
-			driveItem.Spec.RequestedFormat = &directcsi.RequestedFormat{
-				Filesystem: XFS,
-				Force:      force,
-			}
-
-			_, err := driveInterface.Update(ctx, &driveItem, metav1.UpdateOptions{})
-			if err != nil {
-				base.Error = err.Error()
-				errorResponses = append(errorResponses, base)
-			}
-		}
-	}
-
-	returnErrors := &models.FormatDirectPVDrivesResponse{
-		FormatIssuesList: errorResponses,
-	}
-
-	return returnErrors, nil
-}
-
-func formatVolumesResponse(session *models.Principal, params operator_api.DirectPVFormatDriveParams) (*models.FormatDirectPVDrivesResponse, *models.Error) {
-	ctx := context.Background()
-
-	driveInterface, err := cluster.DirectPVDriveInterface(session.STSSessionToken)
-	if err != nil {
-		return nil, xerrors.ErrorWithContext(ctx, err)
-	}
-
-	directPVDrvClient := &directPVDrivesClient{
-		client: driveInterface,
-	}
-
-	formatResult, errFormat := formatDrives(ctx, directPVDrvClient, params.Body.Drives, *params.Body.Force)
-	if errFormat != nil {
-		return nil, xerrors.ErrorWithContext(ctx, errFormat)
-	}
-	return formatResult, nil
-}
--- a/operatorapi/directpv_client.go
+++ b/operatorapi/directpv_client.go
@@ -1,73 +0,0 @@
-// 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 <http://www.gnu.org/licenses/>.
-
-package operatorapi
-
-import (
-	"context"
-
-	"github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
-	directPVClient "github.com/minio/directpv/pkg/client"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// DirectPVDrivesClientI interface with all functions to be implemented
-// by mock when testing, it should include all DirectPVDrivesClientI respective api calls
-// that are used within this project.
-type DirectPVDrivesClientI interface {
-	List(ctx context.Context, opts metav1.ListOptions) (*v1beta4.DirectCSIDriveList, error)
-	Update(ctx context.Context, driveItem *v1beta4.DirectCSIDrive, opts metav1.UpdateOptions) (*v1beta4.DirectCSIDriveList, error)
-}
-
-// Interface implementation
-//
-// Define the structure of directpv drive client and define the functions that are actually used
-// from the minio operator / directpv interface.
-
-type directPVDrivesClient struct {
-	client *directPVClient.DirectCSIDriveInterface
-}
-
-// List implements the listing for DirectPV Drives List functionality
-func (dpd *directPVDrivesClient) List(ctx context.Context, opts metav1.ListOptions) (*v1beta4.DirectCSIDriveList, error) {
-	return dpd.List(ctx, opts)
-}
-
-// Update implements the listing for DirectPV Drives Update functionality
-func (dpd *directPVDrivesClient) Update(ctx context.Context, driveItem *v1beta4.DirectCSIDrive, opts metav1.UpdateOptions) (*v1beta4.DirectCSIDriveList, error) {
-	return dpd.Update(ctx, driveItem, opts)
-}
-
-// DirectPVVolumesClientI interface with all functions to be implemented
-// by mock when testing, it should include all DirectPVVolumesClientI respective api calls
-// that are used within this project.
-type DirectPVVolumesClientI interface {
-	List(ctx context.Context, opts metav1.ListOptions) (*v1beta4.DirectCSIVolumeList, error)
-}
-
-// Interface implementation
-//
-// Define the structure of directpv volumes client and define the functions that are actually used
-// from the minio operator / directpv interface.
-
-type directPVVolumesClient struct {
-	client *directPVClient.DirectCSIVolumeInterface
-}
-
-// List implements the listing for DirectPV Volumes List functionality
-func (dpv *directPVVolumesClient) List(ctx context.Context, opts metav1.ListOptions) (*v1beta4.DirectCSIVolumeList, error) {
-	return dpv.List(ctx, opts)
-}
--- a/operatorapi/directpv_test.go
+++ b/operatorapi/directpv_test.go
@@ -1,410 +0,0 @@
-// 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 <http://www.gnu.org/licenses/>.
-
-package operatorapi
-
-import (
-	"context"
-	"errors"
-	"testing"
-
-	"github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-var (
-	dpdClientListMock   func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error)
-	dpdClientUpdateMock func(ctx context.Context, driveItem *v1beta4.DirectCSIDrive, opts v1.UpdateOptions) (*v1beta4.DirectCSIDriveList, error)
-)
-
-// mock function for drives List()
-func (dpdm directPVDriveMock) List(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error) {
-	return dpdClientListMock(ctx, opts)
-}
-
-func (dpdm directPVDriveMock) Update(ctx context.Context, driveItem *v1beta4.DirectCSIDrive, opts v1.UpdateOptions) (*v1beta4.DirectCSIDriveList, error) {
-	return dpdClientUpdateMock(ctx, driveItem, opts)
-}
-
-var dpvClientListMock func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIVolumeList, error)
-
-// mock function for volumes List()
-func (dpvm directPVVolumeMock) List(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIVolumeList, error) {
-	return dpvClientListMock(ctx, opts)
-}
-
-// DirectPVDrivesList
-func Test_GetDirectPVDrives(t *testing.T) {
-	directPVDrvMock := directPVDriveMock{}
-
-	type args struct {
-		ctx  context.Context
-		opts v1.ListOptions
-	}
-	tests := []struct {
-		name           string
-		args           args
-		client         DirectPVDrivesClientI
-		mockListDrives func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error)
-		wantErr        bool
-	}{
-		{
-			name: "Can List Drives correctly",
-			args: args{
-				ctx:  context.Background(),
-				opts: v1.ListOptions{},
-			},
-			client: directPVDrvMock,
-			mockListDrives: func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error) {
-				items := []v1beta4.DirectCSIDrive{}
-
-				returnList := v1beta4.DirectCSIDriveList{
-					Items: items,
-				}
-
-				return &returnList, nil
-			},
-			wantErr: false,
-		},
-		{
-			name: "Drives request from DirectPV failed",
-			args: args{
-				ctx: context.Background(),
-			},
-			client: directPVDrvMock,
-			mockListDrives: func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error) {
-				return nil, errors.New("some error occurred")
-			},
-			wantErr: true,
-		},
-		{
-			name: "Drives request from DirectPV has information and doesn't return errors",
-			args: args{
-				ctx: context.Background(),
-			},
-			client: directPVDrvMock,
-			mockListDrives: func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error) {
-				items := []v1beta4.DirectCSIDrive{
-					{
-						Status: v1beta4.DirectCSIDriveStatus{
-							Path:              "/var/lib/direct-csi/devices/test-part-dev0-directcsi",
-							AllocatedCapacity: 0,
-							FreeCapacity:      4772382377372,
-							RootPartition:     "/",
-							PartitionNum:      0,
-							Filesystem:        "nfs",
-							Mountpoint:        "",
-							NodeName:          "test-dev0-directcsi",
-							DriveStatus:       v1beta4.DriveStatusReady,
-							ModelNumber:       "testModel",
-							SerialNumber:      "testSN",
-							TotalCapacity:     4772382377372,
-							PhysicalBlockSize: 1024,
-							LogicalBlockSize:  1024,
-							AccessTier:        "",
-							FilesystemUUID:    "",
-							PartitionUUID:     "",
-							MajorNumber:       0,
-							MinorNumber:       0,
-							UeventSerial:      "",
-							UeventFSUUID:      "",
-							WWID:              "",
-							Vendor:            "",
-							DMName:            "",
-							DMUUID:            "",
-							MDUUID:            "",
-							PartTableUUID:     "",
-							PartTableType:     "",
-							Virtual:           false,
-							ReadOnly:          false,
-							Partitioned:       false,
-							SwapOn:            false,
-							Master:            "",
-							OtherMountsInfo:   nil,
-							PCIPath:           "",
-							SerialNumberLong:  "",
-							Conditions: []v1.Condition{{
-								Type:               "",
-								Status:             "",
-								ObservedGeneration: 0,
-								LastTransitionTime: v1.Time{},
-								Reason:             "",
-								Message:            "",
-							}},
-						},
-					},
-					{
-						Status: v1beta4.DirectCSIDriveStatus{
-							Path:              "/var/lib/direct-csi/devices/test-part-dev1-directcsi",
-							AllocatedCapacity: 0,
-							FreeCapacity:      4772382377372,
-							RootPartition:     "/",
-							PartitionNum:      0,
-							Filesystem:        "nfs",
-							Mountpoint:        "",
-							NodeName:          "test-dev1-directcsi",
-							DriveStatus:       v1beta4.DriveStatus(v1beta4.DirectCSIDriveConditionOwned),
-							ModelNumber:       "testModel",
-							SerialNumber:      "testSN2",
-							TotalCapacity:     4772382377372,
-							PhysicalBlockSize: 1024,
-							LogicalBlockSize:  1024,
-							AccessTier:        "",
-							FilesystemUUID:    "",
-							PartitionUUID:     "",
-							MajorNumber:       0,
-							MinorNumber:       0,
-							UeventSerial:      "",
-							UeventFSUUID:      "",
-							WWID:              "",
-							Vendor:            "",
-							DMName:            "",
-							DMUUID:            "",
-							MDUUID:            "",
-							PartTableUUID:     "",
-							PartTableType:     "",
-							Virtual:           false,
-							ReadOnly:          false,
-							Partitioned:       false,
-							SwapOn:            false,
-							Master:            "",
-							OtherMountsInfo:   nil,
-							PCIPath:           "",
-							SerialNumberLong:  "",
-							Conditions:        nil,
-						},
-					},
-				}
-
-				returnList := v1beta4.DirectCSIDriveList{
-					Items: items,
-				}
-
-				return &returnList, nil
-			},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			dpdClientListMock = tt.mockListDrives
-
-			_, err := getDirectPVDriveList(tt.args.ctx, tt.client)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("getNamespaceCreated() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-// DirectPVVolumesList
-func Test_GetDirectPVVolumes(t *testing.T) {
-	directPVVolMock := directPVVolumeMock{}
-
-	type args struct {
-		ctx  context.Context
-		opts v1.ListOptions
-	}
-	tests := []struct {
-		name            string
-		args            args
-		volumesClient   DirectPVVolumesClientI
-		mockListVolumes func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIVolumeList, error)
-		wantErr         bool
-	}{
-		{
-			name: "Can List Volumes correctly",
-			args: args{
-				ctx:  context.Background(),
-				opts: v1.ListOptions{},
-			},
-			volumesClient: directPVVolMock,
-			mockListVolumes: func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIVolumeList, error) {
-				items := []v1beta4.DirectCSIVolume{}
-
-				returnList := v1beta4.DirectCSIVolumeList{
-					Items: items,
-				}
-
-				return &returnList, nil
-			},
-			wantErr: false,
-		},
-		{
-			name: "Drives request from DirectPV is ok but volumes request failed",
-			args: args{
-				ctx: context.Background(),
-			},
-			volumesClient: directPVVolMock,
-			mockListVolumes: func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIVolumeList, error) {
-				return nil, errors.New("some error occurred")
-			},
-			wantErr: true,
-		},
-		{
-			name: "Can List Volumes & Drives correctly without any issue",
-			args: args{
-				ctx:  context.Background(),
-				opts: v1.ListOptions{},
-			},
-			volumesClient: directPVVolMock,
-			mockListVolumes: func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIVolumeList, error) {
-				items := []v1beta4.DirectCSIVolume{{
-					Status: v1beta4.DirectCSIVolumeStatus{
-						Drive:             "/var/lib/direct-csi/devices/test-part-dev1-directcsi",
-						NodeName:          "testNodeName",
-						HostPath:          "",
-						StagingPath:       "",
-						ContainerPath:     "",
-						TotalCapacity:     4772382377372,
-						AvailableCapacity: 4772382377372,
-						UsedCapacity:      0,
-						Conditions:        nil,
-					},
-				}}
-
-				returnList := v1beta4.DirectCSIVolumeList{
-					Items: items,
-				}
-
-				return &returnList, nil
-			},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			dpvClientListMock = tt.mockListVolumes
-
-			_, err := getDirectPVVolumesList(tt.args.ctx, tt.volumesClient)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("getNamespaceCreated() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-// FormatDrives
-func Test_GetDirectPVFormatDrives(t *testing.T) {
-	directPVDrvMock := directPVDriveMock{}
-
-	type args struct {
-		ctx  context.Context
-		opts v1.ListOptions
-	}
-	tests := []struct {
-		name           string
-		args           args
-		drivesClient   DirectPVDrivesClientI
-		mockListDrives func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error)
-		drives         []string
-		force          bool
-		wantErr        bool
-	}{
-		{
-			name: "Format doesn't crash on empty list & returns error",
-			args: args{
-				ctx:  context.Background(),
-				opts: v1.ListOptions{},
-			},
-			drivesClient: directPVDrvMock,
-			mockListDrives: func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error) {
-				items := []v1beta4.DirectCSIDrive{}
-
-				returnList := v1beta4.DirectCSIDriveList{
-					Items: items,
-				}
-
-				return &returnList, nil
-			},
-			drives:  []string{},
-			force:   false,
-			wantErr: true,
-		},
-		{
-			name: "Can Format Selected drives",
-			args: args{
-				ctx:  context.Background(),
-				opts: v1.ListOptions{},
-			},
-			drivesClient: directPVDrvMock,
-			mockListDrives: func(ctx context.Context, opts v1.ListOptions) (*v1beta4.DirectCSIDriveList, error) {
-				items := []v1beta4.DirectCSIDrive{
-					{
-						Status: v1beta4.DirectCSIDriveStatus{
-							Path:              "/var/lib/direct-csi/devices/test-part-dev1-directcsi",
-							AllocatedCapacity: 0,
-							FreeCapacity:      4772382377372,
-							RootPartition:     "/",
-							PartitionNum:      0,
-							Filesystem:        "nfs",
-							Mountpoint:        "",
-							NodeName:          "test-dev1-directcsi",
-							DriveStatus:       v1beta4.DriveStatusAvailable,
-							ModelNumber:       "testModel",
-							SerialNumber:      "testSN2",
-							TotalCapacity:     4772382377372,
-							PhysicalBlockSize: 1024,
-							LogicalBlockSize:  1024,
-							AccessTier:        "",
-							FilesystemUUID:    "",
-							PartitionUUID:     "",
-							MajorNumber:       0,
-							MinorNumber:       0,
-							UeventSerial:      "",
-							UeventFSUUID:      "",
-							WWID:              "",
-							Vendor:            "",
-							DMName:            "",
-							DMUUID:            "",
-							MDUUID:            "",
-							PartTableUUID:     "",
-							PartTableType:     "",
-							Virtual:           false,
-							ReadOnly:          false,
-							Partitioned:       false,
-							SwapOn:            false,
-							Master:            "",
-							OtherMountsInfo:   nil,
-							PCIPath:           "",
-							SerialNumberLong:  "",
-							Conditions:        nil,
-						},
-					},
-				}
-
-				returnList := v1beta4.DirectCSIDriveList{
-					Items: items,
-				}
-
-				return &returnList, nil
-			},
-			drives:  []string{"test-dev1-directcsi:/dev/testdev1-directcsi"},
-			force:   false,
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			dpdClientListMock = tt.mockListDrives
-
-			_, err := formatDrives(tt.args.ctx, tt.drivesClient, tt.drives, tt.force)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("getNamespaceCreated() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
--- a/operatorapi/embedded_spec.go
+++ b/operatorapi/embedded_spec.go
--- a/operatorapi/integrations.go
+++ b/operatorapi/integrations.go
@@ -112,6 +112,7 @@ func gkeIntegration(clientset *kubernetes.Clientset, tenantName string, namespac
 			Name: tenantNpSvc,
 		},
 		Spec: corev1.ServiceSpec{
+
 			Selector: map[string]string{
 				"v1.min.io/instance": tenantName,
 			},
@@ -131,7 +132,7 @@ func gkeIntegration(clientset *kubernetes.Clientset, tenantName string, namespac
 		return err
 	}

-	// NOW FOR Console
+	//NOW FOR Console
 	// create consoleManagedCertificate

 	// get a nodeport port for this tenant and create a nodeport for it
--- a/operatorapi/k8s_client.go
+++ b/operatorapi/k8s_client.go
@@ -38,11 +38,6 @@ type K8sClientI interface {
 	deleteSecret(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error
 	createSecret(ctx context.Context, namespace string, secret *v1.Secret, opts metav1.CreateOptions) (*v1.Secret, error)
 	updateSecret(ctx context.Context, namespace string, secret *v1.Secret, opts metav1.UpdateOptions) (*v1.Secret, error)
-	getPVC(ctx context.Context, namespace string, pvcName string, opts metav1.GetOptions) (*v1.PersistentVolumeClaim, error)
-	getConfigMap(ctx context.Context, namespace, configMap string, opts metav1.GetOptions) (*v1.ConfigMap, error)
-	createConfigMap(ctx context.Context, namespace string, cm *v1.ConfigMap, opts metav1.CreateOptions) (*v1.ConfigMap, error)
-	updateConfigMap(ctx context.Context, namespace string, cm *v1.ConfigMap, opts metav1.UpdateOptions) (*v1.ConfigMap, error)
-	deleteConfigMap(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error
 }

 // Interface implementation
@@ -87,23 +82,3 @@ func (c *k8sClient) getNamespace(ctx context.Context, name string, opts metav1.G
 func (c *k8sClient) getStorageClasses(ctx context.Context, opts metav1.ListOptions) (*storagev1.StorageClassList, error) {
 	return c.client.StorageV1().StorageClasses().List(ctx, opts)
 }
-
-func (c *k8sClient) getPVC(ctx context.Context, namespace string, pvcName string, opts metav1.GetOptions) (*v1.PersistentVolumeClaim, error) {
-	return c.client.CoreV1().PersistentVolumeClaims(namespace).Get(ctx, pvcName, opts)
-}
-
-func (c *k8sClient) getConfigMap(ctx context.Context, namespace, name string, opts metav1.GetOptions) (*v1.ConfigMap, error) {
-	return c.client.CoreV1().ConfigMaps(namespace).Get(ctx, name, opts)
-}
-
-func (c *k8sClient) createConfigMap(ctx context.Context, namespace string, cm *v1.ConfigMap, opts metav1.CreateOptions) (*v1.ConfigMap, error) {
-	return c.client.CoreV1().ConfigMaps(namespace).Create(ctx, cm, opts)
-}
-
-func (c *k8sClient) updateConfigMap(ctx context.Context, namespace string, cm *v1.ConfigMap, opts metav1.UpdateOptions) (*v1.ConfigMap, error) {
-	return c.client.CoreV1().ConfigMaps(namespace).Update(ctx, cm, opts)
-}
-
-func (c *k8sClient) deleteConfigMap(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error {
-	return c.client.CoreV1().ConfigMaps(namespace).Delete(ctx, name, opts)
-}
--- a/operatorapi/login.go
+++ b/operatorapi/login.go
@@ -118,7 +118,6 @@ func getLoginDetailsResponse(params authApi.LoginDetailParams) (*models.LoginDet
 	loginDetails := &models.LoginDetails{
 		LoginStrategy: loginStrategy,
 		Redirect:      redirectURL,
-		IsDirectPV:    getDirectPVEnabled(),
 	}
 	return loginDetails, nil
 }
--- a/operatorapi/logs.go
+++ b/operatorapi/logs.go
@@ -25,10 +25,8 @@ import (
 	"github.com/minio/cli"
 )

-var (
-	infoLog  = log.New(os.Stdout, "I: ", log.LstdFlags)
-	errorLog = log.New(os.Stdout, "E: ", log.LstdFlags)
-)
+var infoLog = log.New(os.Stdout, "I: ", log.LstdFlags)
+var errorLog = log.New(os.Stdout, "E: ", log.LstdFlags)

 func logInfo(msg string, data ...interface{}) {
 	infoLog.Printf(msg+"\n", data...)
--- a/operatorapi/marketplace.go
+++ b/operatorapi/marketplace.go
@@ -1,194 +0,0 @@
-// 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 <http://www.gnu.org/licenses/>.
-
-package operatorapi
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/go-openapi/runtime/middleware"
-	"github.com/golang-jwt/jwt/v4"
-	"github.com/minio/console/cluster"
-	"github.com/minio/console/models"
-	"github.com/minio/console/operatorapi/operations"
-	"github.com/minio/console/operatorapi/operations/operator_api"
-	"github.com/minio/console/pkg"
-	errors "github.com/minio/console/restapi"
-	"github.com/minio/pkg/env"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-var (
-	mpConfigMapDefault = "mp-config"
-	mpConfigMapKey     = "MP_CONFIG_KEY"
-	mpHostEnvVar       = "MP_HOST"
-	defaultMPHost      = "https://marketplace.apps.min.dev"
-	mpEUHostEnvVar     = "MP_EU_HOST"
-	defaultEUMPHost    = "https://marketplace-eu.apps.min.dev"
-	isMPEmailSet       = "isEmailSet"
-	emailNotSetMsg     = "Email was not sent in request"
-)
-
-func registerMarketplaceHandlers(api *operations.OperatorAPI) {
-	api.OperatorAPIGetMPIntegrationHandler = operator_api.GetMPIntegrationHandlerFunc(func(params operator_api.GetMPIntegrationParams, session *models.Principal) middleware.Responder {
-		payload, err := getMPIntegrationResponse(session, params)
-		if err != nil {
-			return operator_api.NewGetMPIntegrationDefault(int(err.Code)).WithPayload(err)
-		}
-		return operator_api.NewGetMPIntegrationOK().WithPayload(payload)
-	})
-
-	api.OperatorAPIPostMPIntegrationHandler = operator_api.PostMPIntegrationHandlerFunc(func(params operator_api.PostMPIntegrationParams, session *models.Principal) middleware.Responder {
-		err := postMPIntegrationResponse(session, params)
-		if err != nil {
-			return operator_api.NewPostMPIntegrationDefault(int(err.Code)).WithPayload(err)
-		}
-		return operator_api.NewPostMPIntegrationCreated()
-	})
-}
-
-func getMPIntegrationResponse(session *models.Principal, params operator_api.GetMPIntegrationParams) (*operator_api.GetMPIntegrationOKBody, *models.Error) {
-	clientSet, err := cluster.K8sClient(session.STSSessionToken)
-	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
-	defer cancel()
-	if err != nil {
-		return nil, errors.ErrorWithContext(ctx, err)
-	}
-	isMPEmailSet, err := getMPEmail(ctx, &k8sClient{client: clientSet})
-	if err != nil {
-		return nil, errors.ErrorWithContext(ctx, errors.ErrNotFound)
-	}
-	return &operator_api.GetMPIntegrationOKBody{
-		IsEmailSet: isMPEmailSet,
-	}, nil
-}
-
-func getMPEmail(ctx context.Context, clientSet K8sClientI) (bool, error) {
-	cm, err := clientSet.getConfigMap(ctx, "default", getMPConfigMapKey(mpConfigMapKey), metav1.GetOptions{})
-	if err != nil {
-		return false, err
-	}
-	return cm.Data[isMPEmailSet] == "true", nil
-}
-
-func postMPIntegrationResponse(session *models.Principal, params operator_api.PostMPIntegrationParams) *models.Error {
-	clientSet, err := cluster.K8sClient(session.STSSessionToken)
-	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
-	defer cancel()
-	if err != nil {
-		return errors.ErrorWithContext(ctx, err)
-	}
-	return setMPIntegration(ctx, params.Body.Email, params.Body.IsInEU, &k8sClient{client: clientSet})
-}
-
-func setMPIntegration(ctx context.Context, email string, isInEU bool, clientSet K8sClientI) *models.Error {
-	if email == "" {
-		return errors.ErrorWithContext(ctx, errors.ErrBadRequest, fmt.Errorf(emailNotSetMsg))
-	}
-	if _, err := setMPEmail(ctx, email, isInEU, clientSet); err != nil {
-		return errors.ErrorWithContext(ctx, err)
-	}
-	return nil
-}
-
-func setMPEmail(ctx context.Context, email string, isInEU bool, clientSet K8sClientI) (*corev1.ConfigMap, error) {
-	if err := postEmailToMP(email, isInEU); err != nil {
-		return nil, err
-	}
-	cm := createCM()
-	return clientSet.createConfigMap(ctx, "default", cm, metav1.CreateOptions{})
-}
-
-func postEmailToMP(email string, isInEU bool) error {
-	mpURL, err := getMPURL(isInEU)
-	if err != nil {
-		return err
-	}
-	return makePostRequestToMP(mpURL, email)
-}
-
-func getMPURL(isInEU bool) (string, error) {
-	mpHost := getMPHost(isInEU)
-	if mpHost == "" {
-		return "", fmt.Errorf("mp host not set")
-	}
-	return fmt.Sprintf("%s/mp-email", mpHost), nil
-}
-
-func getMPHost(isInEU bool) string {
-	if isInEU {
-		return env.Get(mpEUHostEnvVar, defaultEUMPHost)
-	}
-	return env.Get(mpHostEnvVar, defaultMPHost)
-}
-
-func makePostRequestToMP(url, email string) error {
-	request, err := createMPRequest(url, email)
-	if err != nil {
-		return err
-	}
-	client := &http.Client{Timeout: 3 * time.Second}
-	if res, err := client.Do(request); err != nil {
-		return err
-	} else if res.StatusCode >= http.StatusBadRequest {
-		b, _ := io.ReadAll(res.Body)
-		return fmt.Errorf("request to %s failed with status code %d and error %s", url, res.StatusCode, string(b))
-	}
-	return nil
-}
-
-func createMPRequest(url, email string) (*http.Request, error) {
-	request, err := http.NewRequest("POST", url, strings.NewReader(fmt.Sprintf("{\"email\":\"%s\"}", email)))
-	if err != nil {
-		return nil, err
-	}
-	jwtToken := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{})
-	jwtTokenString, err := jwtToken.SignedString([]byte(pkg.MPSecret))
-	if err != nil {
-		return nil, err
-	}
-	request.Header.Add("Cookie", fmt.Sprintf("jwtToken=%s", jwtTokenString))
-	request.Header.Add("Content-Type", "application/json")
-	return request, nil
-}
-
-func createCM() *corev1.ConfigMap {
-	return &corev1.ConfigMap{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "ConfigMap",
-			APIVersion: "v1",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      getMPConfigMapKey(mpConfigMapKey),
-			Namespace: "default",
-		},
-		Data: map[string]string{isMPEmailSet: "true"},
-	}
-}
-
-func getMPConfigMapKey(envVar string) string {
-	if mp := os.Getenv(envVar); mp != "" {
-		return mp
-	}
-	return mpConfigMapDefault
-}
--- a/operatorapi/marketplace_test.go
+++ b/operatorapi/marketplace_test.go
@@ -1,214 +0,0 @@
-// 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 <http://www.gnu.org/licenses/>.
-
-package operatorapi
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"testing"
-
-	"github.com/minio/console/models"
-	"github.com/minio/console/operatorapi/operations"
-	"github.com/minio/console/operatorapi/operations/operator_api"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/suite"
-	corev1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-var (
-	testWithError                = false
-	testServerWithError          = false
-	errMock                      = errors.New("mock error")
-	k8sClientGetConfigMapMock    func(ctx context.Context, namespace, configMap string, opts metav1.GetOptions) (*corev1.ConfigMap, error)
-	k8sClientCreateConfigMapMock func(ctx context.Context, namespace string, cm *corev1.ConfigMap, opts metav1.CreateOptions) (*corev1.ConfigMap, error)
-	k8sClientUpdateConfigMapMock func(ctx context.Context, namespace string, cm *corev1.ConfigMap, opts metav1.UpdateOptions) (*corev1.ConfigMap, error)
-	k8sClientDeleteConfigMapMock func(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error
-)
-
-type MarketplaceTestSuite struct {
-	suite.Suite
-	assert     *assert.Assertions
-	kClient    k8sClientMock
-	namespace  string
-	postServer *httptest.Server
-}
-
-func (c k8sClientMock) getConfigMap(ctx context.Context, namespace, configMap string, opts metav1.GetOptions) (*corev1.ConfigMap, error) {
-	return k8sClientGetConfigMapMock(ctx, namespace, configMap, opts)
-}
-
-func (c k8sClientMock) createConfigMap(ctx context.Context, namespace string, cm *corev1.ConfigMap, opts metav1.CreateOptions) (*corev1.ConfigMap, error) {
-	return k8sClientCreateConfigMapMock(ctx, namespace, cm, opts)
-}
-
-func (c k8sClientMock) updateConfigMap(ctx context.Context, namespace string, cm *corev1.ConfigMap, opts metav1.UpdateOptions) (*corev1.ConfigMap, error) {
-	return k8sClientUpdateConfigMapMock(ctx, namespace, cm, opts)
-}
-
-func (c k8sClientMock) deleteConfigMap(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error {
-	return k8sClientDeleteConfigMapMock(ctx, namespace, name, opts)
-}
-
-func (suite *MarketplaceTestSuite) SetupSuite() {
-	suite.assert = assert.New(suite.T())
-	suite.namespace = "default"
-	k8sClientGetConfigMapMock = suite.getConfigMapMock
-	k8sClientCreateConfigMapMock = suite.createConfigMapMock
-	k8sClientUpdateConfigMapMock = suite.updateConfigMapMock
-	k8sClientDeleteConfigMapMock = suite.deleteConfigMapMock
-	os.Setenv(mpConfigMapKey, "mp-mock-config")
-	suite.postServer = httptest.NewServer(http.HandlerFunc(suite.postHandler))
-}
-
-func (suite *MarketplaceTestSuite) postHandler(
-	w http.ResponseWriter, r *http.Request,
-) {
-	if testServerWithError {
-		w.WriteHeader(400)
-	} else {
-		fmt.Fprintf(w, `{"post": "Post response"}`)
-	}
-}
-
-func (suite *MarketplaceTestSuite) TearDownSuite() {
-	os.Unsetenv(mpConfigMapKey)
-}
-
-func (suite *MarketplaceTestSuite) getConfigMapMock(ctx context.Context, namespace, configMap string, opts metav1.GetOptions) (*corev1.ConfigMap, error) {
-	if testWithError {
-		return nil, errMock
-	}
-	return &corev1.ConfigMap{Data: map[string]string{isMPEmailSet: "true"}}, nil
-}
-
-func (suite *MarketplaceTestSuite) createConfigMapMock(ctx context.Context, namespace string, cm *corev1.ConfigMap, opts metav1.CreateOptions) (*corev1.ConfigMap, error) {
-	if testWithError {
-		return nil, errMock
-	}
-	return &corev1.ConfigMap{}, nil
-}
-
-func (suite *MarketplaceTestSuite) updateConfigMapMock(ctx context.Context, namespace string, cm *corev1.ConfigMap, opts metav1.UpdateOptions) (*corev1.ConfigMap, error) {
-	if testWithError {
-		return nil, errMock
-	}
-	return &corev1.ConfigMap{}, nil
-}
-
-func (suite *MarketplaceTestSuite) deleteConfigMapMock(ctx context.Context, namespace string, name string, opts metav1.DeleteOptions) error {
-	if testWithError {
-		return errMock
-	}
-	return nil
-}
-
-func (suite *MarketplaceTestSuite) TestRegisterMarketplaceHandlers() {
-	api := &operations.OperatorAPI{}
-	suite.assert.Nil(api.OperatorAPIGetMPIntegrationHandler)
-	suite.assert.Nil(api.OperatorAPIPostMPIntegrationHandler)
-	registerMarketplaceHandlers(api)
-	suite.assert.NotNil(api.OperatorAPIGetMPIntegrationHandler)
-	suite.assert.NotNil(api.OperatorAPIPostMPIntegrationHandler)
-}
-
-func (suite *MarketplaceTestSuite) TestGetMPIntegrationHandlerWithError() {
-	api := &operations.OperatorAPI{}
-	registerMarketplaceHandlers(api)
-	params := operator_api.NewGetMPIntegrationParams()
-	params.HTTPRequest = &http.Request{}
-	response := api.OperatorAPIGetMPIntegrationHandler.Handle(params, &models.Principal{})
-	_, ok := response.(*operator_api.GetMPIntegrationDefault)
-	suite.assert.True(ok)
-}
-
-func (suite *MarketplaceTestSuite) TestPostMPIntegrationHandlerWithError() {
-	api := &operations.OperatorAPI{}
-	registerMarketplaceHandlers(api)
-	params := operator_api.NewPostMPIntegrationParams()
-	params.Body = &models.MpIntegration{Email: ""}
-	params.HTTPRequest = &http.Request{}
-	params.HTTPRequest.Header = map[string][]string{}
-	params.HTTPRequest.AddCookie(&http.Cookie{Value: "token", Name: "token"})
-	response := api.OperatorAPIPostMPIntegrationHandler.Handle(params, &models.Principal{})
-	_, ok := response.(*operator_api.PostMPIntegrationDefault)
-	suite.assert.True(ok)
-}
-
-func (suite *MarketplaceTestSuite) TestGetMPEmailWithError() {
-	testWithError = true
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	email, err := getMPEmail(ctx, &suite.kClient)
-	suite.assert.NotNil(err)
-	suite.assert.Empty(email)
-}
-
-func (suite *MarketplaceTestSuite) TestGetMPEmailNoError() {
-	testWithError = false
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	isSet, err := getMPEmail(ctx, &suite.kClient)
-	suite.assert.Nil(err)
-	suite.assert.True(isSet)
-}
-
-func (suite *MarketplaceTestSuite) TestSetMPIntegrationNoEmail() {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	err := setMPIntegration(ctx, "", false, &suite.kClient)
-	suite.assert.NotNil(err)
-}
-
-func (suite *MarketplaceTestSuite) TestSetMPIntegrationWithError() {
-	testWithError = true
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	os.Setenv(mpHostEnvVar, "  ")
-	err := setMPIntegration(ctx, "mock@mock.com", false, &suite.kClient)
-	suite.assert.NotNil(err)
-	os.Unsetenv(mpHostEnvVar)
-}
-
-func (suite *MarketplaceTestSuite) TestSetMPIntegrationNoError() {
-	testWithError = false
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	os.Setenv(mpHostEnvVar, suite.postServer.URL)
-	err := setMPIntegration(ctx, "mock@mock.com", false, &suite.kClient)
-	suite.assert.Nil(err)
-	os.Unsetenv(mpHostEnvVar)
-}
-
-func (suite *MarketplaceTestSuite) TestSetMPIntegrationWithRequestError() {
-	testWithError = false
-	testServerWithError = true
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	os.Setenv(mpHostEnvVar, suite.postServer.URL)
-	err := setMPIntegration(ctx, "mock@mock.com", false, &suite.kClient)
-	suite.assert.NotNil(err)
-	os.Unsetenv(mpHostEnvVar)
-}
-
-func TestMarketplace(t *testing.T) {
-	suite.Run(t, new(MarketplaceTestSuite))
-}
--- a/operatorapi/minio_operator_mock.go
+++ b/operatorapi/minio_operator_mock.go
@@ -16,30 +16,5 @@

 package operatorapi

-import (
-	v1 "k8s.io/api/core/v1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-type (
-	opClientMock       struct{}
-	httpClientMock     struct{}
-	directPVDriveMock  struct{}
-	directPVVolumeMock struct{}
-)
-
-func createMockPVC(pvcMockName, pvcMockNamespace string) *v1.PersistentVolumeClaim {
-	var mockVolumeMode v1.PersistentVolumeMode = "mockVolumeMode"
-	mockStorage := "mockStorage"
-
-	return &v1.PersistentVolumeClaim{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      pvcMockName,
-			Namespace: pvcMockNamespace,
-		},
-		Spec: v1.PersistentVolumeClaimSpec{
-			StorageClassName: &mockStorage,
-			VolumeMode:       &mockVolumeMode,
-		},
-	}
-}
+type opClientMock struct{}
+type httpClientMock struct{}
--- a/operatorapi/namespaces.go
+++ b/operatorapi/namespaces.go
@@ -34,7 +34,7 @@ import (

 func registerNamespaceHandlers(api *operations.OperatorAPI) {
 	// Add Namespace
-	// api.OperatorAPICreateNamespaceHandler = operator_api.CreateNamespaceHandlerFunc(func(params operator_api.CreateNamespaceParams, session *models.Principal) middleware.Responder {
+	//api.OperatorAPICreateNamespaceHandler = operator_api.CreateNamespaceHandlerFunc(func(params operator_api.CreateNamespaceParams, session *models.Principal) middleware.Responder {
 	api.OperatorAPICreateNamespaceHandler = operator_api.CreateNamespaceHandlerFunc(func(params operator_api.CreateNamespaceParams, session *models.Principal) middleware.Responder {
 		err := getNamespaceCreatedResponse(session, params)
 		if err != nil {
@@ -48,6 +48,7 @@ func getNamespaceCreatedResponse(session *models.Principal, params operator_api.
 	ctx, cancel := context.WithCancel(params.HTTPRequest.Context())
 	defer cancel()
 	clientset, err := cluster.K8sClient(session.STSSessionToken)
+
 	if err != nil {
 		return xerrors.ErrorWithContext(ctx, err)
 	}
--- a/operatorapi/nodes.go
+++ b/operatorapi/nodes.go
@@ -230,6 +230,7 @@ func getNodeLabelsResponse(ctx context.Context, session *models.Principal) (*mod
 }

 func getClusterResourcesInfo(numNodes int32, inNodesResources []NodeResourceInfo) *models.AllocatableResourcesResponse {
+
 	// purge any nodes with 0 cpu
 	var nodesResources []NodeResourceInfo
 	for _, n := range inNodesResources {
--- a/operatorapi/nodes_test.go
+++ b/operatorapi/nodes_test.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 )

-func NoTestMaxAllocatableMemory(t *testing.T) {
+func Test_MaxAllocatableMemory(t *testing.T) {
 	type args struct {
 		ctx      context.Context
 		numNodes int32
--- a/operatorapi/operations/operator_api.go
+++ b/operatorapi/operations/operator_api.go
@@ -82,12 +82,6 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		OperatorAPIDeleteTenantHandler: operator_api.DeleteTenantHandlerFunc(func(params operator_api.DeleteTenantParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.DeleteTenant has not yet been implemented")
 		}),
-		OperatorAPIDescribePodHandler: operator_api.DescribePodHandlerFunc(func(params operator_api.DescribePodParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.DescribePod has not yet been implemented")
-		}),
-		OperatorAPIDirectPVFormatDriveHandler: operator_api.DirectPVFormatDriveHandlerFunc(func(params operator_api.DirectPVFormatDriveParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.DirectPVFormatDrive has not yet been implemented")
-		}),
 		OperatorAPIDisableTenantLoggingHandler: operator_api.DisableTenantLoggingHandlerFunc(func(params operator_api.DisableTenantLoggingParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.DisableTenantLogging has not yet been implemented")
 		}),
@@ -97,21 +91,9 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		OperatorAPIGetAllocatableResourcesHandler: operator_api.GetAllocatableResourcesHandlerFunc(func(params operator_api.GetAllocatableResourcesParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.GetAllocatableResources has not yet been implemented")
 		}),
-		OperatorAPIGetDirectPVDriveListHandler: operator_api.GetDirectPVDriveListHandlerFunc(func(params operator_api.GetDirectPVDriveListParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.GetDirectPVDriveList has not yet been implemented")
-		}),
-		OperatorAPIGetDirectPVVolumeListHandler: operator_api.GetDirectPVVolumeListHandlerFunc(func(params operator_api.GetDirectPVVolumeListParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.GetDirectPVVolumeList has not yet been implemented")
-		}),
-		OperatorAPIGetMPIntegrationHandler: operator_api.GetMPIntegrationHandlerFunc(func(params operator_api.GetMPIntegrationParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.GetMPIntegration has not yet been implemented")
-		}),
 		OperatorAPIGetMaxAllocatableMemHandler: operator_api.GetMaxAllocatableMemHandlerFunc(func(params operator_api.GetMaxAllocatableMemParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.GetMaxAllocatableMem has not yet been implemented")
 		}),
-		OperatorAPIGetPVCDescribeHandler: operator_api.GetPVCDescribeHandlerFunc(func(params operator_api.GetPVCDescribeParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.GetPVCDescribe has not yet been implemented")
-		}),
 		OperatorAPIGetPVCEventsHandler: operator_api.GetPVCEventsHandlerFunc(func(params operator_api.GetPVCEventsParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.GetPVCEvents has not yet been implemented")
 		}),
@@ -157,9 +139,6 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		OperatorAPIListPVCsForTenantHandler: operator_api.ListPVCsForTenantHandlerFunc(func(params operator_api.ListPVCsForTenantParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.ListPVCsForTenant has not yet been implemented")
 		}),
-		OperatorAPIListTenantCertificateSigningRequestHandler: operator_api.ListTenantCertificateSigningRequestHandlerFunc(func(params operator_api.ListTenantCertificateSigningRequestParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.ListTenantCertificateSigningRequest has not yet been implemented")
-		}),
 		OperatorAPIListTenantsHandler: operator_api.ListTenantsHandlerFunc(func(params operator_api.ListTenantsParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.ListTenants has not yet been implemented")
 		}),
@@ -175,33 +154,12 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		AuthLogoutHandler: auth.LogoutHandlerFunc(func(params auth.LogoutParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation auth.Logout has not yet been implemented")
 		}),
-		OperatorAPIOperatorSubnetAPIKeyInfoHandler: operator_api.OperatorSubnetAPIKeyInfoHandlerFunc(func(params operator_api.OperatorSubnetAPIKeyInfoParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.OperatorSubnetAPIKeyInfo has not yet been implemented")
-		}),
-		OperatorAPIOperatorSubnetAPIKeyHandler: operator_api.OperatorSubnetAPIKeyHandlerFunc(func(params operator_api.OperatorSubnetAPIKeyParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.OperatorSubnetAPIKey has not yet been implemented")
-		}),
-		OperatorAPIOperatorSubnetLoginHandler: operator_api.OperatorSubnetLoginHandlerFunc(func(params operator_api.OperatorSubnetLoginParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.OperatorSubnetLogin has not yet been implemented")
-		}),
-		OperatorAPIOperatorSubnetLoginMFAHandler: operator_api.OperatorSubnetLoginMFAHandlerFunc(func(params operator_api.OperatorSubnetLoginMFAParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.OperatorSubnetLoginMFA has not yet been implemented")
-		}),
-		OperatorAPIOperatorSubnetRegisterAPIKeyHandler: operator_api.OperatorSubnetRegisterAPIKeyHandlerFunc(func(params operator_api.OperatorSubnetRegisterAPIKeyParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.OperatorSubnetRegisterAPIKey has not yet been implemented")
-		}),
-		OperatorAPIPostMPIntegrationHandler: operator_api.PostMPIntegrationHandlerFunc(func(params operator_api.PostMPIntegrationParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.PostMPIntegration has not yet been implemented")
-		}),
 		OperatorAPIPutTenantYAMLHandler: operator_api.PutTenantYAMLHandlerFunc(func(params operator_api.PutTenantYAMLParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.PutTenantYAML has not yet been implemented")
 		}),
 		AuthSessionCheckHandler: auth.SessionCheckHandlerFunc(func(params auth.SessionCheckParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation auth.SessionCheck has not yet been implemented")
 		}),
-		OperatorAPISetTenantAdministratorsHandler: operator_api.SetTenantAdministratorsHandlerFunc(func(params operator_api.SetTenantAdministratorsParams, principal *models.Principal) middleware.Responder {
-			return middleware.NotImplemented("operation operator_api.SetTenantAdministrators has not yet been implemented")
-		}),
 		OperatorAPISetTenantLogsHandler: operator_api.SetTenantLogsHandlerFunc(func(params operator_api.SetTenantLogsParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.SetTenantLogs has not yet been implemented")
 		}),
@@ -320,26 +278,14 @@ type OperatorAPI struct {
 	OperatorAPIDeletePodHandler operator_api.DeletePodHandler
 	// OperatorAPIDeleteTenantHandler sets the operation handler for the delete tenant operation
 	OperatorAPIDeleteTenantHandler operator_api.DeleteTenantHandler
-	// OperatorAPIDescribePodHandler sets the operation handler for the describe pod operation
-	OperatorAPIDescribePodHandler operator_api.DescribePodHandler
-	// OperatorAPIDirectPVFormatDriveHandler sets the operation handler for the direct p v format drive operation
-	OperatorAPIDirectPVFormatDriveHandler operator_api.DirectPVFormatDriveHandler
 	// OperatorAPIDisableTenantLoggingHandler sets the operation handler for the disable tenant logging operation
 	OperatorAPIDisableTenantLoggingHandler operator_api.DisableTenantLoggingHandler
 	// OperatorAPIEnableTenantLoggingHandler sets the operation handler for the enable tenant logging operation
 	OperatorAPIEnableTenantLoggingHandler operator_api.EnableTenantLoggingHandler
 	// OperatorAPIGetAllocatableResourcesHandler sets the operation handler for the get allocatable resources operation
 	OperatorAPIGetAllocatableResourcesHandler operator_api.GetAllocatableResourcesHandler
-	// OperatorAPIGetDirectPVDriveListHandler sets the operation handler for the get direct p v drive list operation
-	OperatorAPIGetDirectPVDriveListHandler operator_api.GetDirectPVDriveListHandler
-	// OperatorAPIGetDirectPVVolumeListHandler sets the operation handler for the get direct p v volume list operation
-	OperatorAPIGetDirectPVVolumeListHandler operator_api.GetDirectPVVolumeListHandler
-	// OperatorAPIGetMPIntegrationHandler sets the operation handler for the get m p integration operation
-	OperatorAPIGetMPIntegrationHandler operator_api.GetMPIntegrationHandler
 	// OperatorAPIGetMaxAllocatableMemHandler sets the operation handler for the get max allocatable mem operation
 	OperatorAPIGetMaxAllocatableMemHandler operator_api.GetMaxAllocatableMemHandler
-	// OperatorAPIGetPVCDescribeHandler sets the operation handler for the get p v c describe operation
-	OperatorAPIGetPVCDescribeHandler operator_api.GetPVCDescribeHandler
 	// OperatorAPIGetPVCEventsHandler sets the operation handler for the get p v c events operation
 	OperatorAPIGetPVCEventsHandler operator_api.GetPVCEventsHandler
 	// OperatorAPIGetParityHandler sets the operation handler for the get parity operation
@@ -370,8 +316,6 @@ type OperatorAPI struct {
 	OperatorAPIListPVCsHandler operator_api.ListPVCsHandler
 	// OperatorAPIListPVCsForTenantHandler sets the operation handler for the list p v cs for tenant operation
 	OperatorAPIListPVCsForTenantHandler operator_api.ListPVCsForTenantHandler
-	// OperatorAPIListTenantCertificateSigningRequestHandler sets the operation handler for the list tenant certificate signing request operation
-	OperatorAPIListTenantCertificateSigningRequestHandler operator_api.ListTenantCertificateSigningRequestHandler
 	// OperatorAPIListTenantsHandler sets the operation handler for the list tenants operation
 	OperatorAPIListTenantsHandler operator_api.ListTenantsHandler
 	// AuthLoginDetailHandler sets the operation handler for the login detail operation
@@ -382,24 +326,10 @@ type OperatorAPI struct {
 	AuthLoginOperatorHandler auth.LoginOperatorHandler
 	// AuthLogoutHandler sets the operation handler for the logout operation
 	AuthLogoutHandler auth.LogoutHandler
-	// OperatorAPIOperatorSubnetAPIKeyInfoHandler sets the operation handler for the operator subnet API key info operation
-	OperatorAPIOperatorSubnetAPIKeyInfoHandler operator_api.OperatorSubnetAPIKeyInfoHandler
-	// OperatorAPIOperatorSubnetAPIKeyHandler sets the operation handler for the operator subnet Api key operation
-	OperatorAPIOperatorSubnetAPIKeyHandler operator_api.OperatorSubnetAPIKeyHandler
-	// OperatorAPIOperatorSubnetLoginHandler sets the operation handler for the operator subnet login operation
-	OperatorAPIOperatorSubnetLoginHandler operator_api.OperatorSubnetLoginHandler
-	// OperatorAPIOperatorSubnetLoginMFAHandler sets the operation handler for the operator subnet login m f a operation
-	OperatorAPIOperatorSubnetLoginMFAHandler operator_api.OperatorSubnetLoginMFAHandler
-	// OperatorAPIOperatorSubnetRegisterAPIKeyHandler sets the operation handler for the operator subnet register API key operation
-	OperatorAPIOperatorSubnetRegisterAPIKeyHandler operator_api.OperatorSubnetRegisterAPIKeyHandler
-	// OperatorAPIPostMPIntegrationHandler sets the operation handler for the post m p integration operation
-	OperatorAPIPostMPIntegrationHandler operator_api.PostMPIntegrationHandler
 	// OperatorAPIPutTenantYAMLHandler sets the operation handler for the put tenant y a m l operation
 	OperatorAPIPutTenantYAMLHandler operator_api.PutTenantYAMLHandler
 	// AuthSessionCheckHandler sets the operation handler for the session check operation
 	AuthSessionCheckHandler auth.SessionCheckHandler
-	// OperatorAPISetTenantAdministratorsHandler sets the operation handler for the set tenant administrators operation
-	OperatorAPISetTenantAdministratorsHandler operator_api.SetTenantAdministratorsHandler
 	// OperatorAPISetTenantLogsHandler sets the operation handler for the set tenant logs operation
 	OperatorAPISetTenantLogsHandler operator_api.SetTenantLogsHandler
 	// OperatorAPISetTenantMonitoringHandler sets the operation handler for the set tenant monitoring operation
@@ -537,12 +467,6 @@ func (o *OperatorAPI) Validate() error {
 	if o.OperatorAPIDeleteTenantHandler == nil {
 		unregistered = append(unregistered, "operator_api.DeleteTenantHandler")
 	}
-	if o.OperatorAPIDescribePodHandler == nil {
-		unregistered = append(unregistered, "operator_api.DescribePodHandler")
-	}
-	if o.OperatorAPIDirectPVFormatDriveHandler == nil {
-		unregistered = append(unregistered, "operator_api.DirectPVFormatDriveHandler")
-	}
 	if o.OperatorAPIDisableTenantLoggingHandler == nil {
 		unregistered = append(unregistered, "operator_api.DisableTenantLoggingHandler")
 	}
@@ -552,21 +476,9 @@ func (o *OperatorAPI) Validate() error {
 	if o.OperatorAPIGetAllocatableResourcesHandler == nil {
 		unregistered = append(unregistered, "operator_api.GetAllocatableResourcesHandler")
 	}
-	if o.OperatorAPIGetDirectPVDriveListHandler == nil {
-		unregistered = append(unregistered, "operator_api.GetDirectPVDriveListHandler")
-	}
-	if o.OperatorAPIGetDirectPVVolumeListHandler == nil {
-		unregistered = append(unregistered, "operator_api.GetDirectPVVolumeListHandler")
-	}
-	if o.OperatorAPIGetMPIntegrationHandler == nil {
-		unregistered = append(unregistered, "operator_api.GetMPIntegrationHandler")
-	}
 	if o.OperatorAPIGetMaxAllocatableMemHandler == nil {
 		unregistered = append(unregistered, "operator_api.GetMaxAllocatableMemHandler")
 	}
-	if o.OperatorAPIGetPVCDescribeHandler == nil {
-		unregistered = append(unregistered, "operator_api.GetPVCDescribeHandler")
-	}
 	if o.OperatorAPIGetPVCEventsHandler == nil {
 		unregistered = append(unregistered, "operator_api.GetPVCEventsHandler")
 	}
@@ -612,9 +524,6 @@ func (o *OperatorAPI) Validate() error {
 	if o.OperatorAPIListPVCsForTenantHandler == nil {
 		unregistered = append(unregistered, "operator_api.ListPVCsForTenantHandler")
 	}
-	if o.OperatorAPIListTenantCertificateSigningRequestHandler == nil {
-		unregistered = append(unregistered, "operator_api.ListTenantCertificateSigningRequestHandler")
-	}
 	if o.OperatorAPIListTenantsHandler == nil {
 		unregistered = append(unregistered, "operator_api.ListTenantsHandler")
 	}
@@ -630,33 +539,12 @@ func (o *OperatorAPI) Validate() error {
 	if o.AuthLogoutHandler == nil {
 		unregistered = append(unregistered, "auth.LogoutHandler")
 	}
-	if o.OperatorAPIOperatorSubnetAPIKeyInfoHandler == nil {
-		unregistered = append(unregistered, "operator_api.OperatorSubnetAPIKeyInfoHandler")
-	}
-	if o.OperatorAPIOperatorSubnetAPIKeyHandler == nil {
-		unregistered = append(unregistered, "operator_api.OperatorSubnetAPIKeyHandler")
-	}
-	if o.OperatorAPIOperatorSubnetLoginHandler == nil {
-		unregistered = append(unregistered, "operator_api.OperatorSubnetLoginHandler")
-	}
-	if o.OperatorAPIOperatorSubnetLoginMFAHandler == nil {
-		unregistered = append(unregistered, "operator_api.OperatorSubnetLoginMFAHandler")
-	}
-	if o.OperatorAPIOperatorSubnetRegisterAPIKeyHandler == nil {
-		unregistered = append(unregistered, "operator_api.OperatorSubnetRegisterAPIKeyHandler")
-	}
-	if o.OperatorAPIPostMPIntegrationHandler == nil {
-		unregistered = append(unregistered, "operator_api.PostMPIntegrationHandler")
-	}
 	if o.OperatorAPIPutTenantYAMLHandler == nil {
 		unregistered = append(unregistered, "operator_api.PutTenantYAMLHandler")
 	}
 	if o.AuthSessionCheckHandler == nil {
 		unregistered = append(unregistered, "auth.SessionCheckHandler")
 	}
-	if o.OperatorAPISetTenantAdministratorsHandler == nil {
-		unregistered = append(unregistered, "operator_api.SetTenantAdministratorsHandler")
-	}
 	if o.OperatorAPISetTenantLogsHandler == nil {
 		unregistered = append(unregistered, "operator_api.SetTenantLogsHandler")
 	}
@@ -836,14 +724,6 @@ func (o *OperatorAPI) initHandlerCache() {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
 	o.handlers["DELETE"]["/namespaces/{namespace}/tenants/{tenant}"] = operator_api.NewDeleteTenant(o.context, o.OperatorAPIDeleteTenantHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
-	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/pods/{podName}/describe"] = operator_api.NewDescribePod(o.context, o.OperatorAPIDescribePodHandler)
-	if o.handlers["POST"] == nil {
-		o.handlers["POST"] = make(map[string]http.Handler)
-	}
-	o.handlers["POST"]["/directpv/drives/format"] = operator_api.NewDirectPVFormatDrive(o.context, o.OperatorAPIDirectPVFormatDriveHandler)
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
@@ -859,26 +739,10 @@ func (o *OperatorAPI) initHandlerCache() {
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
-	o.handlers["GET"]["/directpv/drives"] = operator_api.NewGetDirectPVDriveList(o.context, o.OperatorAPIGetDirectPVDriveListHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
-	o.handlers["GET"]["/directpv/volumes"] = operator_api.NewGetDirectPVVolumeList(o.context, o.OperatorAPIGetDirectPVVolumeListHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
-	o.handlers["GET"]["/mp-integration"] = operator_api.NewGetMPIntegration(o.context, o.OperatorAPIGetMPIntegrationHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
 	o.handlers["GET"]["/cluster/max-allocatable-memory"] = operator_api.NewGetMaxAllocatableMem(o.context, o.OperatorAPIGetMaxAllocatableMemHandler)
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
-	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/pvcs/{PVCName}/describe"] = operator_api.NewGetPVCDescribe(o.context, o.OperatorAPIGetPVCDescribeHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
 	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/pvcs/{PVCName}/events"] = operator_api.NewGetPVCEvents(o.context, o.OperatorAPIGetPVCEventsHandler)
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
@@ -939,10 +803,6 @@ func (o *OperatorAPI) initHandlerCache() {
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
-	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/csr"] = operator_api.NewListTenantCertificateSigningRequest(o.context, o.OperatorAPIListTenantCertificateSigningRequestHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
 	o.handlers["GET"]["/namespaces/{namespace}/tenants"] = operator_api.NewListTenants(o.context, o.OperatorAPIListTenantsHandler)
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
@@ -960,30 +820,6 @@ func (o *OperatorAPI) initHandlerCache() {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/logout"] = auth.NewLogout(o.context, o.AuthLogoutHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
-	o.handlers["GET"]["/subnet/apikey/info"] = operator_api.NewOperatorSubnetAPIKeyInfo(o.context, o.OperatorAPIOperatorSubnetAPIKeyInfoHandler)
-	if o.handlers["GET"] == nil {
-		o.handlers["GET"] = make(map[string]http.Handler)
-	}
-	o.handlers["GET"]["/subnet/apikey"] = operator_api.NewOperatorSubnetAPIKey(o.context, o.OperatorAPIOperatorSubnetAPIKeyHandler)
-	if o.handlers["POST"] == nil {
-		o.handlers["POST"] = make(map[string]http.Handler)
-	}
-	o.handlers["POST"]["/subnet/login"] = operator_api.NewOperatorSubnetLogin(o.context, o.OperatorAPIOperatorSubnetLoginHandler)
-	if o.handlers["POST"] == nil {
-		o.handlers["POST"] = make(map[string]http.Handler)
-	}
-	o.handlers["POST"]["/subnet/login/mfa"] = operator_api.NewOperatorSubnetLoginMFA(o.context, o.OperatorAPIOperatorSubnetLoginMFAHandler)
-	if o.handlers["POST"] == nil {
-		o.handlers["POST"] = make(map[string]http.Handler)
-	}
-	o.handlers["POST"]["/subnet/apikey/register"] = operator_api.NewOperatorSubnetRegisterAPIKey(o.context, o.OperatorAPIOperatorSubnetRegisterAPIKeyHandler)
-	if o.handlers["POST"] == nil {
-		o.handlers["POST"] = make(map[string]http.Handler)
-	}
-	o.handlers["POST"]["/mp-integration"] = operator_api.NewPostMPIntegration(o.context, o.OperatorAPIPostMPIntegrationHandler)
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
@@ -992,10 +828,6 @@ func (o *OperatorAPI) initHandlerCache() {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
 	o.handlers["GET"]["/session"] = auth.NewSessionCheck(o.context, o.AuthSessionCheckHandler)
-	if o.handlers["POST"] == nil {
-		o.handlers["POST"] = make(map[string]http.Handler)
-	}
-	o.handlers["POST"]["/namespaces/{namespace}/tenants/{tenant}/set-administrators"] = operator_api.NewSetTenantAdministrators(o.context, o.OperatorAPISetTenantAdministratorsHandler)
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
--- a/operatorapi/operations/operator_api/describe_pod.go
+++ b/operatorapi/operations/operator_api/describe_pod.go
@@ -1,88 +0,0 @@
-// Code generated by go-swagger; DO NOT EDIT.
-
-// 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 <http://www.gnu.org/licenses/>.
-//
-
-package operator_api
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the generate command
-
-import (
-	"net/http"
-
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/minio/console/models"
-)
-
-// DescribePodHandlerFunc turns a function with the right signature into a describe pod handler
-type DescribePodHandlerFunc func(DescribePodParams, *models.Principal) middleware.Responder
-
-// Handle executing the request and returning a response
-func (fn DescribePodHandlerFunc) Handle(params DescribePodParams, principal *models.Principal) middleware.Responder {
-	return fn(params, principal)
-}
-
-// DescribePodHandler interface for that can handle valid describe pod params
-type DescribePodHandler interface {
-	Handle(DescribePodParams, *models.Principal) middleware.Responder
-}
-
-// NewDescribePod creates a new http.Handler for the describe pod operation
-func NewDescribePod(ctx *middleware.Context, handler DescribePodHandler) *DescribePod {
-	return &DescribePod{Context: ctx, Handler: handler}
-}
-
-/* DescribePod swagger:route GET /namespaces/{namespace}/tenants/{tenant}/pods/{podName}/describe OperatorAPI describePod
-
-Describe Pod
-
-*/
-type DescribePod struct {
-	Context *middleware.Context
-	Handler DescribePodHandler
-}
-
-func (o *DescribePod) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
-	route, rCtx, _ := o.Context.RouteInfo(r)
-	if rCtx != nil {
-		*r = *rCtx
-	}
-	var Params = NewDescribePodParams()
-	uprinc, aCtx, err := o.Context.Authorize(r, route)
-	if err != nil {
-		o.Context.Respond(rw, r, route.Produces, route, err)
-		return
-	}
-	if aCtx != nil {
-		*r = *aCtx
-	}
-	var principal *models.Principal
-	if uprinc != nil {
-		principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
-	}
-
-	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
-		o.Context.Respond(rw, r, route.Produces, route, err)
-		return
-	}
-
-	res := o.Handler.Handle(Params, principal) // actually handle the request
-	o.Context.Respond(rw, r, route.Produces, route, res)
-
-}
--- a/Show More
+++ b/Show More