Release v0.22.0 (#2482 )

Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
Bump decode-uri-component from 0.2.0 to 0.2.2 in /portal-ui (#2481 )
2026-07-01 07:41:18 -07:00 · 2022-12-02 15:12:59 -08:00 · 2022-12-02 12:33:19 -06:00 · 2022-12-01 20:55:21 -08:00 · 2022-12-01 14:17:46 -06:00 · 2022-11-23 09:10:14 -08:00
1508 changed files with 36806 additions and 13900 deletions
--- a/.github/workflows/jobs.yaml
+++ b/.github/workflows/jobs.yaml
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -14,24 +14,19 @@ linters-settings:
 linters:
  disable-all: true
  enable:
-    - typecheck
    - goimports
    - misspell
    - govet
    - revive
    - ineffassign
    - gosimple
-    - deadcode
-    - structcheck
    - gomodguard
    - gofmt
    - unused
-    - structcheck
    - unconvert
    - varcheck
    - gocritic
    - gofumpt
-    - tenv
    - durationcheck

 service:
@@ -51,4 +46,4 @@ run:
  skip-dirs:
    - pkg/clientgen
    - pkg/apis/networking.gke.io
-    - restapi/operations
+    - restapi/operations
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,7 +13,7 @@ release:
 before:
  hooks:
    # you may remove this if you don't use vgo
-    - go mod tidy -compat=1.17
+    - go mod tidy -compat=1.18

 builds:
  -
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6

 ARG TAG

--- a/11
+++ b/11
@@ -28,10 +28,7 @@ verifiers: getdeps fmt lint

 fmt:
 	@echo "Running $@ check"
-	@GO111MODULE=on gofmt -d restapi/
-	@GO111MODULE=on gofmt -d pkg/
-	@GO111MODULE=on gofmt -d cmd/
-	@GO111MODULE=on gofmt -d cluster/
+	@(env bash $(PWD)/verify-gofmt.sh)

 crosscompile:
 	@(env bash $(PWD)/cross-compile.sh $(arg1))
@@ -46,9 +43,13 @@ install: console
 	@mkdir -p $(GOPATH)/bin && cp -f $(PWD)/console $(GOPATH)/bin/console
 	@echo "Installation successful. To learn more, try \"console --help\"."

-swagger-gen: clean-swagger swagger-console swagger-operator
+swagger-gen: clean-swagger swagger-console swagger-operator apply-gofmt
 	@echo "Done Generating swagger server code from yaml"

+apply-gofmt:
+	@echo "Applying gofmt to all generated an existing files"
+	@GO111MODULE=on gofmt -w .
+
 clean-swagger:
 	@echo "cleaning"
 	@rm -rf models
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ docker pull minio/console

 ### Build from source
 > You will need a working Go environment. Therefore, please follow [How to install Go](https://golang.org/doc/install).
-> Minimum version required is go1.17
+> Minimum version required is go1.18

 ```
 go install github.com/minio/console/cmd/console@latest
--- a/go.mod
+++ b/go.mod
@@ -1,120 +1,128 @@
 module github.com/minio/console

-go 1.17
+go 1.18

 require (
 	github.com/blang/semver/v4 v4.0.0
-	github.com/cheggaaa/pb/v3 v3.0.8
+	github.com/cheggaaa/pb/v3 v3.1.0
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/color v1.13.0
-	github.com/go-openapi/errors v0.20.2
-	github.com/go-openapi/loads v0.21.1
-	github.com/go-openapi/runtime v0.23.3
-	github.com/go-openapi/spec v0.20.5
-	github.com/go-openapi/strfmt v0.21.2
-	github.com/go-openapi/swag v0.21.1
-	github.com/go-openapi/validate v0.21.0
-	github.com/golang-jwt/jwt/v4 v4.4.1
+	github.com/go-openapi/errors v0.20.3
+	github.com/go-openapi/loads v0.21.2
+	github.com/go-openapi/runtime v0.24.2
+	github.com/go-openapi/spec v0.20.7
+	github.com/go-openapi/strfmt v0.21.3
+	github.com/go-openapi/swag v0.22.3
+	github.com/go-openapi/validate v0.22.0
+	github.com/golang-jwt/jwt/v4 v4.4.2
 	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.1
-	github.com/minio/cli v1.22.0
+	github.com/klauspost/compress v1.15.12
+	github.com/minio/cli v1.24.0
 	github.com/minio/directpv v1.4.4-0.20220805090942-948ca4731651
 	github.com/minio/highwayhash v1.0.2
-	github.com/minio/kes v0.19.2
-	github.com/minio/madmin-go v1.4.3
-	github.com/minio/mc v0.0.0-20220705180830-01b87ecc02ff
-	github.com/minio/minio-go/v7 v7.0.30
-	github.com/minio/operator v0.0.0-20220414212219-ba4c097324b2
-	github.com/minio/pkg v1.1.23
-	github.com/minio/selfupdate v0.4.0
+	github.com/minio/kes v0.22.0
+	github.com/minio/madmin-go/v2 v2.0.0
+	github.com/minio/mc v0.0.0-20221201184114-854b4f123f03
+	github.com/minio/minio-go/v7 v7.0.44
+	github.com/minio/operator v0.0.0-20220902184351-21e4073132b0
+	github.com/minio/pkg v1.5.5
+	github.com/minio/selfupdate v0.5.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.7.1
-	github.com/tidwall/gjson v1.14.0
-	github.com/unrolled/secure v1.10.0
-	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
-	golang.org/x/net v0.0.0-20220421235706-1d1ef9303861
-	golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
+	github.com/stretchr/testify v1.8.1
+	github.com/tidwall/gjson v1.14.3
+	github.com/unrolled/secure v1.13.0
+	golang.org/x/crypto v0.3.0
+	golang.org/x/net v0.2.0
+	golang.org/x/oauth2 v0.2.0
+	// Added to include security fix for
+	// https://github.com/golang/go/issues/56152
+	golang.org/x/text v0.4.0 // indirect
 	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.25.4
+	k8s.io/apimachinery v0.25.4
+	k8s.io/client-go v0.25.4
+	k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2
 )

 require (
-	cloud.google.com/go v0.81.0 // indirect
+	aead.dev/mem v0.2.0 // indirect
+	cloud.google.com/go/compute v1.7.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 v0.11.27 // indirect
+	github.com/Azure/go-autorest/autorest/adal v0.9.20 // 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/aymanbagabas/go-osc52 v1.2.1 // indirect
 	github.com/beorn7/perks v1.0.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
-	github.com/charmbracelet/lipgloss v0.5.0 // indirect
+	github.com/charmbracelet/bubbles v0.14.0 // indirect
+	github.com/charmbracelet/bubbletea v0.22.1 // indirect
+	github.com/charmbracelet/lipgloss v0.6.0 // indirect
 	github.com/cheggaaa/pb v1.0.29 // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
-	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
+	github.com/coreos/go-systemd/v22 v22.4.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // 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
+	github.com/gdamore/tcell/v2 v2.5.3 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/analysis v0.21.2 // indirect
+	github.com/go-openapi/analysis v0.21.4 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/goccy/go-json v0.9.4 // indirect
+	github.com/goccy/go-json v0.9.11 // 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.7 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // 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/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/jedib0t/go-pretty/v6 v6.3.8 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.1 // indirect
+	github.com/kr/pretty v0.2.1 // 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
-	github.com/lestrrat-go/iter v1.0.1 // indirect
-	github.com/lestrrat-go/jwx v1.2.19 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
+	github.com/lestrrat-go/httpcc v1.0.1 // indirect
+	github.com/lestrrat-go/iter v1.0.2 // indirect
+	github.com/lestrrat-go/jwx v1.2.25 // indirect
 	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/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // 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-colorable v0.1.13 // 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/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-localereader v0.0.1 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
 	github.com/mb0/glob v0.0.0-20160210091149-1eb79d2de6c4 // indirect
-	github.com/minio/colorjson v1.0.2 // indirect
+	github.com/miekg/dns v1.1.48 // indirect
+	github.com/minio/colorjson v1.0.4 // indirect
 	github.com/minio/filepath v1.0.0 // indirect
+	github.com/minio/madmin-go v1.7.5 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
@@ -122,66 +130,68 @@ require (
 	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/cancelreader v0.2.2 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
-	github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect
+	github.com/muesli/termenv v0.13.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/navidys/tvxwidgets v0.1.0 // indirect
+	github.com/navidys/tvxwidgets v0.1.1 // 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/pelletier/go-toml v1.9.4 // 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/pkg/xattr v0.4.9 // 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_model v0.2.0 // indirect
-	github.com/prometheus/common v0.33.0 // 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/prometheus/client_golang v1.13.0 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/prometheus/prom2json v1.3.2 // indirect
+	github.com/rivo/tview v0.0.0-20220916081518-2e69b7385a37 // indirect
+	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/rjeczalik/notify v0.9.2 // indirect
-	github.com/shirou/gopsutil/v3 v3.22.2 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/shirou/gopsutil/v3 v3.22.9 // 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/cast v1.4.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/spf13/viper v1.10.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tinylib/msgp v1.1.7-0.20211026165309-e818a1881b0e // indirect
-	github.com/tklauser/go-sysconf v0.3.10 // indirect
-	github.com/tklauser/numcpus v0.4.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.11 // indirect
+	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	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.uber.org/atomic v1.9.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.5 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.5 // indirect
+	go.mongodb.org/mongo-driver v1.10.0 // indirect
+	go.uber.org/atomic v1.10.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-20220412211240-33da011f77ad // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.7 // indirect
+	go.uber.org/zap v1.23.0 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/term v0.2.0 // indirect
 	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
+	golang.org/x/tools v0.1.12 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a // indirect
-	google.golang.org/grpc v1.44.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect
+	google.golang.org/grpc v1.50.1 // indirect
+	google.golang.org/protobuf v1.28.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.4 // indirect
+	gopkg.in/ini.v1 v1.67.0 // 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
+	k8s.io/klog/v2 v2.80.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // 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
+	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
--- a/k8s/metrics-dev.yaml
+++ b/k8s/metrics-dev.yaml
@@ -149,5 +149,5 @@ spec:
            - name: tmp-dir
              mountPath: /tmp
      nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
        kubernetes.io/arch: "amd64"
--- 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.19.5'
+          image: 'minio/console:v0.22.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.19.5'
+          image: 'minio/console:v0.22.0'
          imagePullPolicy: "IfNotPresent"
          env:
            - name: CONSOLE_MINIO_SERVER
--- a/models/admin_info_response.go
+++ b/models/admin_info_response.go
@@ -24,11 +24,13 @@ package models

 import (
 	"context"
+	"encoding/json"
 	"strconv"

 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
 	"github.com/go-openapi/swag"
+	"github.com/go-openapi/validate"
 )

 // AdminInfoResponse admin info response
@@ -36,15 +38,19 @@ import (
 // swagger:model adminInfoResponse
 type AdminInfoResponse struct {

+	// advanced metrics status
+	// Enum: [not configured available unavailable]
+	AdvancedMetricsStatus string `json:"advancedMetricsStatus,omitempty"`
+
+	// backend
+	Backend *BackendProperties `json:"backend,omitempty"`
+
 	// buckets
 	Buckets int64 `json:"buckets,omitempty"`

 	// objects
 	Objects int64 `json:"objects,omitempty"`

-	// prometheus not ready
-	PrometheusNotReady bool `json:"prometheusNotReady,omitempty"`
-
 	// servers
 	Servers []*ServerProperties `json:"servers"`

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

+	if err := m.validateAdvancedMetricsStatus(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateBackend(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateServers(formats); err != nil {
 		res = append(res, err)
 	}
@@ -73,6 +87,70 @@ func (m *AdminInfoResponse) Validate(formats strfmt.Registry) error {
 	return nil
 }

+var adminInfoResponseTypeAdvancedMetricsStatusPropEnum []interface{}
+
+func init() {
+	var res []string
+	if err := json.Unmarshal([]byte(`["not configured","available","unavailable"]`), &res); err != nil {
+		panic(err)
+	}
+	for _, v := range res {
+		adminInfoResponseTypeAdvancedMetricsStatusPropEnum = append(adminInfoResponseTypeAdvancedMetricsStatusPropEnum, v)
+	}
+}
+
+const (
+
+	// AdminInfoResponseAdvancedMetricsStatusNotConfigured captures enum value "not configured"
+	AdminInfoResponseAdvancedMetricsStatusNotConfigured string = "not configured"
+
+	// AdminInfoResponseAdvancedMetricsStatusAvailable captures enum value "available"
+	AdminInfoResponseAdvancedMetricsStatusAvailable string = "available"
+
+	// AdminInfoResponseAdvancedMetricsStatusUnavailable captures enum value "unavailable"
+	AdminInfoResponseAdvancedMetricsStatusUnavailable string = "unavailable"
+)
+
+// prop value enum
+func (m *AdminInfoResponse) validateAdvancedMetricsStatusEnum(path, location string, value string) error {
+	if err := validate.EnumCase(path, location, value, adminInfoResponseTypeAdvancedMetricsStatusPropEnum, true); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (m *AdminInfoResponse) validateAdvancedMetricsStatus(formats strfmt.Registry) error {
+	if swag.IsZero(m.AdvancedMetricsStatus) { // not required
+		return nil
+	}
+
+	// value enum
+	if err := m.validateAdvancedMetricsStatusEnum("advancedMetricsStatus", "body", m.AdvancedMetricsStatus); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *AdminInfoResponse) validateBackend(formats strfmt.Registry) error {
+	if swag.IsZero(m.Backend) { // not required
+		return nil
+	}
+
+	if m.Backend != nil {
+		if err := m.Backend.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("backend")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("backend")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *AdminInfoResponse) validateServers(formats strfmt.Registry) error {
 	if swag.IsZero(m.Servers) { // not required
 		return nil
@@ -129,6 +207,10 @@ func (m *AdminInfoResponse) validateWidgets(formats strfmt.Registry) error {
 func (m *AdminInfoResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

+	if err := m.contextValidateBackend(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.contextValidateServers(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -143,6 +225,22 @@ func (m *AdminInfoResponse) ContextValidate(ctx context.Context, formats strfmt.
 	return nil
 }

+func (m *AdminInfoResponse) contextValidateBackend(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.Backend != nil {
+		if err := m.Backend.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("backend")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("backend")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *AdminInfoResponse) contextValidateServers(ctx context.Context, formats strfmt.Registry) error {

 	for i := 0; i < len(m.Servers); i++ {
--- a/models/backend_properties.go
+++ b/models/backend_properties.go
@@ -0,0 +1,73 @@
+// 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"
+)
+
+// BackendProperties backend properties
+//
+// swagger:model BackendProperties
+type BackendProperties struct {
+
+	// backend type
+	BackendType string `json:"backendType,omitempty"`
+
+	// rr s c parity
+	RrSCParity int64 `json:"rrSCParity,omitempty"`
+
+	// standard s c parity
+	StandardSCParity int64 `json:"standardSCParity,omitempty"`
+}
+
+// Validate validates this backend properties
+func (m *BackendProperties) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this backend properties based on context it is used
+func (m *BackendProperties) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *BackendProperties) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *BackendProperties) UnmarshalBinary(b []byte) error {
+	var res BackendProperties
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/create_tenant_request.go
+++ b/models/create_tenant_request.go
@@ -58,6 +58,9 @@ type CreateTenantRequest struct {
 	// encryption
 	Encryption *EncryptionConfiguration `json:"encryption,omitempty"`

+	// environment variables
+	EnvironmentVariables []*EnvironmentVariable `json:"environmentVariables"`
+
 	// erasure coding parity
 	ErasureCodingParity int64 `json:"erasureCodingParity,omitempty"`

@@ -85,8 +88,8 @@ type CreateTenantRequest struct {
 	// log search configuration
 	LogSearchConfiguration *LogSearchConfiguration `json:"logSearchConfiguration,omitempty"`

-	// mounth path
-	MounthPath string `json:"mounth_path,omitempty"`
+	// mount path
+	MountPath string `json:"mount_path,omitempty"`

 	// name
 	// Required: true
@@ -123,6 +126,10 @@ func (m *CreateTenantRequest) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

+	if err := m.validateEnvironmentVariables(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateIdp(formats); err != nil {
 		res = append(res, err)
 	}
@@ -199,6 +206,32 @@ func (m *CreateTenantRequest) validateEncryption(formats strfmt.Registry) error
 	return nil
 }

+func (m *CreateTenantRequest) 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 *CreateTenantRequest) validateIdp(formats strfmt.Registry) error {
 	if swag.IsZero(m.Idp) { // not required
 		return nil
@@ -355,6 +388,10 @@ func (m *CreateTenantRequest) ContextValidate(ctx context.Context, formats strfm
 		res = append(res, err)
 	}

+	if err := m.contextValidateEnvironmentVariables(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.contextValidateIdp(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -417,6 +454,26 @@ func (m *CreateTenantRequest) contextValidateEncryption(ctx context.Context, for
 	return nil
 }

+func (m *CreateTenantRequest) 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 *CreateTenantRequest) contextValidateIdp(ctx context.Context, formats strfmt.Registry) error {

 	if m.Idp != nil {
--- a/models/encryption_configuration.go
+++ b/models/encryption_configuration.go
@@ -42,9 +42,6 @@ type EncryptionConfiguration struct {
 	// azure
 	Azure *AzureConfiguration `json:"azure,omitempty"`

-	// client
-	Client *KeyPairConfiguration `json:"client,omitempty"`
-
 	// gcp
 	Gcp *GcpConfiguration `json:"gcp,omitempty"`

@@ -54,6 +51,15 @@ type EncryptionConfiguration struct {
 	// image
 	Image string `json:"image,omitempty"`

+	// kms mtls
+	KmsMtls *EncryptionConfigurationAO1KmsMtls `json:"kms_mtls,omitempty"`
+
+	// minio mtls
+	MinioMtls *KeyPairConfiguration `json:"minio_mtls,omitempty"`
+
+	// raw
+	Raw string `json:"raw,omitempty"`
+
 	// replicas
 	Replicas string `json:"replicas,omitempty"`

@@ -63,8 +69,8 @@ type EncryptionConfiguration struct {
 	// security context
 	SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-	// server
-	Server *KeyPairConfiguration `json:"server,omitempty"`
+	// server tls
+	ServerTLS *KeyPairConfiguration `json:"server_tls,omitempty"`

 	// vault
 	Vault *VaultConfiguration `json:"vault,omitempty"`
@@ -85,21 +91,25 @@ func (m *EncryptionConfiguration) UnmarshalJSON(raw []byte) error {

 		Azure *AzureConfiguration `json:"azure,omitempty"`

-		Client *KeyPairConfiguration `json:"client,omitempty"`
-
 		Gcp *GcpConfiguration `json:"gcp,omitempty"`

 		Gemalto *GemaltoConfiguration `json:"gemalto,omitempty"`

 		Image string `json:"image,omitempty"`

+		KmsMtls *EncryptionConfigurationAO1KmsMtls `json:"kms_mtls,omitempty"`
+
+		MinioMtls *KeyPairConfiguration `json:"minio_mtls,omitempty"`
+
+		Raw string `json:"raw,omitempty"`
+
 		Replicas string `json:"replicas,omitempty"`

 		SecretsToBeDeleted []string `json:"secretsToBeDeleted"`

 		SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-		Server *KeyPairConfiguration `json:"server,omitempty"`
+		ServerTLS *KeyPairConfiguration `json:"server_tls,omitempty"`

 		Vault *VaultConfiguration `json:"vault,omitempty"`
 	}
@@ -111,21 +121,25 @@ func (m *EncryptionConfiguration) UnmarshalJSON(raw []byte) error {

 	m.Azure = dataAO1.Azure

-	m.Client = dataAO1.Client
-
 	m.Gcp = dataAO1.Gcp

 	m.Gemalto = dataAO1.Gemalto

 	m.Image = dataAO1.Image

+	m.KmsMtls = dataAO1.KmsMtls
+
+	m.MinioMtls = dataAO1.MinioMtls
+
+	m.Raw = dataAO1.Raw
+
 	m.Replicas = dataAO1.Replicas

 	m.SecretsToBeDeleted = dataAO1.SecretsToBeDeleted

 	m.SecurityContext = dataAO1.SecurityContext

-	m.Server = dataAO1.Server
+	m.ServerTLS = dataAO1.ServerTLS

 	m.Vault = dataAO1.Vault

@@ -146,21 +160,25 @@ func (m EncryptionConfiguration) MarshalJSON() ([]byte, error) {

 		Azure *AzureConfiguration `json:"azure,omitempty"`

-		Client *KeyPairConfiguration `json:"client,omitempty"`
-
 		Gcp *GcpConfiguration `json:"gcp,omitempty"`

 		Gemalto *GemaltoConfiguration `json:"gemalto,omitempty"`

 		Image string `json:"image,omitempty"`

+		KmsMtls *EncryptionConfigurationAO1KmsMtls `json:"kms_mtls,omitempty"`
+
+		MinioMtls *KeyPairConfiguration `json:"minio_mtls,omitempty"`
+
+		Raw string `json:"raw,omitempty"`
+
 		Replicas string `json:"replicas,omitempty"`

 		SecretsToBeDeleted []string `json:"secretsToBeDeleted"`

 		SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-		Server *KeyPairConfiguration `json:"server,omitempty"`
+		ServerTLS *KeyPairConfiguration `json:"server_tls,omitempty"`

 		Vault *VaultConfiguration `json:"vault,omitempty"`
 	}
@@ -169,21 +187,25 @@ func (m EncryptionConfiguration) MarshalJSON() ([]byte, error) {

 	dataAO1.Azure = m.Azure

-	dataAO1.Client = m.Client
-
 	dataAO1.Gcp = m.Gcp

 	dataAO1.Gemalto = m.Gemalto

 	dataAO1.Image = m.Image

+	dataAO1.KmsMtls = m.KmsMtls
+
+	dataAO1.MinioMtls = m.MinioMtls
+
+	dataAO1.Raw = m.Raw
+
 	dataAO1.Replicas = m.Replicas

 	dataAO1.SecretsToBeDeleted = m.SecretsToBeDeleted

 	dataAO1.SecurityContext = m.SecurityContext

-	dataAO1.Server = m.Server
+	dataAO1.ServerTLS = m.ServerTLS

 	dataAO1.Vault = m.Vault

@@ -212,10 +234,6 @@ func (m *EncryptionConfiguration) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateClient(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.validateGcp(formats); err != nil {
 		res = append(res, err)
 	}
@@ -224,11 +242,19 @@ func (m *EncryptionConfiguration) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

+	if err := m.validateKmsMtls(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateMinioMtls(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateSecurityContext(formats); err != nil {
 		res = append(res, err)
 	}

-	if err := m.validateServer(formats); err != nil {
+	if err := m.validateServerTLS(formats); err != nil {
 		res = append(res, err)
 	}

@@ -282,26 +308,6 @@ func (m *EncryptionConfiguration) validateAzure(formats strfmt.Registry) error {
 	return nil
 }

-func (m *EncryptionConfiguration) validateClient(formats strfmt.Registry) error {
-
-	if swag.IsZero(m.Client) { // not required
-		return nil
-	}
-
-	if m.Client != nil {
-		if err := m.Client.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("client")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("client")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (m *EncryptionConfiguration) validateGcp(formats strfmt.Registry) error {

 	if swag.IsZero(m.Gcp) { // not required
@@ -342,6 +348,46 @@ func (m *EncryptionConfiguration) validateGemalto(formats strfmt.Registry) error
 	return nil
 }

+func (m *EncryptionConfiguration) validateKmsMtls(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.KmsMtls) { // not required
+		return nil
+	}
+
+	if m.KmsMtls != nil {
+		if err := m.KmsMtls.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("kms_mtls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("kms_mtls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *EncryptionConfiguration) validateMinioMtls(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.MinioMtls) { // not required
+		return nil
+	}
+
+	if m.MinioMtls != nil {
+		if err := m.MinioMtls.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("minio_mtls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("minio_mtls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *EncryptionConfiguration) validateSecurityContext(formats strfmt.Registry) error {

 	if swag.IsZero(m.SecurityContext) { // not required
@@ -362,18 +408,18 @@ func (m *EncryptionConfiguration) validateSecurityContext(formats strfmt.Registr
 	return nil
 }

-func (m *EncryptionConfiguration) validateServer(formats strfmt.Registry) error {
+func (m *EncryptionConfiguration) validateServerTLS(formats strfmt.Registry) error {

-	if swag.IsZero(m.Server) { // not required
+	if swag.IsZero(m.ServerTLS) { // not required
 		return nil
 	}

-	if m.Server != nil {
-		if err := m.Server.Validate(formats); err != nil {
+	if m.ServerTLS != nil {
+		if err := m.ServerTLS.Validate(formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("server")
+				return ve.ValidateName("server_tls")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("server")
+				return ce.ValidateName("server_tls")
 			}
 			return err
 		}
@@ -419,10 +465,6 @@ func (m *EncryptionConfiguration) ContextValidate(ctx context.Context, formats s
 		res = append(res, err)
 	}

-	if err := m.contextValidateClient(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if err := m.contextValidateGcp(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -431,11 +473,19 @@ func (m *EncryptionConfiguration) ContextValidate(ctx context.Context, formats s
 		res = append(res, err)
 	}

+	if err := m.contextValidateKmsMtls(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateMinioMtls(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.contextValidateSecurityContext(ctx, formats); err != nil {
 		res = append(res, err)
 	}

-	if err := m.contextValidateServer(ctx, formats); err != nil {
+	if err := m.contextValidateServerTLS(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -481,22 +531,6 @@ func (m *EncryptionConfiguration) contextValidateAzure(ctx context.Context, form
 	return nil
 }

-func (m *EncryptionConfiguration) contextValidateClient(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Client != nil {
-		if err := m.Client.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("client")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("client")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 func (m *EncryptionConfiguration) contextValidateGcp(ctx context.Context, formats strfmt.Registry) error {

 	if m.Gcp != nil {
@@ -529,6 +563,38 @@ func (m *EncryptionConfiguration) contextValidateGemalto(ctx context.Context, fo
 	return nil
 }

+func (m *EncryptionConfiguration) contextValidateKmsMtls(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.KmsMtls != nil {
+		if err := m.KmsMtls.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("kms_mtls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("kms_mtls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *EncryptionConfiguration) contextValidateMinioMtls(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.MinioMtls != nil {
+		if err := m.MinioMtls.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("minio_mtls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("minio_mtls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *EncryptionConfiguration) contextValidateSecurityContext(ctx context.Context, formats strfmt.Registry) error {

 	if m.SecurityContext != nil {
@@ -545,14 +611,14 @@ func (m *EncryptionConfiguration) contextValidateSecurityContext(ctx context.Con
 	return nil
 }

-func (m *EncryptionConfiguration) contextValidateServer(ctx context.Context, formats strfmt.Registry) error {
+func (m *EncryptionConfiguration) contextValidateServerTLS(ctx context.Context, formats strfmt.Registry) error {

-	if m.Server != nil {
-		if err := m.Server.ContextValidate(ctx, formats); err != nil {
+	if m.ServerTLS != nil {
+		if err := m.ServerTLS.ContextValidate(ctx, formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("server")
+				return ve.ValidateName("server_tls")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("server")
+				return ce.ValidateName("server_tls")
 			}
 			return err
 		}
@@ -594,3 +660,46 @@ func (m *EncryptionConfiguration) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
+
+// EncryptionConfigurationAO1KmsMtls encryption configuration a o1 kms mtls
+//
+// swagger:model EncryptionConfigurationAO1KmsMtls
+type EncryptionConfigurationAO1KmsMtls struct {
+
+	// ca
+	Ca string `json:"ca,omitempty"`
+
+	// crt
+	Crt string `json:"crt,omitempty"`
+
+	// key
+	Key string `json:"key,omitempty"`
+}
+
+// Validate validates this encryption configuration a o1 kms mtls
+func (m *EncryptionConfigurationAO1KmsMtls) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this encryption configuration a o1 kms mtls based on context it is used
+func (m *EncryptionConfigurationAO1KmsMtls) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *EncryptionConfigurationAO1KmsMtls) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *EncryptionConfigurationAO1KmsMtls) UnmarshalBinary(b []byte) error {
+	var res EncryptionConfigurationAO1KmsMtls
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/encryption_configuration_response.go
+++ b/models/encryption_configuration_response.go
@@ -51,8 +51,14 @@ type EncryptionConfigurationResponse struct {
 	// image
 	Image string `json:"image,omitempty"`

-	// mtls client
-	MtlsClient *CertificateInfo `json:"mtls_client,omitempty"`
+	// kms mtls
+	KmsMtls *EncryptionConfigurationResponseAO1KmsMtls `json:"kms_mtls,omitempty"`
+
+	// minio mtls
+	MinioMtls *CertificateInfo `json:"minio_mtls,omitempty"`
+
+	// raw
+	Raw string `json:"raw,omitempty"`

 	// replicas
 	Replicas string `json:"replicas,omitempty"`
@@ -60,8 +66,8 @@ type EncryptionConfigurationResponse struct {
 	// security context
 	SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-	// server
-	Server *CertificateInfo `json:"server,omitempty"`
+	// server tls
+	ServerTLS *CertificateInfo `json:"server_tls,omitempty"`

 	// vault
 	Vault *VaultConfigurationResponse `json:"vault,omitempty"`
@@ -88,13 +94,17 @@ func (m *EncryptionConfigurationResponse) UnmarshalJSON(raw []byte) error {

 		Image string `json:"image,omitempty"`

-		MtlsClient *CertificateInfo `json:"mtls_client,omitempty"`
+		KmsMtls *EncryptionConfigurationResponseAO1KmsMtls `json:"kms_mtls,omitempty"`
+
+		MinioMtls *CertificateInfo `json:"minio_mtls,omitempty"`
+
+		Raw string `json:"raw,omitempty"`

 		Replicas string `json:"replicas,omitempty"`

 		SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-		Server *CertificateInfo `json:"server,omitempty"`
+		ServerTLS *CertificateInfo `json:"server_tls,omitempty"`

 		Vault *VaultConfigurationResponse `json:"vault,omitempty"`
 	}
@@ -112,13 +122,17 @@ func (m *EncryptionConfigurationResponse) UnmarshalJSON(raw []byte) error {

 	m.Image = dataAO1.Image

-	m.MtlsClient = dataAO1.MtlsClient
+	m.KmsMtls = dataAO1.KmsMtls
+
+	m.MinioMtls = dataAO1.MinioMtls
+
+	m.Raw = dataAO1.Raw

 	m.Replicas = dataAO1.Replicas

 	m.SecurityContext = dataAO1.SecurityContext

-	m.Server = dataAO1.Server
+	m.ServerTLS = dataAO1.ServerTLS

 	m.Vault = dataAO1.Vault

@@ -145,13 +159,17 @@ func (m EncryptionConfigurationResponse) MarshalJSON() ([]byte, error) {

 		Image string `json:"image,omitempty"`

-		MtlsClient *CertificateInfo `json:"mtls_client,omitempty"`
+		KmsMtls *EncryptionConfigurationResponseAO1KmsMtls `json:"kms_mtls,omitempty"`
+
+		MinioMtls *CertificateInfo `json:"minio_mtls,omitempty"`
+
+		Raw string `json:"raw,omitempty"`

 		Replicas string `json:"replicas,omitempty"`

 		SecurityContext *SecurityContext `json:"securityContext,omitempty"`

-		Server *CertificateInfo `json:"server,omitempty"`
+		ServerTLS *CertificateInfo `json:"server_tls,omitempty"`

 		Vault *VaultConfigurationResponse `json:"vault,omitempty"`
 	}
@@ -166,13 +184,17 @@ func (m EncryptionConfigurationResponse) MarshalJSON() ([]byte, error) {

 	dataAO1.Image = m.Image

-	dataAO1.MtlsClient = m.MtlsClient
+	dataAO1.KmsMtls = m.KmsMtls
+
+	dataAO1.MinioMtls = m.MinioMtls
+
+	dataAO1.Raw = m.Raw

 	dataAO1.Replicas = m.Replicas

 	dataAO1.SecurityContext = m.SecurityContext

-	dataAO1.Server = m.Server
+	dataAO1.ServerTLS = m.ServerTLS

 	dataAO1.Vault = m.Vault

@@ -209,7 +231,11 @@ func (m *EncryptionConfigurationResponse) Validate(formats strfmt.Registry) erro
 		res = append(res, err)
 	}

-	if err := m.validateMtlsClient(formats); err != nil {
+	if err := m.validateKmsMtls(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateMinioMtls(formats); err != nil {
 		res = append(res, err)
 	}

@@ -217,7 +243,7 @@ func (m *EncryptionConfigurationResponse) Validate(formats strfmt.Registry) erro
 		res = append(res, err)
 	}

-	if err := m.validateServer(formats); err != nil {
+	if err := m.validateServerTLS(formats); err != nil {
 		res = append(res, err)
 	}

@@ -311,18 +337,38 @@ func (m *EncryptionConfigurationResponse) validateGemalto(formats strfmt.Registr
 	return nil
 }

-func (m *EncryptionConfigurationResponse) validateMtlsClient(formats strfmt.Registry) error {
+func (m *EncryptionConfigurationResponse) validateKmsMtls(formats strfmt.Registry) error {

-	if swag.IsZero(m.MtlsClient) { // not required
+	if swag.IsZero(m.KmsMtls) { // not required
 		return nil
 	}

-	if m.MtlsClient != nil {
-		if err := m.MtlsClient.Validate(formats); err != nil {
+	if m.KmsMtls != nil {
+		if err := m.KmsMtls.Validate(formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("mtls_client")
+				return ve.ValidateName("kms_mtls")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("mtls_client")
+				return ce.ValidateName("kms_mtls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *EncryptionConfigurationResponse) validateMinioMtls(formats strfmt.Registry) error {
+
+	if swag.IsZero(m.MinioMtls) { // not required
+		return nil
+	}
+
+	if m.MinioMtls != nil {
+		if err := m.MinioMtls.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("minio_mtls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("minio_mtls")
 			}
 			return err
 		}
@@ -351,18 +397,18 @@ func (m *EncryptionConfigurationResponse) validateSecurityContext(formats strfmt
 	return nil
 }

-func (m *EncryptionConfigurationResponse) validateServer(formats strfmt.Registry) error {
+func (m *EncryptionConfigurationResponse) validateServerTLS(formats strfmt.Registry) error {

-	if swag.IsZero(m.Server) { // not required
+	if swag.IsZero(m.ServerTLS) { // not required
 		return nil
 	}

-	if m.Server != nil {
-		if err := m.Server.Validate(formats); err != nil {
+	if m.ServerTLS != nil {
+		if err := m.ServerTLS.Validate(formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("server")
+				return ve.ValidateName("server_tls")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("server")
+				return ce.ValidateName("server_tls")
 			}
 			return err
 		}
@@ -416,7 +462,11 @@ func (m *EncryptionConfigurationResponse) ContextValidate(ctx context.Context, f
 		res = append(res, err)
 	}

-	if err := m.contextValidateMtlsClient(ctx, formats); err != nil {
+	if err := m.contextValidateKmsMtls(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateMinioMtls(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -424,7 +474,7 @@ func (m *EncryptionConfigurationResponse) ContextValidate(ctx context.Context, f
 		res = append(res, err)
 	}

-	if err := m.contextValidateServer(ctx, formats); err != nil {
+	if err := m.contextValidateServerTLS(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -502,14 +552,30 @@ func (m *EncryptionConfigurationResponse) contextValidateGemalto(ctx context.Con
 	return nil
 }

-func (m *EncryptionConfigurationResponse) contextValidateMtlsClient(ctx context.Context, formats strfmt.Registry) error {
+func (m *EncryptionConfigurationResponse) contextValidateKmsMtls(ctx context.Context, formats strfmt.Registry) error {

-	if m.MtlsClient != nil {
-		if err := m.MtlsClient.ContextValidate(ctx, formats); err != nil {
+	if m.KmsMtls != nil {
+		if err := m.KmsMtls.ContextValidate(ctx, formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("mtls_client")
+				return ve.ValidateName("kms_mtls")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("mtls_client")
+				return ce.ValidateName("kms_mtls")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *EncryptionConfigurationResponse) contextValidateMinioMtls(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.MinioMtls != nil {
+		if err := m.MinioMtls.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("minio_mtls")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("minio_mtls")
 			}
 			return err
 		}
@@ -534,14 +600,14 @@ func (m *EncryptionConfigurationResponse) contextValidateSecurityContext(ctx con
 	return nil
 }

-func (m *EncryptionConfigurationResponse) contextValidateServer(ctx context.Context, formats strfmt.Registry) error {
+func (m *EncryptionConfigurationResponse) contextValidateServerTLS(ctx context.Context, formats strfmt.Registry) error {

-	if m.Server != nil {
-		if err := m.Server.ContextValidate(ctx, formats); err != nil {
+	if m.ServerTLS != nil {
+		if err := m.ServerTLS.ContextValidate(ctx, formats); err != nil {
 			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("server")
+				return ve.ValidateName("server_tls")
 			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("server")
+				return ce.ValidateName("server_tls")
 			}
 			return err
 		}
@@ -583,3 +649,139 @@ func (m *EncryptionConfigurationResponse) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
+
+// EncryptionConfigurationResponseAO1KmsMtls encryption configuration response a o1 kms mtls
+//
+// swagger:model EncryptionConfigurationResponseAO1KmsMtls
+type EncryptionConfigurationResponseAO1KmsMtls struct {
+
+	// ca
+	Ca *CertificateInfo `json:"ca,omitempty"`
+
+	// crt
+	Crt *CertificateInfo `json:"crt,omitempty"`
+}
+
+// Validate validates this encryption configuration response a o1 kms mtls
+func (m *EncryptionConfigurationResponseAO1KmsMtls) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateCa(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateCrt(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *EncryptionConfigurationResponseAO1KmsMtls) validateCa(formats strfmt.Registry) error {
+	if swag.IsZero(m.Ca) { // not required
+		return nil
+	}
+
+	if m.Ca != nil {
+		if err := m.Ca.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("kms_mtls" + "." + "ca")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("kms_mtls" + "." + "ca")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *EncryptionConfigurationResponseAO1KmsMtls) validateCrt(formats strfmt.Registry) error {
+	if swag.IsZero(m.Crt) { // not required
+		return nil
+	}
+
+	if m.Crt != nil {
+		if err := m.Crt.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("kms_mtls" + "." + "crt")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("kms_mtls" + "." + "crt")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+// ContextValidate validate this encryption configuration response a o1 kms mtls based on the context it is used
+func (m *EncryptionConfigurationResponseAO1KmsMtls) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateCa(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateCrt(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *EncryptionConfigurationResponseAO1KmsMtls) contextValidateCa(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.Ca != nil {
+		if err := m.Ca.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("kms_mtls" + "." + "ca")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("kms_mtls" + "." + "ca")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *EncryptionConfigurationResponseAO1KmsMtls) contextValidateCrt(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.Crt != nil {
+		if err := m.Crt.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("kms_mtls" + "." + "crt")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("kms_mtls" + "." + "crt")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *EncryptionConfigurationResponseAO1KmsMtls) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *EncryptionConfigurationResponseAO1KmsMtls) UnmarshalBinary(b []byte) error {
+	var res EncryptionConfigurationResponseAO1KmsMtls
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/environment_constants.go
+++ b/models/environment_constants.go
@@ -0,0 +1,70 @@
+// 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"
+)
+
+// EnvironmentConstants environment constants
+//
+// swagger:model environmentConstants
+type EnvironmentConstants struct {
+
+	// max concurrent downloads
+	MaxConcurrentDownloads int64 `json:"maxConcurrentDownloads,omitempty"`
+
+	// max concurrent uploads
+	MaxConcurrentUploads int64 `json:"maxConcurrentUploads,omitempty"`
+}
+
+// Validate validates this environment constants
+func (m *EnvironmentConstants) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this environment constants based on context it is used
+func (m *EnvironmentConstants) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *EnvironmentConstants) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *EnvironmentConstants) UnmarshalBinary(b []byte) error {
+	var res EnvironmentConstants
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/gemalto_configuration.go
+++ b/models/gemalto_configuration.go
@@ -135,9 +135,6 @@ type GemaltoConfigurationKeysecure struct {
 	// endpoint
 	// Required: true
 	Endpoint *string `json:"endpoint"`
-
-	// tls
-	TLS *GemaltoConfigurationKeysecureTLS `json:"tls,omitempty"`
 }

 // Validate validates this gemalto configuration keysecure
@@ -152,10 +149,6 @@ func (m *GemaltoConfigurationKeysecure) Validate(formats strfmt.Registry) error
 		res = append(res, err)
 	}

-	if err := m.validateTLS(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -191,25 +184,6 @@ func (m *GemaltoConfigurationKeysecure) validateEndpoint(formats strfmt.Registry
 	return nil
 }

-func (m *GemaltoConfigurationKeysecure) validateTLS(formats strfmt.Registry) error {
-	if swag.IsZero(m.TLS) { // not required
-		return nil
-	}
-
-	if m.TLS != nil {
-		if err := m.TLS.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keysecure" + "." + "tls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keysecure" + "." + "tls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ContextValidate validate this gemalto configuration keysecure based on the context it is used
 func (m *GemaltoConfigurationKeysecure) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -218,10 +192,6 @@ func (m *GemaltoConfigurationKeysecure) ContextValidate(ctx context.Context, for
 		res = append(res, err)
 	}

-	if err := m.contextValidateTLS(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -244,22 +214,6 @@ func (m *GemaltoConfigurationKeysecure) contextValidateCredentials(ctx context.C
 	return nil
 }

-func (m *GemaltoConfigurationKeysecure) contextValidateTLS(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.TLS != nil {
-		if err := m.TLS.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keysecure" + "." + "tls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keysecure" + "." + "tls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *GemaltoConfigurationKeysecure) MarshalBinary() ([]byte, error) {
 	if m == nil {
@@ -353,59 +307,3 @@ func (m *GemaltoConfigurationKeysecureCredentials) UnmarshalBinary(b []byte) err
 	*m = res
 	return nil
 }
-
-// GemaltoConfigurationKeysecureTLS gemalto configuration keysecure TLS
-//
-// swagger:model GemaltoConfigurationKeysecureTLS
-type GemaltoConfigurationKeysecureTLS struct {
-
-	// ca
-	// Required: true
-	Ca *string `json:"ca"`
-}
-
-// Validate validates this gemalto configuration keysecure TLS
-func (m *GemaltoConfigurationKeysecureTLS) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCa(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *GemaltoConfigurationKeysecureTLS) validateCa(formats strfmt.Registry) error {
-
-	if err := validate.Required("keysecure"+"."+"tls"+"."+"ca", "body", m.Ca); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ContextValidate validates this gemalto configuration keysecure TLS based on context it is used
-func (m *GemaltoConfigurationKeysecureTLS) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *GemaltoConfigurationKeysecureTLS) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *GemaltoConfigurationKeysecureTLS) UnmarshalBinary(b []byte) error {
-	var res GemaltoConfigurationKeysecureTLS
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/gemalto_configuration_response.go
+++ b/models/gemalto_configuration_response.go
@@ -135,9 +135,6 @@ type GemaltoConfigurationResponseKeysecure struct {
 	// endpoint
 	// Required: true
 	Endpoint *string `json:"endpoint"`
-
-	// tls
-	TLS *GemaltoConfigurationResponseKeysecureTLS `json:"tls,omitempty"`
 }

 // Validate validates this gemalto configuration response keysecure
@@ -152,10 +149,6 @@ func (m *GemaltoConfigurationResponseKeysecure) Validate(formats strfmt.Registry
 		res = append(res, err)
 	}

-	if err := m.validateTLS(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -191,25 +184,6 @@ func (m *GemaltoConfigurationResponseKeysecure) validateEndpoint(formats strfmt.
 	return nil
 }

-func (m *GemaltoConfigurationResponseKeysecure) validateTLS(formats strfmt.Registry) error {
-	if swag.IsZero(m.TLS) { // not required
-		return nil
-	}
-
-	if m.TLS != nil {
-		if err := m.TLS.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keysecure" + "." + "tls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keysecure" + "." + "tls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ContextValidate validate this gemalto configuration response keysecure based on the context it is used
 func (m *GemaltoConfigurationResponseKeysecure) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -218,10 +192,6 @@ func (m *GemaltoConfigurationResponseKeysecure) ContextValidate(ctx context.Cont
 		res = append(res, err)
 	}

-	if err := m.contextValidateTLS(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -244,22 +214,6 @@ func (m *GemaltoConfigurationResponseKeysecure) contextValidateCredentials(ctx c
 	return nil
 }

-func (m *GemaltoConfigurationResponseKeysecure) contextValidateTLS(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.TLS != nil {
-		if err := m.TLS.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keysecure" + "." + "tls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keysecure" + "." + "tls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *GemaltoConfigurationResponseKeysecure) MarshalBinary() ([]byte, error) {
 	if m == nil {
@@ -353,95 +307,3 @@ func (m *GemaltoConfigurationResponseKeysecureCredentials) UnmarshalBinary(b []b
 	*m = res
 	return nil
 }
-
-// GemaltoConfigurationResponseKeysecureTLS gemalto configuration response keysecure TLS
-//
-// swagger:model GemaltoConfigurationResponseKeysecureTLS
-type GemaltoConfigurationResponseKeysecureTLS struct {
-
-	// ca
-	// Required: true
-	Ca *CertificateInfo `json:"ca"`
-}
-
-// Validate validates this gemalto configuration response keysecure TLS
-func (m *GemaltoConfigurationResponseKeysecureTLS) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCa(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *GemaltoConfigurationResponseKeysecureTLS) validateCa(formats strfmt.Registry) error {
-
-	if err := validate.Required("keysecure"+"."+"tls"+"."+"ca", "body", m.Ca); err != nil {
-		return err
-	}
-
-	if m.Ca != nil {
-		if err := m.Ca.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keysecure" + "." + "tls" + "." + "ca")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keysecure" + "." + "tls" + "." + "ca")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this gemalto configuration response keysecure TLS based on the context it is used
-func (m *GemaltoConfigurationResponseKeysecureTLS) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateCa(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *GemaltoConfigurationResponseKeysecureTLS) contextValidateCa(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Ca != nil {
-		if err := m.Ca.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("keysecure" + "." + "tls" + "." + "ca")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("keysecure" + "." + "tls" + "." + "ca")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *GemaltoConfigurationResponseKeysecureTLS) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *GemaltoConfigurationResponseKeysecureTLS) UnmarshalBinary(b []byte) error {
-	var res GemaltoConfigurationResponseKeysecureTLS
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/km_delete_key_request.go
+++ b/models/km_delete_key_request.go
@@ -0,0 +1,28 @@
+// 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
+
+// KmDeleteKeyRequest km delete key request
+//
+// swagger:model kmDeleteKeyRequest
+type KmDeleteKeyRequest interface{}
--- a/models/get_direct_c_s_i_drive_list_response.go
+++ b/models/get_direct_c_s_i_drive_list_response.go
@@ -31,20 +31,20 @@ import (
 	"github.com/go-openapi/swag"
 )

-// GetDirectCSIDriveListResponse get direct c s i drive list response
+// KmsAPIsResponse kms a p is response
 //
-// swagger:model getDirectCSIDriveListResponse
-type GetDirectCSIDriveListResponse struct {
+// swagger:model kmsAPIsResponse
+type KmsAPIsResponse struct {

-	// drives
-	Drives []*DirectCSIDriveInfo `json:"drives"`
+	// results
+	Results []*KmsAPI `json:"results"`
 }

-// Validate validates this get direct c s i drive list response
-func (m *GetDirectCSIDriveListResponse) Validate(formats strfmt.Registry) error {
+// Validate validates this kms a p is response
+func (m *KmsAPIsResponse) Validate(formats strfmt.Registry) error {
 	var res []error

-	if err := m.validateDrives(formats); err != nil {
+	if err := m.validateResults(formats); err != nil {
 		res = append(res, err)
 	}

@@ -54,22 +54,22 @@ func (m *GetDirectCSIDriveListResponse) Validate(formats strfmt.Registry) error
 	return nil
 }

-func (m *GetDirectCSIDriveListResponse) validateDrives(formats strfmt.Registry) error {
-	if swag.IsZero(m.Drives) { // not required
+func (m *KmsAPIsResponse) validateResults(formats strfmt.Registry) error {
+	if swag.IsZero(m.Results) { // not required
 		return nil
 	}

-	for i := 0; i < len(m.Drives); i++ {
-		if swag.IsZero(m.Drives[i]) { // not required
+	for i := 0; i < len(m.Results); i++ {
+		if swag.IsZero(m.Results[i]) { // not required
 			continue
 		}

-		if m.Drives[i] != nil {
-			if err := m.Drives[i].Validate(formats); err != nil {
+		if m.Results[i] != nil {
+			if err := m.Results[i].Validate(formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("drives" + "." + strconv.Itoa(i))
+					return ve.ValidateName("results" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("drives" + "." + strconv.Itoa(i))
+					return ce.ValidateName("results" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -80,11 +80,11 @@ func (m *GetDirectCSIDriveListResponse) validateDrives(formats strfmt.Registry)
 	return nil
 }

-// ContextValidate validate this get direct c s i drive list response based on the context it is used
-func (m *GetDirectCSIDriveListResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validate this kms a p is response based on the context it is used
+func (m *KmsAPIsResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

-	if err := m.contextValidateDrives(ctx, formats); err != nil {
+	if err := m.contextValidateResults(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -94,16 +94,16 @@ func (m *GetDirectCSIDriveListResponse) ContextValidate(ctx context.Context, for
 	return nil
 }

-func (m *GetDirectCSIDriveListResponse) contextValidateDrives(ctx context.Context, formats strfmt.Registry) error {
+func (m *KmsAPIsResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {

-	for i := 0; i < len(m.Drives); i++ {
+	for i := 0; i < len(m.Results); i++ {

-		if m.Drives[i] != nil {
-			if err := m.Drives[i].ContextValidate(ctx, formats); err != nil {
+		if m.Results[i] != nil {
+			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("drives" + "." + strconv.Itoa(i))
+					return ve.ValidateName("results" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("drives" + "." + strconv.Itoa(i))
+					return ce.ValidateName("results" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -115,7 +115,7 @@ func (m *GetDirectCSIDriveListResponse) contextValidateDrives(ctx context.Contex
 }

 // MarshalBinary interface implementation
-func (m *GetDirectCSIDriveListResponse) MarshalBinary() ([]byte, error) {
+func (m *KmsAPIsResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -123,8 +123,8 @@ func (m *GetDirectCSIDriveListResponse) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *GetDirectCSIDriveListResponse) UnmarshalBinary(b []byte) error {
-	var res GetDirectCSIDriveListResponse
+func (m *KmsAPIsResponse) UnmarshalBinary(b []byte) error {
+	var res KmsAPIsResponse
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/kms_api.go
+++ b/models/kms_api.go
@@ -0,0 +1,76 @@
+// 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"
+)
+
+// KmsAPI kms API
+//
+// swagger:model kmsAPI
+type KmsAPI struct {
+
+	// max body
+	MaxBody int64 `json:"maxBody,omitempty"`
+
+	// method
+	Method string `json:"method,omitempty"`
+
+	// path
+	Path string `json:"path,omitempty"`
+
+	// timeout
+	Timeout int64 `json:"timeout,omitempty"`
+}
+
+// Validate validates this kms API
+func (m *KmsAPI) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this kms API based on context it is used
+func (m *KmsAPI) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsAPI) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsAPI) UnmarshalBinary(b []byte) error {
+	var res KmsAPI
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_assign_policy_request.go
+++ b/models/kms_assign_policy_request.go
@@ -29,33 +29,27 @@ import (
 	"github.com/go-openapi/swag"
 )

-// CsiFormatErrorResponse csi format error response
+// KmsAssignPolicyRequest kms assign policy request
 //
-// swagger:model csiFormatErrorResponse
-type CsiFormatErrorResponse struct {
+// swagger:model kmsAssignPolicyRequest
+type KmsAssignPolicyRequest struct {

-	// drive
-	Drive string `json:"drive,omitempty"`
-
-	// error
-	Error string `json:"error,omitempty"`
-
-	// node
-	Node string `json:"node,omitempty"`
+	// identity
+	Identity string `json:"identity,omitempty"`
 }

-// Validate validates this csi format error response
-func (m *CsiFormatErrorResponse) Validate(formats strfmt.Registry) error {
+// Validate validates this kms assign policy request
+func (m *KmsAssignPolicyRequest) Validate(formats strfmt.Registry) error {
 	return nil
 }

-// ContextValidate validates this csi format error response based on context it is used
-func (m *CsiFormatErrorResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validates this kms assign policy request based on context it is used
+func (m *KmsAssignPolicyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }

 // MarshalBinary interface implementation
-func (m *CsiFormatErrorResponse) MarshalBinary() ([]byte, error) {
+func (m *KmsAssignPolicyRequest) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -63,8 +57,8 @@ func (m *CsiFormatErrorResponse) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *CsiFormatErrorResponse) UnmarshalBinary(b []byte) error {
-	var res CsiFormatErrorResponse
+func (m *KmsAssignPolicyRequest) UnmarshalBinary(b []byte) error {
+	var res KmsAssignPolicyRequest
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/kms_create_key_request.go
+++ b/models/kms_create_key_request.go
@@ -0,0 +1,88 @@
+// 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"
+)
+
+// KmsCreateKeyRequest kms create key request
+//
+// swagger:model kmsCreateKeyRequest
+type KmsCreateKeyRequest struct {
+
+	// key
+	// Required: true
+	Key *string `json:"key"`
+}
+
+// Validate validates this kms create key request
+func (m *KmsCreateKeyRequest) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateKey(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsCreateKeyRequest) validateKey(formats strfmt.Registry) error {
+
+	if err := validate.Required("key", "body", m.Key); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ContextValidate validates this kms create key request based on context it is used
+func (m *KmsCreateKeyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsCreateKeyRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsCreateKeyRequest) UnmarshalBinary(b []byte) error {
+	var res KmsCreateKeyRequest
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_describe_identity_response.go
+++ b/models/kms_describe_identity_response.go
@@ -0,0 +1,79 @@
+// 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"
+)
+
+// KmsDescribeIdentityResponse kms describe identity response
+//
+// swagger:model kmsDescribeIdentityResponse
+type KmsDescribeIdentityResponse struct {
+
+	// admin
+	Admin bool `json:"admin,omitempty"`
+
+	// created at
+	CreatedAt string `json:"createdAt,omitempty"`
+
+	// created by
+	CreatedBy string `json:"createdBy,omitempty"`
+
+	// identity
+	Identity string `json:"identity,omitempty"`
+
+	// policy
+	Policy string `json:"policy,omitempty"`
+}
+
+// Validate validates this kms describe identity response
+func (m *KmsDescribeIdentityResponse) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this kms describe identity response based on context it is used
+func (m *KmsDescribeIdentityResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsDescribeIdentityResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsDescribeIdentityResponse) UnmarshalBinary(b []byte) error {
+	var res KmsDescribeIdentityResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_describe_policy_response.go
+++ b/models/kms_describe_policy_response.go
@@ -0,0 +1,73 @@
+// 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"
+)
+
+// KmsDescribePolicyResponse kms describe policy response
+//
+// swagger:model kmsDescribePolicyResponse
+type KmsDescribePolicyResponse struct {
+
+	// created at
+	CreatedAt string `json:"createdAt,omitempty"`
+
+	// created by
+	CreatedBy string `json:"createdBy,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
+}
+
+// Validate validates this kms describe policy response
+func (m *KmsDescribePolicyResponse) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this kms describe policy response based on context it is used
+func (m *KmsDescribePolicyResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsDescribePolicyResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsDescribePolicyResponse) UnmarshalBinary(b []byte) error {
+	var res KmsDescribePolicyResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_describe_self_identity_response.go
+++ b/models/kms_describe_self_identity_response.go
@@ -0,0 +1,136 @@
+// 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"
+)
+
+// KmsDescribeSelfIdentityResponse kms describe self identity response
+//
+// swagger:model kmsDescribeSelfIdentityResponse
+type KmsDescribeSelfIdentityResponse struct {
+
+	// admin
+	Admin bool `json:"admin,omitempty"`
+
+	// created at
+	CreatedAt string `json:"createdAt,omitempty"`
+
+	// created by
+	CreatedBy string `json:"createdBy,omitempty"`
+
+	// identity
+	Identity string `json:"identity,omitempty"`
+
+	// policy
+	Policy *KmsGetPolicyResponse `json:"policy,omitempty"`
+
+	// policy name
+	PolicyName string `json:"policyName,omitempty"`
+}
+
+// Validate validates this kms describe self identity response
+func (m *KmsDescribeSelfIdentityResponse) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validatePolicy(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsDescribeSelfIdentityResponse) validatePolicy(formats strfmt.Registry) error {
+	if swag.IsZero(m.Policy) { // not required
+		return nil
+	}
+
+	if m.Policy != nil {
+		if err := m.Policy.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("policy")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("policy")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+// ContextValidate validate this kms describe self identity response based on the context it is used
+func (m *KmsDescribeSelfIdentityResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidatePolicy(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsDescribeSelfIdentityResponse) contextValidatePolicy(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.Policy != nil {
+		if err := m.Policy.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("policy")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("policy")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsDescribeSelfIdentityResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsDescribeSelfIdentityResponse) UnmarshalBinary(b []byte) error {
+	var res KmsDescribeSelfIdentityResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/direct_c_s_i_drive_info.go
+++ b/models/direct_c_s_i_drive_info.go
@@ -29,45 +29,30 @@ import (
 	"github.com/go-openapi/swag"
 )

-// DirectCSIDriveInfo direct c s i drive info
+// KmsEndpoint kms endpoint
 //
-// swagger:model directCSIDriveInfo
-type DirectCSIDriveInfo 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"`
+// swagger:model kmsEndpoint
+type KmsEndpoint struct {

 	// status
 	Status string `json:"status,omitempty"`

-	// volumes
-	Volumes int64 `json:"volumes,omitempty"`
+	// url
+	URL string `json:"url,omitempty"`
 }

-// Validate validates this direct c s i drive info
-func (m *DirectCSIDriveInfo) Validate(formats strfmt.Registry) error {
+// Validate validates this kms endpoint
+func (m *KmsEndpoint) Validate(formats strfmt.Registry) error {
 	return nil
 }

-// ContextValidate validates this direct c s i drive info based on context it is used
-func (m *DirectCSIDriveInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validates this kms endpoint based on context it is used
+func (m *KmsEndpoint) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }

 // MarshalBinary interface implementation
-func (m *DirectCSIDriveInfo) MarshalBinary() ([]byte, error) {
+func (m *KmsEndpoint) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -75,8 +60,8 @@ func (m *DirectCSIDriveInfo) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *DirectCSIDriveInfo) UnmarshalBinary(b []byte) error {
-	var res DirectCSIDriveInfo
+func (m *KmsEndpoint) UnmarshalBinary(b []byte) error {
+	var res KmsEndpoint
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/operator_subnet_register_api_key.go
+++ b/models/operator_subnet_register_api_key.go
@@ -29,27 +29,30 @@ import (
 	"github.com/go-openapi/swag"
 )

-// OperatorSubnetRegisterAPIKey operator subnet register API key
+// KmsGetPolicyResponse kms get policy response
 //
-// swagger:model operatorSubnetRegisterAPIKey
-type OperatorSubnetRegisterAPIKey struct {
+// swagger:model kmsGetPolicyResponse
+type KmsGetPolicyResponse struct {

-	// registered
-	Registered bool `json:"registered,omitempty"`
+	// allow
+	Allow []string `json:"allow"`
+
+	// deny
+	Deny []string `json:"deny"`
 }

-// Validate validates this operator subnet register API key
-func (m *OperatorSubnetRegisterAPIKey) Validate(formats strfmt.Registry) error {
+// Validate validates this kms get policy response
+func (m *KmsGetPolicyResponse) 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 {
+// ContextValidate validates this kms get policy response based on context it is used
+func (m *KmsGetPolicyResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }

 // MarshalBinary interface implementation
-func (m *OperatorSubnetRegisterAPIKey) MarshalBinary() ([]byte, error) {
+func (m *KmsGetPolicyResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -57,8 +60,8 @@ func (m *OperatorSubnetRegisterAPIKey) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *OperatorSubnetRegisterAPIKey) UnmarshalBinary(b []byte) error {
-	var res OperatorSubnetRegisterAPIKey
+func (m *KmsGetPolicyResponse) UnmarshalBinary(b []byte) error {
+	var res KmsGetPolicyResponse
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/kms_identity_info.go
+++ b/models/kms_identity_info.go
@@ -0,0 +1,79 @@
+// 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"
+)
+
+// KmsIdentityInfo kms identity info
+//
+// swagger:model kmsIdentityInfo
+type KmsIdentityInfo struct {
+
+	// created at
+	CreatedAt string `json:"createdAt,omitempty"`
+
+	// created by
+	CreatedBy string `json:"createdBy,omitempty"`
+
+	// error
+	Error string `json:"error,omitempty"`
+
+	// identity
+	Identity string `json:"identity,omitempty"`
+
+	// policy
+	Policy string `json:"policy,omitempty"`
+}
+
+// Validate validates this kms identity info
+func (m *KmsIdentityInfo) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this kms identity info based on context it is used
+func (m *KmsIdentityInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsIdentityInfo) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsIdentityInfo) UnmarshalBinary(b []byte) error {
+	var res KmsIdentityInfo
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_import_key_request.go
+++ b/models/kms_import_key_request.go
@@ -0,0 +1,88 @@
+// 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"
+)
+
+// KmsImportKeyRequest kms import key request
+//
+// swagger:model kmsImportKeyRequest
+type KmsImportKeyRequest struct {
+
+	// bytes
+	// Required: true
+	Bytes *string `json:"bytes"`
+}
+
+// Validate validates this kms import key request
+func (m *KmsImportKeyRequest) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateBytes(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsImportKeyRequest) validateBytes(formats strfmt.Registry) error {
+
+	if err := validate.Required("bytes", "body", m.Bytes); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ContextValidate validates this kms import key request based on context it is used
+func (m *KmsImportKeyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsImportKeyRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsImportKeyRequest) UnmarshalBinary(b []byte) error {
+	var res KmsImportKeyRequest
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_key_info.go
+++ b/models/kms_key_info.go
@@ -0,0 +1,73 @@
+// 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"
+)
+
+// KmsKeyInfo kms key info
+//
+// swagger:model kmsKeyInfo
+type KmsKeyInfo struct {
+
+	// created at
+	CreatedAt string `json:"createdAt,omitempty"`
+
+	// created by
+	CreatedBy string `json:"createdBy,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
+}
+
+// Validate validates this kms key info
+func (m *KmsKeyInfo) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this kms key info based on context it is used
+func (m *KmsKeyInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsKeyInfo) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsKeyInfo) UnmarshalBinary(b []byte) error {
+	var res KmsKeyInfo
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_key_status_response.go
+++ b/models/kms_key_status_response.go
@@ -0,0 +1,73 @@
+// 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"
+)
+
+// KmsKeyStatusResponse kms key status response
+//
+// swagger:model kmsKeyStatusResponse
+type KmsKeyStatusResponse struct {
+
+	// decryption err
+	DecryptionErr string `json:"decryptionErr,omitempty"`
+
+	// encryption err
+	EncryptionErr string `json:"encryptionErr,omitempty"`
+
+	// key ID
+	KeyID string `json:"keyID,omitempty"`
+}
+
+// Validate validates this kms key status response
+func (m *KmsKeyStatusResponse) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this kms key status response based on context it is used
+func (m *KmsKeyStatusResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsKeyStatusResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsKeyStatusResponse) UnmarshalBinary(b []byte) error {
+	var res KmsKeyStatusResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/direct_c_s_i_volume_info.go
+++ b/models/direct_c_s_i_volume_info.go
@@ -29,36 +29,27 @@ import (
 	"github.com/go-openapi/swag"
 )

-// DirectCSIVolumeInfo direct c s i volume info
+// KmsLatencyHistogram kms latency histogram
 //
-// swagger:model directCSIVolumeInfo
-type DirectCSIVolumeInfo struct {
+// swagger:model kmsLatencyHistogram
+type KmsLatencyHistogram 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"`
+	// duration
+	Duration int64 `json:"duration,omitempty"`
 }

-// Validate validates this direct c s i volume info
-func (m *DirectCSIVolumeInfo) Validate(formats strfmt.Registry) error {
+// Validate validates this kms latency histogram
+func (m *KmsLatencyHistogram) Validate(formats strfmt.Registry) error {
 	return nil
 }

-// ContextValidate validates this direct c s i volume info based on context it is used
-func (m *DirectCSIVolumeInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validates this kms latency histogram based on context it is used
+func (m *KmsLatencyHistogram) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	return nil
 }

 // MarshalBinary interface implementation
-func (m *DirectCSIVolumeInfo) MarshalBinary() ([]byte, error) {
+func (m *KmsLatencyHistogram) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -66,8 +57,8 @@ func (m *DirectCSIVolumeInfo) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *DirectCSIVolumeInfo) UnmarshalBinary(b []byte) error {
-	var res DirectCSIVolumeInfo
+func (m *KmsLatencyHistogram) UnmarshalBinary(b []byte) error {
+	var res KmsLatencyHistogram
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/format_direct_c_s_i_drives_response.go
+++ b/models/format_direct_c_s_i_drives_response.go
@@ -31,20 +31,20 @@ import (
 	"github.com/go-openapi/swag"
 )

-// FormatDirectCSIDrivesResponse format direct c s i drives response
+// KmsListIdentitiesResponse kms list identities response
 //
-// swagger:model formatDirectCSIDrivesResponse
-type FormatDirectCSIDrivesResponse struct {
+// swagger:model kmsListIdentitiesResponse
+type KmsListIdentitiesResponse struct {

-	// format issues list
-	FormatIssuesList []*CsiFormatErrorResponse `json:"formatIssuesList"`
+	// results
+	Results []*KmsIdentityInfo `json:"results"`
 }

-// Validate validates this format direct c s i drives response
-func (m *FormatDirectCSIDrivesResponse) Validate(formats strfmt.Registry) error {
+// Validate validates this kms list identities response
+func (m *KmsListIdentitiesResponse) Validate(formats strfmt.Registry) error {
 	var res []error

-	if err := m.validateFormatIssuesList(formats); err != nil {
+	if err := m.validateResults(formats); err != nil {
 		res = append(res, err)
 	}

@@ -54,22 +54,22 @@ func (m *FormatDirectCSIDrivesResponse) Validate(formats strfmt.Registry) error
 	return nil
 }

-func (m *FormatDirectCSIDrivesResponse) validateFormatIssuesList(formats strfmt.Registry) error {
-	if swag.IsZero(m.FormatIssuesList) { // not required
+func (m *KmsListIdentitiesResponse) validateResults(formats strfmt.Registry) error {
+	if swag.IsZero(m.Results) { // not required
 		return nil
 	}

-	for i := 0; i < len(m.FormatIssuesList); i++ {
-		if swag.IsZero(m.FormatIssuesList[i]) { // not required
+	for i := 0; i < len(m.Results); i++ {
+		if swag.IsZero(m.Results[i]) { // not required
 			continue
 		}

-		if m.FormatIssuesList[i] != nil {
-			if err := m.FormatIssuesList[i].Validate(formats); err != nil {
+		if m.Results[i] != nil {
+			if err := m.Results[i].Validate(formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("formatIssuesList" + "." + strconv.Itoa(i))
+					return ve.ValidateName("results" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("formatIssuesList" + "." + strconv.Itoa(i))
+					return ce.ValidateName("results" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -80,11 +80,11 @@ func (m *FormatDirectCSIDrivesResponse) validateFormatIssuesList(formats strfmt.
 	return nil
 }

-// ContextValidate validate this format direct c s i drives response based on the context it is used
-func (m *FormatDirectCSIDrivesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validate this kms list identities response based on the context it is used
+func (m *KmsListIdentitiesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

-	if err := m.contextValidateFormatIssuesList(ctx, formats); err != nil {
+	if err := m.contextValidateResults(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -94,16 +94,16 @@ func (m *FormatDirectCSIDrivesResponse) ContextValidate(ctx context.Context, for
 	return nil
 }

-func (m *FormatDirectCSIDrivesResponse) contextValidateFormatIssuesList(ctx context.Context, formats strfmt.Registry) error {
+func (m *KmsListIdentitiesResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {

-	for i := 0; i < len(m.FormatIssuesList); i++ {
+	for i := 0; i < len(m.Results); i++ {

-		if m.FormatIssuesList[i] != nil {
-			if err := m.FormatIssuesList[i].ContextValidate(ctx, formats); err != nil {
+		if m.Results[i] != nil {
+			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("formatIssuesList" + "." + strconv.Itoa(i))
+					return ve.ValidateName("results" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("formatIssuesList" + "." + strconv.Itoa(i))
+					return ce.ValidateName("results" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -115,7 +115,7 @@ func (m *FormatDirectCSIDrivesResponse) contextValidateFormatIssuesList(ctx cont
 }

 // MarshalBinary interface implementation
-func (m *FormatDirectCSIDrivesResponse) MarshalBinary() ([]byte, error) {
+func (m *KmsListIdentitiesResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -123,8 +123,8 @@ func (m *FormatDirectCSIDrivesResponse) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *FormatDirectCSIDrivesResponse) UnmarshalBinary(b []byte) error {
-	var res FormatDirectCSIDrivesResponse
+func (m *KmsListIdentitiesResponse) UnmarshalBinary(b []byte) error {
+	var res KmsListIdentitiesResponse
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/kms_list_keys_response.go
+++ b/models/kms_list_keys_response.go
@@ -0,0 +1,133 @@
+// 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"
+)
+
+// KmsListKeysResponse kms list keys response
+//
+// swagger:model kmsListKeysResponse
+type KmsListKeysResponse struct {
+
+	// results
+	Results []*KmsKeyInfo `json:"results"`
+}
+
+// Validate validates this kms list keys response
+func (m *KmsListKeysResponse) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateResults(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsListKeysResponse) validateResults(formats strfmt.Registry) error {
+	if swag.IsZero(m.Results) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Results); i++ {
+		if swag.IsZero(m.Results[i]) { // not required
+			continue
+		}
+
+		if m.Results[i] != nil {
+			if err := m.Results[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("results" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("results" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// ContextValidate validate this kms list keys response based on the context it is used
+func (m *KmsListKeysResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateResults(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsListKeysResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.Results); i++ {
+
+		if m.Results[i] != nil {
+			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("results" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("results" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsListKeysResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsListKeysResponse) UnmarshalBinary(b []byte) error {
+	var res KmsListKeysResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/get_direct_c_s_i_volume_list_response.go
+++ b/models/get_direct_c_s_i_volume_list_response.go
@@ -31,20 +31,20 @@ import (
 	"github.com/go-openapi/swag"
 )

-// GetDirectCSIVolumeListResponse get direct c s i volume list response
+// KmsListPoliciesResponse kms list policies response
 //
-// swagger:model getDirectCSIVolumeListResponse
-type GetDirectCSIVolumeListResponse struct {
+// swagger:model kmsListPoliciesResponse
+type KmsListPoliciesResponse struct {

-	// volumes
-	Volumes []*DirectCSIVolumeInfo `json:"volumes"`
+	// results
+	Results []*KmsPolicyInfo `json:"results"`
 }

-// Validate validates this get direct c s i volume list response
-func (m *GetDirectCSIVolumeListResponse) Validate(formats strfmt.Registry) error {
+// Validate validates this kms list policies response
+func (m *KmsListPoliciesResponse) Validate(formats strfmt.Registry) error {
 	var res []error

-	if err := m.validateVolumes(formats); err != nil {
+	if err := m.validateResults(formats); err != nil {
 		res = append(res, err)
 	}

@@ -54,22 +54,22 @@ func (m *GetDirectCSIVolumeListResponse) Validate(formats strfmt.Registry) error
 	return nil
 }

-func (m *GetDirectCSIVolumeListResponse) validateVolumes(formats strfmt.Registry) error {
-	if swag.IsZero(m.Volumes) { // not required
+func (m *KmsListPoliciesResponse) validateResults(formats strfmt.Registry) error {
+	if swag.IsZero(m.Results) { // not required
 		return nil
 	}

-	for i := 0; i < len(m.Volumes); i++ {
-		if swag.IsZero(m.Volumes[i]) { // not required
+	for i := 0; i < len(m.Results); i++ {
+		if swag.IsZero(m.Results[i]) { // not required
 			continue
 		}

-		if m.Volumes[i] != nil {
-			if err := m.Volumes[i].Validate(formats); err != nil {
+		if m.Results[i] != nil {
+			if err := m.Results[i].Validate(formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("volumes" + "." + strconv.Itoa(i))
+					return ve.ValidateName("results" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("volumes" + "." + strconv.Itoa(i))
+					return ce.ValidateName("results" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -80,11 +80,11 @@ func (m *GetDirectCSIVolumeListResponse) validateVolumes(formats strfmt.Registry
 	return nil
 }

-// ContextValidate validate this get direct c s i volume list response based on the context it is used
-func (m *GetDirectCSIVolumeListResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+// ContextValidate validate this kms list policies response based on the context it is used
+func (m *KmsListPoliciesResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

-	if err := m.contextValidateVolumes(ctx, formats); err != nil {
+	if err := m.contextValidateResults(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -94,16 +94,16 @@ func (m *GetDirectCSIVolumeListResponse) ContextValidate(ctx context.Context, fo
 	return nil
 }

-func (m *GetDirectCSIVolumeListResponse) contextValidateVolumes(ctx context.Context, formats strfmt.Registry) error {
+func (m *KmsListPoliciesResponse) contextValidateResults(ctx context.Context, formats strfmt.Registry) error {

-	for i := 0; i < len(m.Volumes); i++ {
+	for i := 0; i < len(m.Results); i++ {

-		if m.Volumes[i] != nil {
-			if err := m.Volumes[i].ContextValidate(ctx, formats); err != nil {
+		if m.Results[i] != nil {
+			if err := m.Results[i].ContextValidate(ctx, formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("volumes" + "." + strconv.Itoa(i))
+					return ve.ValidateName("results" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("volumes" + "." + strconv.Itoa(i))
+					return ce.ValidateName("results" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -115,7 +115,7 @@ func (m *GetDirectCSIVolumeListResponse) contextValidateVolumes(ctx context.Cont
 }

 // MarshalBinary interface implementation
-func (m *GetDirectCSIVolumeListResponse) MarshalBinary() ([]byte, error) {
+func (m *KmsListPoliciesResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
 		return nil, nil
 	}
@@ -123,8 +123,8 @@ func (m *GetDirectCSIVolumeListResponse) MarshalBinary() ([]byte, error) {
 }

 // UnmarshalBinary interface implementation
-func (m *GetDirectCSIVolumeListResponse) UnmarshalBinary(b []byte) error {
-	var res GetDirectCSIVolumeListResponse
+func (m *KmsListPoliciesResponse) UnmarshalBinary(b []byte) error {
+	var res KmsListPoliciesResponse
 	if err := swag.ReadJSON(b, &res); err != nil {
 		return err
 	}
--- a/models/kms_metrics_response.go
+++ b/models/kms_metrics_response.go
@@ -0,0 +1,331 @@
+// 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"
+)
+
+// KmsMetricsResponse kms metrics response
+//
+// swagger:model kmsMetricsResponse
+type KmsMetricsResponse struct {
+
+	// audit events
+	// Required: true
+	AuditEvents *int64 `json:"auditEvents"`
+
+	// cpus
+	// Required: true
+	Cpus *int64 `json:"cpus"`
+
+	// error events
+	// Required: true
+	ErrorEvents *int64 `json:"errorEvents"`
+
+	// heap alloc
+	// Required: true
+	HeapAlloc *int64 `json:"heapAlloc"`
+
+	// heap objects
+	HeapObjects int64 `json:"heapObjects,omitempty"`
+
+	// latency histogram
+	// Required: true
+	LatencyHistogram *KmsLatencyHistogram `json:"latencyHistogram"`
+
+	// request active
+	// Required: true
+	RequestActive *int64 `json:"requestActive"`
+
+	// request err
+	// Required: true
+	RequestErr *int64 `json:"requestErr"`
+
+	// request fail
+	// Required: true
+	RequestFail *int64 `json:"requestFail"`
+
+	// request o k
+	// Required: true
+	RequestOK *int64 `json:"requestOK"`
+
+	// stack alloc
+	// Required: true
+	StackAlloc *int64 `json:"stackAlloc"`
+
+	// threads
+	// Required: true
+	Threads *int64 `json:"threads"`
+
+	// uptime
+	// Required: true
+	Uptime *int64 `json:"uptime"`
+
+	// usable c p us
+	// Required: true
+	UsableCPUs *int64 `json:"usableCPUs"`
+}
+
+// Validate validates this kms metrics response
+func (m *KmsMetricsResponse) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateAuditEvents(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateCpus(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateErrorEvents(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateHeapAlloc(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateLatencyHistogram(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateRequestActive(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateRequestErr(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateRequestFail(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateRequestOK(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateStackAlloc(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateThreads(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateUptime(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateUsableCPUs(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateAuditEvents(formats strfmt.Registry) error {
+
+	if err := validate.Required("auditEvents", "body", m.AuditEvents); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateCpus(formats strfmt.Registry) error {
+
+	if err := validate.Required("cpus", "body", m.Cpus); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateErrorEvents(formats strfmt.Registry) error {
+
+	if err := validate.Required("errorEvents", "body", m.ErrorEvents); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateHeapAlloc(formats strfmt.Registry) error {
+
+	if err := validate.Required("heapAlloc", "body", m.HeapAlloc); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateLatencyHistogram(formats strfmt.Registry) error {
+
+	if err := validate.Required("latencyHistogram", "body", m.LatencyHistogram); err != nil {
+		return err
+	}
+
+	if m.LatencyHistogram != nil {
+		if err := m.LatencyHistogram.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("latencyHistogram")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("latencyHistogram")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateRequestActive(formats strfmt.Registry) error {
+
+	if err := validate.Required("requestActive", "body", m.RequestActive); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateRequestErr(formats strfmt.Registry) error {
+
+	if err := validate.Required("requestErr", "body", m.RequestErr); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateRequestFail(formats strfmt.Registry) error {
+
+	if err := validate.Required("requestFail", "body", m.RequestFail); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateRequestOK(formats strfmt.Registry) error {
+
+	if err := validate.Required("requestOK", "body", m.RequestOK); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateStackAlloc(formats strfmt.Registry) error {
+
+	if err := validate.Required("stackAlloc", "body", m.StackAlloc); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateThreads(formats strfmt.Registry) error {
+
+	if err := validate.Required("threads", "body", m.Threads); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateUptime(formats strfmt.Registry) error {
+
+	if err := validate.Required("uptime", "body", m.Uptime); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (m *KmsMetricsResponse) validateUsableCPUs(formats strfmt.Registry) error {
+
+	if err := validate.Required("usableCPUs", "body", m.UsableCPUs); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ContextValidate validate this kms metrics response based on the context it is used
+func (m *KmsMetricsResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateLatencyHistogram(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsMetricsResponse) contextValidateLatencyHistogram(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.LatencyHistogram != nil {
+		if err := m.LatencyHistogram.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("latencyHistogram")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("latencyHistogram")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsMetricsResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsMetricsResponse) UnmarshalBinary(b []byte) error {
+	var res KmsMetricsResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_policy_info.go
+++ b/models/kms_policy_info.go
@@ -0,0 +1,73 @@
+// 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"
+)
+
+// KmsPolicyInfo kms policy info
+//
+// swagger:model kmsPolicyInfo
+type KmsPolicyInfo struct {
+
+	// created at
+	CreatedAt string `json:"createdAt,omitempty"`
+
+	// created by
+	CreatedBy string `json:"createdBy,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
+}
+
+// Validate validates this kms policy info
+func (m *KmsPolicyInfo) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this kms policy info based on context it is used
+func (m *KmsPolicyInfo) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsPolicyInfo) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsPolicyInfo) UnmarshalBinary(b []byte) error {
+	var res KmsPolicyInfo
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_set_policy_request.go
+++ b/models/kms_set_policy_request.go
@@ -0,0 +1,94 @@
+// 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"
+)
+
+// KmsSetPolicyRequest kms set policy request
+//
+// swagger:model kmsSetPolicyRequest
+type KmsSetPolicyRequest struct {
+
+	// allow
+	Allow []string `json:"allow"`
+
+	// deny
+	Deny []string `json:"deny"`
+
+	// policy
+	// Required: true
+	Policy *string `json:"policy"`
+}
+
+// Validate validates this kms set policy request
+func (m *KmsSetPolicyRequest) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validatePolicy(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsSetPolicyRequest) validatePolicy(formats strfmt.Registry) error {
+
+	if err := validate.Required("policy", "body", m.Policy); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// ContextValidate validates this kms set policy request based on context it is used
+func (m *KmsSetPolicyRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsSetPolicyRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsSetPolicyRequest) UnmarshalBinary(b []byte) error {
+	var res KmsSetPolicyRequest
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_status_response.go
+++ b/models/kms_status_response.go
@@ -0,0 +1,139 @@
+// 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"
+)
+
+// KmsStatusResponse kms status response
+//
+// swagger:model kmsStatusResponse
+type KmsStatusResponse struct {
+
+	// default key ID
+	DefaultKeyID string `json:"defaultKeyID,omitempty"`
+
+	// endpoints
+	Endpoints []*KmsEndpoint `json:"endpoints"`
+
+	// name
+	Name string `json:"name,omitempty"`
+}
+
+// Validate validates this kms status response
+func (m *KmsStatusResponse) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateEndpoints(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsStatusResponse) validateEndpoints(formats strfmt.Registry) error {
+	if swag.IsZero(m.Endpoints) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Endpoints); i++ {
+		if swag.IsZero(m.Endpoints[i]) { // not required
+			continue
+		}
+
+		if m.Endpoints[i] != nil {
+			if err := m.Endpoints[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("endpoints" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("endpoints" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// ContextValidate validate this kms status response based on the context it is used
+func (m *KmsStatusResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateEndpoints(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *KmsStatusResponse) contextValidateEndpoints(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.Endpoints); i++ {
+
+		if m.Endpoints[i] != nil {
+			if err := m.Endpoints[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("endpoints" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("endpoints" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsStatusResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsStatusResponse) UnmarshalBinary(b []byte) error {
+	var res KmsStatusResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/kms_version_response.go
+++ b/models/kms_version_response.go
@@ -0,0 +1,67 @@
+// 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"
+)
+
+// KmsVersionResponse kms version response
+//
+// swagger:model kmsVersionResponse
+type KmsVersionResponse struct {
+
+	// version
+	Version string `json:"version,omitempty"`
+}
+
+// Validate validates this kms version response
+func (m *KmsVersionResponse) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this kms version response based on context it is used
+func (m *KmsVersionResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *KmsVersionResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *KmsVersionResponse) UnmarshalBinary(b []byte) error {
+	var res KmsVersionResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/login_details.go
+++ b/models/login_details.go
@@ -25,6 +25,7 @@ package models
 import (
 	"context"
 	"encoding/json"
+	"strconv"

 	"github.com/go-openapi/errors"
 	"github.com/go-openapi/strfmt"
@@ -44,8 +45,8 @@ type LoginDetails struct {
 	// Enum: [form redirect service-account redirect-service-account]
 	LoginStrategy string `json:"loginStrategy,omitempty"`

-	// redirect
-	Redirect string `json:"redirect,omitempty"`
+	// redirect rules
+	RedirectRules []*RedirectRule `json:"redirectRules"`
 }

 // Validate validates this login details
@@ -56,6 +57,10 @@ func (m *LoginDetails) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

+	if err := m.validateRedirectRules(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -110,8 +115,63 @@ func (m *LoginDetails) validateLoginStrategy(formats strfmt.Registry) error {
 	return nil
 }

-// ContextValidate validates this login details based on context it is used
+func (m *LoginDetails) validateRedirectRules(formats strfmt.Registry) error {
+	if swag.IsZero(m.RedirectRules) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.RedirectRules); i++ {
+		if swag.IsZero(m.RedirectRules[i]) { // not required
+			continue
+		}
+
+		if m.RedirectRules[i] != nil {
+			if err := m.RedirectRules[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("redirectRules" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("redirectRules" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// ContextValidate validate this login details based on the context it is used
 func (m *LoginDetails) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateRedirectRules(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *LoginDetails) contextValidateRedirectRules(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.RedirectRules); i++ {
+
+		if m.RedirectRules[i] != nil {
+			if err := m.RedirectRules[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("redirectRules" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("redirectRules" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
 	return nil
 }

--- a/models/redirect_rule.go
+++ b/models/redirect_rule.go
@@ -0,0 +1,70 @@
+// 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"
+)
+
+// RedirectRule redirect rule
+//
+// swagger:model redirectRule
+type RedirectRule struct {
+
+	// display name
+	DisplayName string `json:"displayName,omitempty"`
+
+	// redirect
+	Redirect string `json:"redirect,omitempty"`
+}
+
+// Validate validates this redirect rule
+func (m *RedirectRule) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this redirect rule based on context it is used
+func (m *RedirectRule) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *RedirectRule) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *RedirectRule) UnmarshalBinary(b []byte) error {
+	var res RedirectRule
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/session_response.go
+++ b/models/session_response.go
@@ -47,6 +47,9 @@ type SessionResponse struct {
 	// distributed mode
 	DistributedMode bool `json:"distributedMode,omitempty"`

+	// env constants
+	EnvConstants *EnvironmentConstants `json:"envConstants,omitempty"`
+
 	// features
 	Features []string `json:"features"`

@@ -56,6 +59,9 @@ type SessionResponse struct {
 	// permissions
 	Permissions map[string][]string `json:"permissions,omitempty"`

+	// server end point
+	ServerEndPoint string `json:"serverEndPoint,omitempty"`
+
 	// status
 	// Enum: [ok]
 	Status string `json:"status,omitempty"`
@@ -69,6 +75,10 @@ func (m *SessionResponse) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

+	if err := m.validateEnvConstants(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateStatus(formats); err != nil {
 		res = append(res, err)
 	}
@@ -105,6 +115,25 @@ func (m *SessionResponse) validateAllowResources(formats strfmt.Registry) error
 	return nil
 }

+func (m *SessionResponse) validateEnvConstants(formats strfmt.Registry) error {
+	if swag.IsZero(m.EnvConstants) { // not required
+		return nil
+	}
+
+	if m.EnvConstants != nil {
+		if err := m.EnvConstants.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("envConstants")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("envConstants")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 var sessionResponseTypeStatusPropEnum []interface{}

 func init() {
@@ -152,6 +181,10 @@ func (m *SessionResponse) ContextValidate(ctx context.Context, formats strfmt.Re
 		res = append(res, err)
 	}

+	if err := m.contextValidateEnvConstants(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -178,6 +211,22 @@ func (m *SessionResponse) contextValidateAllowResources(ctx context.Context, for
 	return nil
 }

+func (m *SessionResponse) contextValidateEnvConstants(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.EnvConstants != nil {
+		if err := m.EnvConstants.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("envConstants")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("envConstants")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 // MarshalBinary interface implementation
 func (m *SessionResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
--- a/models/tenant_configuration_response.go
+++ b/models/tenant_configuration_response.go
@@ -0,0 +1,133 @@
+// 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"
+)
+
+// TenantConfigurationResponse tenant configuration response
+//
+// swagger:model tenantConfigurationResponse
+type TenantConfigurationResponse struct {
+
+	// environment variables
+	EnvironmentVariables []*EnvironmentVariable `json:"environmentVariables"`
+}
+
+// Validate validates this tenant configuration response
+func (m *TenantConfigurationResponse) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateEnvironmentVariables(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *TenantConfigurationResponse) 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
+}
+
+// ContextValidate validate this tenant configuration response based on the context it is used
+func (m *TenantConfigurationResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateEnvironmentVariables(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *TenantConfigurationResponse) 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
+}
+
+// MarshalBinary interface implementation
+func (m *TenantConfigurationResponse) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *TenantConfigurationResponse) UnmarshalBinary(b []byte) error {
+	var res TenantConfigurationResponse
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/tenant_security_response.go
+++ b/models/tenant_security_response.go
@@ -175,6 +175,9 @@ func (m *TenantSecurityResponse) UnmarshalBinary(b []byte) error {
 // swagger:model TenantSecurityResponseCustomCertificates
 type TenantSecurityResponseCustomCertificates struct {

+	// client
+	Client []*CertificateInfo `json:"client"`
+
 	// minio
 	Minio []*CertificateInfo `json:"minio"`

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

+	if err := m.validateClient(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateMinio(formats); err != nil {
 		res = append(res, err)
 	}
@@ -200,6 +207,32 @@ func (m *TenantSecurityResponseCustomCertificates) Validate(formats strfmt.Regis
 	return nil
 }

+func (m *TenantSecurityResponseCustomCertificates) validateClient(formats strfmt.Registry) error {
+	if swag.IsZero(m.Client) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Client); i++ {
+		if swag.IsZero(m.Client[i]) { // not required
+			continue
+		}
+
+		if m.Client[i] != nil {
+			if err := m.Client[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("customCertificates" + "." + "client" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("customCertificates" + "." + "client" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
 func (m *TenantSecurityResponseCustomCertificates) validateMinio(formats strfmt.Registry) error {
 	if swag.IsZero(m.Minio) { // not required
 		return nil
@@ -256,6 +289,10 @@ func (m *TenantSecurityResponseCustomCertificates) validateMinioCAs(formats strf
 func (m *TenantSecurityResponseCustomCertificates) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

+	if err := m.contextValidateClient(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.contextValidateMinio(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -270,6 +307,26 @@ func (m *TenantSecurityResponseCustomCertificates) ContextValidate(ctx context.C
 	return nil
 }

+func (m *TenantSecurityResponseCustomCertificates) contextValidateClient(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.Client); i++ {
+
+		if m.Client[i] != nil {
+			if err := m.Client[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("customCertificates" + "." + "client" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("customCertificates" + "." + "client" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
 func (m *TenantSecurityResponseCustomCertificates) contextValidateMinio(ctx context.Context, formats strfmt.Registry) error {

 	for i := 0; i < len(m.Minio); i++ {
--- a/models/tier.go
+++ b/models/tier.go
@@ -43,11 +43,17 @@ type Tier struct {
 	// gcs
 	Gcs *TierGcs `json:"gcs,omitempty"`

+	// minio
+	Minio *TierMinio `json:"minio,omitempty"`
+
 	// s3
 	S3 *TierS3 `json:"s3,omitempty"`

+	// status
+	Status bool `json:"status,omitempty"`
+
 	// type
-	// Enum: [s3 gcs azure unsupported]
+	// Enum: [s3 gcs azure minio unsupported]
 	Type string `json:"type,omitempty"`
 }

@@ -63,6 +69,10 @@ func (m *Tier) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

+	if err := m.validateMinio(formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.validateS3(formats); err != nil {
 		res = append(res, err)
 	}
@@ -115,6 +125,25 @@ func (m *Tier) validateGcs(formats strfmt.Registry) error {
 	return nil
 }

+func (m *Tier) validateMinio(formats strfmt.Registry) error {
+	if swag.IsZero(m.Minio) { // not required
+		return nil
+	}
+
+	if m.Minio != nil {
+		if err := m.Minio.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("minio")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("minio")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *Tier) validateS3(formats strfmt.Registry) error {
 	if swag.IsZero(m.S3) { // not required
 		return nil
@@ -138,7 +167,7 @@ var tierTypeTypePropEnum []interface{}

 func init() {
 	var res []string
-	if err := json.Unmarshal([]byte(`["s3","gcs","azure","unsupported"]`), &res); err != nil {
+	if err := json.Unmarshal([]byte(`["s3","gcs","azure","minio","unsupported"]`), &res); err != nil {
 		panic(err)
 	}
 	for _, v := range res {
@@ -157,6 +186,9 @@ const (
 	// TierTypeAzure captures enum value "azure"
 	TierTypeAzure string = "azure"

+	// TierTypeMinio captures enum value "minio"
+	TierTypeMinio string = "minio"
+
 	// TierTypeUnsupported captures enum value "unsupported"
 	TierTypeUnsupported string = "unsupported"
 )
@@ -194,6 +226,10 @@ func (m *Tier) ContextValidate(ctx context.Context, formats strfmt.Registry) err
 		res = append(res, err)
 	}

+	if err := m.contextValidateMinio(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
 	if err := m.contextValidateS3(ctx, formats); err != nil {
 		res = append(res, err)
 	}
@@ -236,6 +272,22 @@ func (m *Tier) contextValidateGcs(ctx context.Context, formats strfmt.Registry)
 	return nil
 }

+func (m *Tier) contextValidateMinio(ctx context.Context, formats strfmt.Registry) error {
+
+	if m.Minio != nil {
+		if err := m.Minio.ContextValidate(ctx, formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("minio")
+			} else if ce, ok := err.(*errors.CompositeError); ok {
+				return ce.ValidateName("minio")
+			}
+			return err
+		}
+	}
+
+	return nil
+}
+
 func (m *Tier) contextValidateS3(ctx context.Context, formats strfmt.Registry) error {

 	if m.S3 != nil {
--- a/models/tier_minio.go
+++ b/models/tier_minio.go
@@ -0,0 +1,97 @@
+// 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"
+)
+
+// TierMinio tier minio
+//
+// swagger:model tier_minio
+type TierMinio struct {
+
+	// accesskey
+	Accesskey string `json:"accesskey,omitempty"`
+
+	// bucket
+	Bucket string `json:"bucket,omitempty"`
+
+	// endpoint
+	Endpoint string `json:"endpoint,omitempty"`
+
+	// name
+	Name string `json:"name,omitempty"`
+
+	// objects
+	Objects string `json:"objects,omitempty"`
+
+	// prefix
+	Prefix string `json:"prefix,omitempty"`
+
+	// region
+	Region string `json:"region,omitempty"`
+
+	// secretkey
+	Secretkey string `json:"secretkey,omitempty"`
+
+	// storageclass
+	Storageclass string `json:"storageclass,omitempty"`
+
+	// usage
+	Usage string `json:"usage,omitempty"`
+
+	// versions
+	Versions string `json:"versions,omitempty"`
+}
+
+// Validate validates this tier minio
+func (m *TierMinio) Validate(formats strfmt.Registry) error {
+	return nil
+}
+
+// ContextValidate validates this tier minio based on context it is used
+func (m *TierMinio) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	return nil
+}
+
+// MarshalBinary interface implementation
+func (m *TierMinio) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *TierMinio) UnmarshalBinary(b []byte) error {
+	var res TierMinio
+	if err := swag.ReadJSON(b, &res); err != nil {
+		return err
+	}
+	*m = res
+	return nil
+}
--- a/models/tls_configuration.go
+++ b/models/tls_configuration.go
@@ -36,18 +36,25 @@ import (
 // swagger:model tlsConfiguration
 type TLSConfiguration struct {

-	// ca certificates
-	CaCertificates []string `json:"ca_certificates"`
+	// minio c as certificates
+	MinioCAsCertificates []string `json:"minioCAsCertificates"`

-	// minio
-	Minio []*KeyPairConfiguration `json:"minio"`
+	// minio client certificates
+	MinioClientCertificates []*KeyPairConfiguration `json:"minioClientCertificates"`
+
+	// minio server certificates
+	MinioServerCertificates []*KeyPairConfiguration `json:"minioServerCertificates"`
 }

 // Validate validates this tls configuration
 func (m *TLSConfiguration) Validate(formats strfmt.Registry) error {
 	var res []error

-	if err := m.validateMinio(formats); err != nil {
+	if err := m.validateMinioClientCertificates(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateMinioServerCertificates(formats); err != nil {
 		res = append(res, err)
 	}

@@ -57,22 +64,48 @@ func (m *TLSConfiguration) Validate(formats strfmt.Registry) error {
 	return nil
 }

-func (m *TLSConfiguration) validateMinio(formats strfmt.Registry) error {
-	if swag.IsZero(m.Minio) { // not required
+func (m *TLSConfiguration) validateMinioClientCertificates(formats strfmt.Registry) error {
+	if swag.IsZero(m.MinioClientCertificates) { // not required
 		return nil
 	}

-	for i := 0; i < len(m.Minio); i++ {
-		if swag.IsZero(m.Minio[i]) { // not required
+	for i := 0; i < len(m.MinioClientCertificates); i++ {
+		if swag.IsZero(m.MinioClientCertificates[i]) { // not required
 			continue
 		}

-		if m.Minio[i] != nil {
-			if err := m.Minio[i].Validate(formats); err != nil {
+		if m.MinioClientCertificates[i] != nil {
+			if err := m.MinioClientCertificates[i].Validate(formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("minio" + "." + strconv.Itoa(i))
+					return ve.ValidateName("minioClientCertificates" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("minio" + "." + strconv.Itoa(i))
+					return ce.ValidateName("minioClientCertificates" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+func (m *TLSConfiguration) validateMinioServerCertificates(formats strfmt.Registry) error {
+	if swag.IsZero(m.MinioServerCertificates) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.MinioServerCertificates); i++ {
+		if swag.IsZero(m.MinioServerCertificates[i]) { // not required
+			continue
+		}
+
+		if m.MinioServerCertificates[i] != nil {
+			if err := m.MinioServerCertificates[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("minioServerCertificates" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("minioServerCertificates" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -87,7 +120,11 @@ func (m *TLSConfiguration) validateMinio(formats strfmt.Registry) error {
 func (m *TLSConfiguration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

-	if err := m.contextValidateMinio(ctx, formats); err != nil {
+	if err := m.contextValidateMinioClientCertificates(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateMinioServerCertificates(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -97,16 +134,36 @@ func (m *TLSConfiguration) ContextValidate(ctx context.Context, formats strfmt.R
 	return nil
 }

-func (m *TLSConfiguration) contextValidateMinio(ctx context.Context, formats strfmt.Registry) error {
+func (m *TLSConfiguration) contextValidateMinioClientCertificates(ctx context.Context, formats strfmt.Registry) error {

-	for i := 0; i < len(m.Minio); i++ {
+	for i := 0; i < len(m.MinioClientCertificates); i++ {

-		if m.Minio[i] != nil {
-			if err := m.Minio[i].ContextValidate(ctx, formats); err != nil {
+		if m.MinioClientCertificates[i] != nil {
+			if err := m.MinioClientCertificates[i].ContextValidate(ctx, formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("minio" + "." + strconv.Itoa(i))
+					return ve.ValidateName("minioClientCertificates" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("minio" + "." + strconv.Itoa(i))
+					return ce.ValidateName("minioClientCertificates" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+func (m *TLSConfiguration) contextValidateMinioServerCertificates(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.MinioServerCertificates); i++ {
+
+		if m.MinioServerCertificates[i] != nil {
+			if err := m.MinioServerCertificates[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("minioServerCertificates" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("minioServerCertificates" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
--- a/models/update_tenant_configuration_request.go
+++ b/models/update_tenant_configuration_request.go
@@ -0,0 +1,136 @@
+// 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"
+)
+
+// UpdateTenantConfigurationRequest update tenant configuration request
+//
+// swagger:model updateTenantConfigurationRequest
+type UpdateTenantConfigurationRequest struct {
+
+	// environment variables
+	EnvironmentVariables []*EnvironmentVariable `json:"environmentVariables"`
+
+	// keys to be deleted
+	KeysToBeDeleted []string `json:"keysToBeDeleted"`
+}
+
+// Validate validates this update tenant configuration request
+func (m *UpdateTenantConfigurationRequest) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateEnvironmentVariables(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *UpdateTenantConfigurationRequest) 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
+}
+
+// ContextValidate validate this update tenant configuration request based on the context it is used
+func (m *UpdateTenantConfigurationRequest) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateEnvironmentVariables(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *UpdateTenantConfigurationRequest) 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
+}
+
+// MarshalBinary interface implementation
+func (m *UpdateTenantConfigurationRequest) MarshalBinary() ([]byte, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return swag.WriteJSON(m)
+}
+
+// UnmarshalBinary interface implementation
+func (m *UpdateTenantConfigurationRequest) UnmarshalBinary(b []byte) error {
+	var res UpdateTenantConfigurationRequest
+	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
@@ -175,11 +175,14 @@ func (m *UpdateTenantSecurityRequest) UnmarshalBinary(b []byte) error {
 // swagger:model UpdateTenantSecurityRequestCustomCertificates
 type UpdateTenantSecurityRequestCustomCertificates struct {

-	// minio
-	Minio []*KeyPairConfiguration `json:"minio"`
+	// minio c as certificates
+	MinioCAsCertificates []string `json:"minioCAsCertificates"`

-	// minio c as
-	MinioCAs []string `json:"minioCAs"`
+	// minio client certificates
+	MinioClientCertificates []*KeyPairConfiguration `json:"minioClientCertificates"`
+
+	// minio server certificates
+	MinioServerCertificates []*KeyPairConfiguration `json:"minioServerCertificates"`

 	// secrets to be deleted
 	SecretsToBeDeleted []string `json:"secretsToBeDeleted"`
@@ -189,7 +192,11 @@ type UpdateTenantSecurityRequestCustomCertificates struct {
 func (m *UpdateTenantSecurityRequestCustomCertificates) Validate(formats strfmt.Registry) error {
 	var res []error

-	if err := m.validateMinio(formats); err != nil {
+	if err := m.validateMinioClientCertificates(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.validateMinioServerCertificates(formats); err != nil {
 		res = append(res, err)
 	}

@@ -199,22 +206,48 @@ func (m *UpdateTenantSecurityRequestCustomCertificates) Validate(formats strfmt.
 	return nil
 }

-func (m *UpdateTenantSecurityRequestCustomCertificates) validateMinio(formats strfmt.Registry) error {
-	if swag.IsZero(m.Minio) { // not required
+func (m *UpdateTenantSecurityRequestCustomCertificates) validateMinioClientCertificates(formats strfmt.Registry) error {
+	if swag.IsZero(m.MinioClientCertificates) { // not required
 		return nil
 	}

-	for i := 0; i < len(m.Minio); i++ {
-		if swag.IsZero(m.Minio[i]) { // not required
+	for i := 0; i < len(m.MinioClientCertificates); i++ {
+		if swag.IsZero(m.MinioClientCertificates[i]) { // not required
 			continue
 		}

-		if m.Minio[i] != nil {
-			if err := m.Minio[i].Validate(formats); err != nil {
+		if m.MinioClientCertificates[i] != nil {
+			if err := m.MinioClientCertificates[i].Validate(formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("customCertificates" + "." + "minio" + "." + strconv.Itoa(i))
+					return ve.ValidateName("customCertificates" + "." + "minioClientCertificates" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("customCertificates" + "." + "minio" + "." + strconv.Itoa(i))
+					return ce.ValidateName("customCertificates" + "." + "minioClientCertificates" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+func (m *UpdateTenantSecurityRequestCustomCertificates) validateMinioServerCertificates(formats strfmt.Registry) error {
+	if swag.IsZero(m.MinioServerCertificates) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.MinioServerCertificates); i++ {
+		if swag.IsZero(m.MinioServerCertificates[i]) { // not required
+			continue
+		}
+
+		if m.MinioServerCertificates[i] != nil {
+			if err := m.MinioServerCertificates[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("customCertificates" + "." + "minioServerCertificates" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("customCertificates" + "." + "minioServerCertificates" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
@@ -229,7 +262,11 @@ func (m *UpdateTenantSecurityRequestCustomCertificates) validateMinio(formats st
 func (m *UpdateTenantSecurityRequestCustomCertificates) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error

-	if err := m.contextValidateMinio(ctx, formats); err != nil {
+	if err := m.contextValidateMinioClientCertificates(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if err := m.contextValidateMinioServerCertificates(ctx, formats); err != nil {
 		res = append(res, err)
 	}

@@ -239,16 +276,36 @@ func (m *UpdateTenantSecurityRequestCustomCertificates) ContextValidate(ctx cont
 	return nil
 }

-func (m *UpdateTenantSecurityRequestCustomCertificates) contextValidateMinio(ctx context.Context, formats strfmt.Registry) error {
+func (m *UpdateTenantSecurityRequestCustomCertificates) contextValidateMinioClientCertificates(ctx context.Context, formats strfmt.Registry) error {

-	for i := 0; i < len(m.Minio); i++ {
+	for i := 0; i < len(m.MinioClientCertificates); i++ {

-		if m.Minio[i] != nil {
-			if err := m.Minio[i].ContextValidate(ctx, formats); err != nil {
+		if m.MinioClientCertificates[i] != nil {
+			if err := m.MinioClientCertificates[i].ContextValidate(ctx, formats); err != nil {
 				if ve, ok := err.(*errors.Validation); ok {
-					return ve.ValidateName("customCertificates" + "." + "minio" + "." + strconv.Itoa(i))
+					return ve.ValidateName("customCertificates" + "." + "minioClientCertificates" + "." + strconv.Itoa(i))
 				} else if ce, ok := err.(*errors.CompositeError); ok {
-					return ce.ValidateName("customCertificates" + "." + "minio" + "." + strconv.Itoa(i))
+					return ce.ValidateName("customCertificates" + "." + "minioClientCertificates" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+func (m *UpdateTenantSecurityRequestCustomCertificates) contextValidateMinioServerCertificates(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.MinioServerCertificates); i++ {
+
+		if m.MinioServerCertificates[i] != nil {
+			if err := m.MinioServerCertificates[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("customCertificates" + "." + "minioServerCertificates" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("customCertificates" + "." + "minioServerCertificates" + "." + strconv.Itoa(i))
 				}
 				return err
 			}
--- a/models/vault_configuration.go
+++ b/models/vault_configuration.go
@@ -55,9 +55,6 @@ type VaultConfiguration struct {

 	// status
 	Status *VaultConfigurationStatus `json:"status,omitempty"`
-
-	// tls
-	TLS *VaultConfigurationTLS `json:"tls,omitempty"`
 }

 // Validate validates this vault configuration
@@ -76,10 +73,6 @@ func (m *VaultConfiguration) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateTLS(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -134,25 +127,6 @@ func (m *VaultConfiguration) validateStatus(formats strfmt.Registry) error {
 	return nil
 }

-func (m *VaultConfiguration) validateTLS(formats strfmt.Registry) error {
-	if swag.IsZero(m.TLS) { // not required
-		return nil
-	}
-
-	if m.TLS != nil {
-		if err := m.TLS.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("tls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("tls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ContextValidate validate this vault configuration based on the context it is used
 func (m *VaultConfiguration) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -165,10 +139,6 @@ func (m *VaultConfiguration) ContextValidate(ctx context.Context, formats strfmt
 		res = append(res, err)
 	}

-	if err := m.contextValidateTLS(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -207,22 +177,6 @@ func (m *VaultConfiguration) contextValidateStatus(ctx context.Context, formats
 	return nil
 }

-func (m *VaultConfiguration) contextValidateTLS(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.TLS != nil {
-		if err := m.TLS.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("tls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("tls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *VaultConfiguration) MarshalBinary() ([]byte, error) {
 	if m == nil {
@@ -356,46 +310,3 @@ func (m *VaultConfigurationStatus) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
-
-// VaultConfigurationTLS vault configuration TLS
-//
-// swagger:model VaultConfigurationTLS
-type VaultConfigurationTLS struct {
-
-	// ca
-	Ca string `json:"ca,omitempty"`
-
-	// crt
-	Crt string `json:"crt,omitempty"`
-
-	// key
-	Key string `json:"key,omitempty"`
-}
-
-// Validate validates this vault configuration TLS
-func (m *VaultConfigurationTLS) Validate(formats strfmt.Registry) error {
-	return nil
-}
-
-// ContextValidate validates this vault configuration TLS based on context it is used
-func (m *VaultConfigurationTLS) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *VaultConfigurationTLS) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *VaultConfigurationTLS) UnmarshalBinary(b []byte) error {
-	var res VaultConfigurationTLS
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/models/vault_configuration_response.go
+++ b/models/vault_configuration_response.go
@@ -55,9 +55,6 @@ type VaultConfigurationResponse struct {

 	// status
 	Status *VaultConfigurationResponseStatus `json:"status,omitempty"`
-
-	// tls
-	TLS *VaultConfigurationResponseTLS `json:"tls,omitempty"`
 }

 // Validate validates this vault configuration response
@@ -76,10 +73,6 @@ func (m *VaultConfigurationResponse) Validate(formats strfmt.Registry) error {
 		res = append(res, err)
 	}

-	if err := m.validateTLS(formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -134,25 +127,6 @@ func (m *VaultConfigurationResponse) validateStatus(formats strfmt.Registry) err
 	return nil
 }

-func (m *VaultConfigurationResponse) validateTLS(formats strfmt.Registry) error {
-	if swag.IsZero(m.TLS) { // not required
-		return nil
-	}
-
-	if m.TLS != nil {
-		if err := m.TLS.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("tls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("tls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // ContextValidate validate this vault configuration response based on the context it is used
 func (m *VaultConfigurationResponse) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
 	var res []error
@@ -165,10 +139,6 @@ func (m *VaultConfigurationResponse) ContextValidate(ctx context.Context, format
 		res = append(res, err)
 	}

-	if err := m.contextValidateTLS(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
 	if len(res) > 0 {
 		return errors.CompositeValidationError(res...)
 	}
@@ -207,22 +177,6 @@ func (m *VaultConfigurationResponse) contextValidateStatus(ctx context.Context,
 	return nil
 }

-func (m *VaultConfigurationResponse) contextValidateTLS(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.TLS != nil {
-		if err := m.TLS.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("tls")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("tls")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
 // MarshalBinary interface implementation
 func (m *VaultConfigurationResponse) MarshalBinary() ([]byte, error) {
 	if m == nil {
@@ -356,139 +310,3 @@ func (m *VaultConfigurationResponseStatus) UnmarshalBinary(b []byte) error {
 	*m = res
 	return nil
 }
-
-// VaultConfigurationResponseTLS vault configuration response TLS
-//
-// swagger:model VaultConfigurationResponseTLS
-type VaultConfigurationResponseTLS struct {
-
-	// ca
-	Ca *CertificateInfo `json:"ca,omitempty"`
-
-	// crt
-	Crt *CertificateInfo `json:"crt,omitempty"`
-}
-
-// Validate validates this vault configuration response TLS
-func (m *VaultConfigurationResponseTLS) Validate(formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.validateCa(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.validateCrt(formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *VaultConfigurationResponseTLS) validateCa(formats strfmt.Registry) error {
-	if swag.IsZero(m.Ca) { // not required
-		return nil
-	}
-
-	if m.Ca != nil {
-		if err := m.Ca.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("tls" + "." + "ca")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("tls" + "." + "ca")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *VaultConfigurationResponseTLS) validateCrt(formats strfmt.Registry) error {
-	if swag.IsZero(m.Crt) { // not required
-		return nil
-	}
-
-	if m.Crt != nil {
-		if err := m.Crt.Validate(formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("tls" + "." + "crt")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("tls" + "." + "crt")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// ContextValidate validate this vault configuration response TLS based on the context it is used
-func (m *VaultConfigurationResponseTLS) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
-	var res []error
-
-	if err := m.contextValidateCa(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if err := m.contextValidateCrt(ctx, formats); err != nil {
-		res = append(res, err)
-	}
-
-	if len(res) > 0 {
-		return errors.CompositeValidationError(res...)
-	}
-	return nil
-}
-
-func (m *VaultConfigurationResponseTLS) contextValidateCa(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Ca != nil {
-		if err := m.Ca.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("tls" + "." + "ca")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("tls" + "." + "ca")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (m *VaultConfigurationResponseTLS) contextValidateCrt(ctx context.Context, formats strfmt.Registry) error {
-
-	if m.Crt != nil {
-		if err := m.Crt.ContextValidate(ctx, formats); err != nil {
-			if ve, ok := err.(*errors.Validation); ok {
-				return ve.ValidateName("tls" + "." + "crt")
-			} else if ce, ok := err.(*errors.CompositeError); ok {
-				return ce.ValidateName("tls" + "." + "crt")
-			}
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalBinary interface implementation
-func (m *VaultConfigurationResponseTLS) MarshalBinary() ([]byte, error) {
-	if m == nil {
-		return nil, nil
-	}
-	return swag.WriteJSON(m)
-}
-
-// UnmarshalBinary interface implementation
-func (m *VaultConfigurationResponseTLS) UnmarshalBinary(b []byte) error {
-	var res VaultConfigurationResponseTLS
-	if err := swag.ReadJSON(b, &res); err != nil {
-		return err
-	}
-	*m = res
-	return nil
-}
--- a/operatorapi/doc.go
+++ b/operatorapi/doc.go
@@ -18,18 +18,18 @@

 // Package operatorapi MinIO Console Server
 //
-//  Schemes:
-//    http
-//    ws
-//  Host: localhost
-//  BasePath: /api/v1
-//  Version: 0.1.0
+//	Schemes:
+//	  http
+//	  ws
+//	Host: localhost
+//	BasePath: /api/v1
+//	Version: 0.1.0
 //
-//  Consumes:
-//    - application/json
+//	Consumes:
+//	  - application/json
 //
-//  Produces:
-//    - application/json
+//	Produces:
+//	  - application/json
 //
 // swagger:meta
 package operatorapi
--- a/operatorapi/embedded_spec.go
+++ b/operatorapi/embedded_spec.go
@@ -742,6 +742,83 @@ func init() {
        }
      }
    },
+    "/namespaces/{namespace}/tenants/{tenant}/configuration": {
+      "get": {
+        "tags": [
+          "OperatorAPI"
+        ],
+        "summary": "Tenant Configuration",
+        "operationId": "TenantConfiguration",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "namespace",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "tenant",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/tenantConfigurationResponse"
+            }
+          },
+          "default": {
+            "description": "Generic error response.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "OperatorAPI"
+        ],
+        "summary": "Update Tenant Configuration",
+        "operationId": "UpdateTenantConfiguration",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "namespace",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "tenant",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/updateTenantConfigurationRequest"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "A successful response."
+          },
+          "default": {
+            "description": "Generic error response.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        }
+      }
+    },
    "/namespaces/{namespace}/tenants/{tenant}/csr": {
      "get": {
        "tags": [
@@ -2620,6 +2697,12 @@ func init() {
          "type": "object",
          "$ref": "#/definitions/encryptionConfiguration"
        },
+        "environmentVariables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/environmentVariable"
+          }
+        },
        "erasureCodingParity": {
          "type": "integer"
        },
@@ -2651,7 +2734,7 @@ func init() {
        "logSearchConfiguration": {
          "$ref": "#/definitions/logSearchConfiguration"
        },
-        "mounth_path": {
+        "mount_path": {
          "type": "string"
        },
        "name": {
@@ -2962,10 +3045,6 @@ func init() {
              "type": "object",
              "$ref": "#/definitions/azureConfiguration"
            },
-            "client": {
-              "type": "object",
-              "$ref": "#/definitions/keyPairConfiguration"
-            },
            "gcp": {
              "type": "object",
              "$ref": "#/definitions/gcpConfiguration"
@@ -2977,6 +3056,27 @@ func init() {
            "image": {
              "type": "string"
            },
+            "kms_mtls": {
+              "type": "object",
+              "properties": {
+                "ca": {
+                  "type": "string"
+                },
+                "crt": {
+                  "type": "string"
+                },
+                "key": {
+                  "type": "string"
+                }
+              }
+            },
+            "minio_mtls": {
+              "type": "object",
+              "$ref": "#/definitions/keyPairConfiguration"
+            },
+            "raw": {
+              "type": "string"
+            },
            "replicas": {
              "type": "string"
            },
@@ -2990,7 +3090,7 @@ func init() {
              "type": "object",
              "$ref": "#/definitions/securityContext"
            },
-            "server": {
+            "server_tls": {
              "type": "object",
              "$ref": "#/definitions/keyPairConfiguration"
            },
@@ -3029,10 +3129,26 @@ func init() {
            "image": {
              "type": "string"
            },
-            "mtls_client": {
+            "kms_mtls": {
+              "type": "object",
+              "properties": {
+                "ca": {
+                  "type": "object",
+                  "$ref": "#/definitions/certificateInfo"
+                },
+                "crt": {
+                  "type": "object",
+                  "$ref": "#/definitions/certificateInfo"
+                }
+              }
+            },
+            "minio_mtls": {
              "type": "object",
              "$ref": "#/definitions/certificateInfo"
            },
+            "raw": {
+              "type": "string"
+            },
            "replicas": {
              "type": "string"
            },
@@ -3040,7 +3156,7 @@ func init() {
              "type": "object",
              "$ref": "#/definitions/securityContext"
            },
-            "server": {
+            "server_tls": {
              "type": "object",
              "$ref": "#/definitions/certificateInfo"
            },
@@ -3215,17 +3331,6 @@ func init() {
            },
            "endpoint": {
              "type": "string"
-            },
-            "tls": {
-              "type": "object",
-              "required": [
-                "ca"
-              ],
-              "properties": {
-                "ca": {
-                  "type": "string"
-                }
-              }
            }
          }
        }
@@ -3265,18 +3370,6 @@ func init() {
            },
            "endpoint": {
              "type": "string"
-            },
-            "tls": {
-              "type": "object",
-              "required": [
-                "ca"
-              ],
-              "properties": {
-                "ca": {
-                  "type": "object",
-                  "$ref": "#/definitions/certificateInfo"
-                }
-              }
            }
          }
        }
@@ -3542,8 +3635,11 @@ func init() {
            "redirect-service-account"
          ]
        },
-        "redirect": {
-          "type": "string"
+        "redirectRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/redirectRule"
+          }
        }
      }
    },
@@ -4294,6 +4390,17 @@ func init() {
        }
      }
    },
+    "redirectRule": {
+      "type": "object",
+      "properties": {
+        "displayName": {
+          "type": "string"
+        },
+        "redirect": {
+          "type": "string"
+        }
+      }
+    },
    "resourceQuota": {
      "type": "object",
      "properties": {
@@ -4499,6 +4606,17 @@ func init() {
        }
      }
    },
+    "tenantConfigurationResponse": {
+      "type": "object",
+      "properties": {
+        "environmentVariables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/environmentVariable"
+          }
+        }
+      }
+    },
    "tenantList": {
      "type": "object",
      "properties": {
@@ -4748,6 +4866,12 @@ func init() {
        "customCertificates": {
          "type": "object",
          "properties": {
+            "client": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/certificateInfo"
+              }
+            },
            "minio": {
              "type": "array",
              "items": {
@@ -4852,13 +4976,19 @@ func init() {
    "tlsConfiguration": {
      "type": "object",
      "properties": {
-        "ca_certificates": {
+        "minioCAsCertificates": {
          "type": "array",
          "items": {
            "type": "string"
          }
        },
-        "minio": {
+        "minioClientCertificates": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/keyPairConfiguration"
+          }
+        },
+        "minioServerCertificates": {
          "type": "array",
          "items": {
            "$ref": "#/definitions/keyPairConfiguration"
@@ -4894,6 +5024,23 @@ func init() {
        }
      }
    },
+    "updateTenantConfigurationRequest": {
+      "type": "object",
+      "properties": {
+        "environmentVariables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/environmentVariable"
+          }
+        },
+        "keysToBeDeleted": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
    "updateTenantRequest": {
      "type": "object",
      "properties": {
@@ -4921,16 +5068,22 @@ func init() {
        "customCertificates": {
          "type": "object",
          "properties": {
-            "minio": {
+            "minioCAsCertificates": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "minioClientCertificates": {
              "type": "array",
              "items": {
                "$ref": "#/definitions/keyPairConfiguration"
              }
            },
-            "minioCAs": {
+            "minioServerCertificates": {
              "type": "array",
              "items": {
-                "type": "string"
+                "$ref": "#/definitions/keyPairConfiguration"
              }
            },
            "secretsToBeDeleted": {
@@ -4996,20 +5149,6 @@ func init() {
              "format": "int64"
            }
          }
-        },
-        "tls": {
-          "type": "object",
-          "properties": {
-            "ca": {
-              "type": "string"
-            },
-            "crt": {
-              "type": "string"
-            },
-            "key": {
-              "type": "string"
-            }
-          }
        }
      }
    },
@@ -5062,19 +5201,6 @@ func init() {
              "format": "int64"
            }
          }
-        },
-        "tls": {
-          "type": "object",
-          "properties": {
-            "ca": {
-              "type": "object",
-              "$ref": "#/definitions/certificateInfo"
-            },
-            "crt": {
-              "type": "object",
-              "$ref": "#/definitions/certificateInfo"
-            }
-          }
        }
      }
    },
@@ -5815,6 +5941,83 @@ func init() {
        }
      }
    },
+    "/namespaces/{namespace}/tenants/{tenant}/configuration": {
+      "get": {
+        "tags": [
+          "OperatorAPI"
+        ],
+        "summary": "Tenant Configuration",
+        "operationId": "TenantConfiguration",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "namespace",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "tenant",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "A successful response.",
+            "schema": {
+              "$ref": "#/definitions/tenantConfigurationResponse"
+            }
+          },
+          "default": {
+            "description": "Generic error response.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "OperatorAPI"
+        ],
+        "summary": "Update Tenant Configuration",
+        "operationId": "UpdateTenantConfiguration",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "namespace",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "tenant",
+            "in": "path",
+            "required": true
+          },
+          {
+            "name": "body",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/updateTenantConfigurationRequest"
+            }
+          }
+        ],
+        "responses": {
+          "204": {
+            "description": "A successful response."
+          },
+          "default": {
+            "description": "Generic error response.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        }
+      }
+    },
    "/namespaces/{namespace}/tenants/{tenant}/csr": {
      "get": {
        "tags": [
@@ -7527,6 +7730,33 @@ func init() {
        }
      }
    },
+    "EncryptionConfigurationAO1KmsMtls": {
+      "type": "object",
+      "properties": {
+        "ca": {
+          "type": "string"
+        },
+        "crt": {
+          "type": "string"
+        },
+        "key": {
+          "type": "string"
+        }
+      }
+    },
+    "EncryptionConfigurationResponseAO1KmsMtls": {
+      "type": "object",
+      "properties": {
+        "ca": {
+          "type": "object",
+          "$ref": "#/definitions/certificateInfo"
+        },
+        "crt": {
+          "type": "object",
+          "$ref": "#/definitions/certificateInfo"
+        }
+      }
+    },
    "GcpConfigurationSecretmanager": {
      "type": "object",
      "required": [
@@ -7603,17 +7833,6 @@ func init() {
        },
        "endpoint": {
          "type": "string"
-        },
-        "tls": {
-          "type": "object",
-          "required": [
-            "ca"
-          ],
-          "properties": {
-            "ca": {
-              "type": "string"
-            }
-          }
        }
      }
    },
@@ -7636,17 +7855,6 @@ func init() {
        }
      }
    },
-    "GemaltoConfigurationKeysecureTLS": {
-      "type": "object",
-      "required": [
-        "ca"
-      ],
-      "properties": {
-        "ca": {
-          "type": "string"
-        }
-      }
-    },
    "GemaltoConfigurationResponseKeysecure": {
      "type": "object",
      "required": [
@@ -7675,18 +7883,6 @@ func init() {
        },
        "endpoint": {
          "type": "string"
-        },
-        "tls": {
-          "type": "object",
-          "required": [
-            "ca"
-          ],
-          "properties": {
-            "ca": {
-              "type": "object",
-              "$ref": "#/definitions/certificateInfo"
-            }
-          }
        }
      }
    },
@@ -7709,18 +7905,6 @@ func init() {
        }
      }
    },
-    "GemaltoConfigurationResponseKeysecureTLS": {
-      "type": "object",
-      "required": [
-        "ca"
-      ],
-      "properties": {
-        "ca": {
-          "type": "object",
-          "$ref": "#/definitions/certificateInfo"
-        }
-      }
-    },
    "IdpConfigurationActiveDirectory": {
      "type": "object",
      "required": [
@@ -8119,6 +8303,12 @@ func init() {
    "TenantSecurityResponseCustomCertificates": {
      "type": "object",
      "properties": {
+        "client": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/certificateInfo"
+          }
+        },
        "minio": {
          "type": "array",
          "items": {
@@ -8157,16 +8347,22 @@ func init() {
    "UpdateTenantSecurityRequestCustomCertificates": {
      "type": "object",
      "properties": {
-        "minio": {
+        "minioCAsCertificates": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "minioClientCertificates": {
          "type": "array",
          "items": {
            "$ref": "#/definitions/keyPairConfiguration"
          }
        },
-        "minioCAs": {
+        "minioServerCertificates": {
          "type": "array",
          "items": {
-            "type": "string"
+            "$ref": "#/definitions/keyPairConfiguration"
          }
        },
        "secretsToBeDeleted": {
@@ -8230,19 +8426,6 @@ func init() {
        }
      }
    },
-    "VaultConfigurationResponseTLS": {
-      "type": "object",
-      "properties": {
-        "ca": {
-          "type": "object",
-          "$ref": "#/definitions/certificateInfo"
-        },
-        "crt": {
-          "type": "object",
-          "$ref": "#/definitions/certificateInfo"
-        }
-      }
-    },
    "VaultConfigurationStatus": {
      "type": "object",
      "properties": {
@@ -8252,20 +8435,6 @@ func init() {
        }
      }
    },
-    "VaultConfigurationTLS": {
-      "type": "object",
-      "properties": {
-        "ca": {
-          "type": "string"
-        },
-        "crt": {
-          "type": "string"
-        },
-        "key": {
-          "type": "string"
-        }
-      }
-    },
    "allocatableResourcesResponse": {
      "type": "object",
      "properties": {
@@ -8536,6 +8705,12 @@ func init() {
          "type": "object",
          "$ref": "#/definitions/encryptionConfiguration"
        },
+        "environmentVariables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/environmentVariable"
+          }
+        },
        "erasureCodingParity": {
          "type": "integer"
        },
@@ -8567,7 +8742,7 @@ func init() {
        "logSearchConfiguration": {
          "$ref": "#/definitions/logSearchConfiguration"
        },
-        "mounth_path": {
+        "mount_path": {
          "type": "string"
        },
        "name": {
@@ -8878,10 +9053,6 @@ func init() {
              "type": "object",
              "$ref": "#/definitions/azureConfiguration"
            },
-            "client": {
-              "type": "object",
-              "$ref": "#/definitions/keyPairConfiguration"
-            },
            "gcp": {
              "type": "object",
              "$ref": "#/definitions/gcpConfiguration"
@@ -8893,6 +9064,27 @@ func init() {
            "image": {
              "type": "string"
            },
+            "kms_mtls": {
+              "type": "object",
+              "properties": {
+                "ca": {
+                  "type": "string"
+                },
+                "crt": {
+                  "type": "string"
+                },
+                "key": {
+                  "type": "string"
+                }
+              }
+            },
+            "minio_mtls": {
+              "type": "object",
+              "$ref": "#/definitions/keyPairConfiguration"
+            },
+            "raw": {
+              "type": "string"
+            },
            "replicas": {
              "type": "string"
            },
@@ -8906,7 +9098,7 @@ func init() {
              "type": "object",
              "$ref": "#/definitions/securityContext"
            },
-            "server": {
+            "server_tls": {
              "type": "object",
              "$ref": "#/definitions/keyPairConfiguration"
            },
@@ -8945,10 +9137,26 @@ func init() {
            "image": {
              "type": "string"
            },
-            "mtls_client": {
+            "kms_mtls": {
+              "type": "object",
+              "properties": {
+                "ca": {
+                  "type": "object",
+                  "$ref": "#/definitions/certificateInfo"
+                },
+                "crt": {
+                  "type": "object",
+                  "$ref": "#/definitions/certificateInfo"
+                }
+              }
+            },
+            "minio_mtls": {
              "type": "object",
              "$ref": "#/definitions/certificateInfo"
            },
+            "raw": {
+              "type": "string"
+            },
            "replicas": {
              "type": "string"
            },
@@ -8956,7 +9164,7 @@ func init() {
              "type": "object",
              "$ref": "#/definitions/securityContext"
            },
-            "server": {
+            "server_tls": {
              "type": "object",
              "$ref": "#/definitions/certificateInfo"
            },
@@ -9131,17 +9339,6 @@ func init() {
            },
            "endpoint": {
              "type": "string"
-            },
-            "tls": {
-              "type": "object",
-              "required": [
-                "ca"
-              ],
-              "properties": {
-                "ca": {
-                  "type": "string"
-                }
-              }
            }
          }
        }
@@ -9181,18 +9378,6 @@ func init() {
            },
            "endpoint": {
              "type": "string"
-            },
-            "tls": {
-              "type": "object",
-              "required": [
-                "ca"
-              ],
-              "properties": {
-                "ca": {
-                  "type": "object",
-                  "$ref": "#/definitions/certificateInfo"
-                }
-              }
            }
          }
        }
@@ -9446,8 +9631,11 @@ func init() {
            "redirect-service-account"
          ]
        },
-        "redirect": {
-          "type": "string"
+        "redirectRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/redirectRule"
+          }
        }
      }
    },
@@ -10063,6 +10251,17 @@ func init() {
        }
      }
    },
+    "redirectRule": {
+      "type": "object",
+      "properties": {
+        "displayName": {
+          "type": "string"
+        },
+        "redirect": {
+          "type": "string"
+        }
+      }
+    },
    "resourceQuota": {
      "type": "object",
      "properties": {
@@ -10268,6 +10467,17 @@ func init() {
        }
      }
    },
+    "tenantConfigurationResponse": {
+      "type": "object",
+      "properties": {
+        "environmentVariables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/environmentVariable"
+          }
+        }
+      }
+    },
    "tenantList": {
      "type": "object",
      "properties": {
@@ -10517,6 +10727,12 @@ func init() {
        "customCertificates": {
          "type": "object",
          "properties": {
+            "client": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/certificateInfo"
+              }
+            },
            "minio": {
              "type": "array",
              "items": {
@@ -10621,13 +10837,19 @@ func init() {
    "tlsConfiguration": {
      "type": "object",
      "properties": {
-        "ca_certificates": {
+        "minioCAsCertificates": {
          "type": "array",
          "items": {
            "type": "string"
          }
        },
-        "minio": {
+        "minioClientCertificates": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/keyPairConfiguration"
+          }
+        },
+        "minioServerCertificates": {
          "type": "array",
          "items": {
            "$ref": "#/definitions/keyPairConfiguration"
@@ -10663,6 +10885,23 @@ func init() {
        }
      }
    },
+    "updateTenantConfigurationRequest": {
+      "type": "object",
+      "properties": {
+        "environmentVariables": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/environmentVariable"
+          }
+        },
+        "keysToBeDeleted": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
    "updateTenantRequest": {
      "type": "object",
      "properties": {
@@ -10690,16 +10929,22 @@ func init() {
        "customCertificates": {
          "type": "object",
          "properties": {
-            "minio": {
+            "minioCAsCertificates": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "minioClientCertificates": {
              "type": "array",
              "items": {
                "$ref": "#/definitions/keyPairConfiguration"
              }
            },
-            "minioCAs": {
+            "minioServerCertificates": {
              "type": "array",
              "items": {
-                "type": "string"
+                "$ref": "#/definitions/keyPairConfiguration"
              }
            },
            "secretsToBeDeleted": {
@@ -10765,20 +11010,6 @@ func init() {
              "format": "int64"
            }
          }
-        },
-        "tls": {
-          "type": "object",
-          "properties": {
-            "ca": {
-              "type": "string"
-            },
-            "crt": {
-              "type": "string"
-            },
-            "key": {
-              "type": "string"
-            }
-          }
        }
      }
    },
@@ -10831,19 +11062,6 @@ func init() {
              "format": "int64"
            }
          }
-        },
-        "tls": {
-          "type": "object",
-          "properties": {
-            "ca": {
-              "type": "object",
-              "$ref": "#/definitions/certificateInfo"
-            },
-            "crt": {
-              "type": "object",
-              "$ref": "#/definitions/certificateInfo"
-            }
-          }
        }
      }
    },
--- a/operatorapi/login.go
+++ b/operatorapi/login.go
@@ -101,23 +101,33 @@ func getLoginDetailsResponse(params authApi.LoginDetailParams) (*models.LoginDet
 	r := params.HTTPRequest

 	loginStrategy := models.LoginDetailsLoginStrategyServiceDashAccount
-	redirectURL := ""
+
+	var redirectRules []*models.RedirectRule

 	if oauth2.IsIDPEnabled() {
 		loginStrategy = models.LoginDetailsLoginStrategyRedirectDashServiceDashAccount
 		// initialize new oauth2 client
-		oauth2Client, err := oauth2.NewOauth2ProviderClient(nil, r, restapi.GetConsoleHTTPClient())
+		oauth2Client, err := oauth2.NewOauth2ProviderClient(nil, r, restapi.GetConsoleHTTPClient(""))
 		if err != nil {
 			return nil, restapi.ErrorWithContext(ctx, err)
 		}
 		// Validate user against IDP
-		identityProvider := &auth.IdentityProvider{Client: oauth2Client}
-		redirectURL = identityProvider.GenerateLoginURL()
+		identityProvider := &auth.IdentityProvider{
+			KeyFunc: oauth2.DefaultDerivedKey,
+			Client:  oauth2Client,
+		}
+
+		newRedirectRule := &models.RedirectRule{
+			Redirect:    identityProvider.GenerateLoginURL(),
+			DisplayName: "Login with SSO",
+		}
+
+		redirectRules = append(redirectRules, newRedirectRule)
 	}

 	loginDetails := &models.LoginDetails{
 		LoginStrategy: loginStrategy,
-		Redirect:      redirectURL,
+		RedirectRules: redirectRules,
 		IsDirectPV:    getDirectPVEnabled(),
 	}
 	return loginDetails, nil
@@ -141,12 +151,15 @@ func getLoginOauth2AuthResponse(params authApi.LoginOauth2AuthParams) (*models.L

 	if oauth2.IsIDPEnabled() {
 		// initialize new oauth2 client
-		oauth2Client, err := oauth2.NewOauth2ProviderClient(nil, r, restapi.GetConsoleHTTPClient())
+		oauth2Client, err := oauth2.NewOauth2ProviderClient(nil, r, restapi.GetConsoleHTTPClient(""))
 		if err != nil {
 			return nil, restapi.ErrorWithContext(ctx, err)
 		}
 		// initialize new identity provider
-		identityProvider := auth.IdentityProvider{Client: oauth2Client}
+		identityProvider := auth.IdentityProvider{
+			KeyFunc: oauth2.DefaultDerivedKey,
+			Client:  oauth2Client,
+		}
 		// Validate user against IDP
 		_, err = verifyUserAgainstIDP(ctx, identityProvider, *lr.Code, *lr.State)
 		if err != nil {
--- a/operatorapi/operations/auth/login_detail.go
+++ b/operatorapi/operations/auth/login_detail.go
@@ -46,10 +46,10 @@ func NewLoginDetail(ctx *middleware.Context, handler LoginDetailHandler) *LoginD
 	return &LoginDetail{Context: ctx, Handler: handler}
 }

-/* LoginDetail swagger:route GET /login Auth loginDetail
+/*
+	LoginDetail swagger:route GET /login Auth loginDetail

 Returns login strategy, form or sso.
-
 */
 type LoginDetail struct {
 	Context *middleware.Context
--- a/operatorapi/operations/auth/login_detail_responses.go
+++ b/operatorapi/operations/auth/login_detail_responses.go
@@ -33,7 +33,8 @@ import (
 // LoginDetailOKCode is the HTTP code returned for type LoginDetailOK
 const LoginDetailOKCode int = 200

-/*LoginDetailOK A successful response.
+/*
+LoginDetailOK A successful response.

 swagger:response loginDetailOK
 */
@@ -74,7 +75,8 @@ func (o *LoginDetailOK) WriteResponse(rw http.ResponseWriter, producer runtime.P
 	}
 }

-/*LoginDetailDefault Generic error response.
+/*
+LoginDetailDefault Generic error response.

 swagger:response loginDetailDefault
 */
--- a/operatorapi/operations/auth/login_oauth2_auth.go
+++ b/operatorapi/operations/auth/login_oauth2_auth.go
@@ -46,10 +46,10 @@ func NewLoginOauth2Auth(ctx *middleware.Context, handler LoginOauth2AuthHandler)
 	return &LoginOauth2Auth{Context: ctx, Handler: handler}
 }

-/* LoginOauth2Auth swagger:route POST /login/oauth2/auth Auth loginOauth2Auth
+/*
+	LoginOauth2Auth swagger:route POST /login/oauth2/auth Auth loginOauth2Auth

 Identity Provider oauth2 callback endpoint.
-
 */
 type LoginOauth2Auth struct {
 	Context *middleware.Context
--- a/operatorapi/operations/auth/login_oauth2_auth_parameters.go
+++ b/operatorapi/operations/auth/login_oauth2_auth_parameters.go
@@ -23,7 +23,6 @@ package auth
 // Editing this file might prove futile when you re-run the swagger generate command

 import (
-	"context"
 	"io"
 	"net/http"

@@ -83,7 +82,7 @@ func (o *LoginOauth2AuthParams) BindRequest(r *http.Request, route *middleware.M
 				res = append(res, err)
 			}

-			ctx := validate.WithOperationRequest(context.Background())
+			ctx := validate.WithOperationRequest(r.Context())
 			if err := body.ContextValidate(ctx, route.Formats); err != nil {
 				res = append(res, err)
 			}
--- a/operatorapi/operations/auth/login_oauth2_auth_responses.go
+++ b/operatorapi/operations/auth/login_oauth2_auth_responses.go
@@ -33,7 +33,8 @@ import (
 // LoginOauth2AuthNoContentCode is the HTTP code returned for type LoginOauth2AuthNoContent
 const LoginOauth2AuthNoContentCode int = 204

-/*LoginOauth2AuthNoContent A successful login.
+/*
+LoginOauth2AuthNoContent A successful login.

 swagger:response loginOauth2AuthNoContent
 */
@@ -54,7 +55,8 @@ func (o *LoginOauth2AuthNoContent) WriteResponse(rw http.ResponseWriter, produce
 	rw.WriteHeader(204)
 }

-/*LoginOauth2AuthDefault Generic error response.
+/*
+LoginOauth2AuthDefault Generic error response.

 swagger:response loginOauth2AuthDefault
 */
--- a/operatorapi/operations/auth/login_operator.go
+++ b/operatorapi/operations/auth/login_operator.go
@@ -46,10 +46,10 @@ func NewLoginOperator(ctx *middleware.Context, handler LoginOperatorHandler) *Lo
 	return &LoginOperator{Context: ctx, Handler: handler}
 }

-/* LoginOperator swagger:route POST /login/operator Auth loginOperator
+/*
+	LoginOperator swagger:route POST /login/operator Auth loginOperator

 Login to Operator Console.
-
 */
 type LoginOperator struct {
 	Context *middleware.Context
--- a/operatorapi/operations/auth/login_operator_parameters.go
+++ b/operatorapi/operations/auth/login_operator_parameters.go
@@ -23,7 +23,6 @@ package auth
 // Editing this file might prove futile when you re-run the swagger generate command

 import (
-	"context"
 	"io"
 	"net/http"

@@ -83,7 +82,7 @@ func (o *LoginOperatorParams) BindRequest(r *http.Request, route *middleware.Mat
 				res = append(res, err)
 			}

-			ctx := validate.WithOperationRequest(context.Background())
+			ctx := validate.WithOperationRequest(r.Context())
 			if err := body.ContextValidate(ctx, route.Formats); err != nil {
 				res = append(res, err)
 			}
--- a/operatorapi/operations/auth/login_operator_responses.go
+++ b/operatorapi/operations/auth/login_operator_responses.go
@@ -33,7 +33,8 @@ import (
 // LoginOperatorNoContentCode is the HTTP code returned for type LoginOperatorNoContent
 const LoginOperatorNoContentCode int = 204

-/*LoginOperatorNoContent A successful login.
+/*
+LoginOperatorNoContent A successful login.

 swagger:response loginOperatorNoContent
 */
@@ -54,7 +55,8 @@ func (o *LoginOperatorNoContent) WriteResponse(rw http.ResponseWriter, producer
 	rw.WriteHeader(204)
 }

-/*LoginOperatorDefault Generic error response.
+/*
+LoginOperatorDefault Generic error response.

 swagger:response loginOperatorDefault
 */
--- a/operatorapi/operations/auth/logout.go
+++ b/operatorapi/operations/auth/logout.go
@@ -48,10 +48,10 @@ func NewLogout(ctx *middleware.Context, handler LogoutHandler) *Logout {
 	return &Logout{Context: ctx, Handler: handler}
 }

-/* Logout swagger:route POST /logout Auth logout
+/*
+	Logout swagger:route POST /logout Auth logout

 Logout from Operator.
-
 */
 type Logout struct {
 	Context *middleware.Context
--- a/operatorapi/operations/auth/logout_responses.go
+++ b/operatorapi/operations/auth/logout_responses.go
@@ -33,7 +33,8 @@ import (
 // LogoutOKCode is the HTTP code returned for type LogoutOK
 const LogoutOKCode int = 200

-/*LogoutOK A successful response.
+/*
+LogoutOK A successful response.

 swagger:response logoutOK
 */
@@ -54,7 +55,8 @@ func (o *LogoutOK) WriteResponse(rw http.ResponseWriter, producer runtime.Produc
 	rw.WriteHeader(200)
 }

-/*LogoutDefault Generic error response.
+/*
+LogoutDefault Generic error response.

 swagger:response logoutDefault
 */
--- a/operatorapi/operations/auth/session_check.go
+++ b/operatorapi/operations/auth/session_check.go
@@ -48,10 +48,10 @@ func NewSessionCheck(ctx *middleware.Context, handler SessionCheckHandler) *Sess
 	return &SessionCheck{Context: ctx, Handler: handler}
 }

-/* SessionCheck swagger:route GET /session Auth sessionCheck
+/*
+	SessionCheck swagger:route GET /session Auth sessionCheck

 Endpoint to check if your session is still valid
-
 */
 type SessionCheck struct {
 	Context *middleware.Context
--- a/operatorapi/operations/auth/session_check_responses.go
+++ b/operatorapi/operations/auth/session_check_responses.go
@@ -33,7 +33,8 @@ import (
 // SessionCheckOKCode is the HTTP code returned for type SessionCheckOK
 const SessionCheckOKCode int = 200

-/*SessionCheckOK A successful response.
+/*
+SessionCheckOK A successful response.

 swagger:response sessionCheckOK
 */
@@ -74,7 +75,8 @@ func (o *SessionCheckOK) WriteResponse(rw http.ResponseWriter, producer runtime.
 	}
 }

-/*SessionCheckDefault Generic error response.
+/*
+SessionCheckDefault Generic error response.

 swagger:response sessionCheckDefault
 */
--- a/operatorapi/operations/operator_api.go
+++ b/operatorapi/operations/operator_api.go
@@ -223,6 +223,9 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		OperatorAPITenantAddPoolHandler: operator_api.TenantAddPoolHandlerFunc(func(params operator_api.TenantAddPoolParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.TenantAddPool has not yet been implemented")
 		}),
+		OperatorAPITenantConfigurationHandler: operator_api.TenantConfigurationHandlerFunc(func(params operator_api.TenantConfigurationParams, principal *models.Principal) middleware.Responder {
+			return middleware.NotImplemented("operation operator_api.TenantConfiguration has not yet been implemented")
+		}),
 		OperatorAPITenantDeleteEncryptionHandler: operator_api.TenantDeleteEncryptionHandlerFunc(func(params operator_api.TenantDeleteEncryptionParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.TenantDeleteEncryption has not yet been implemented")
 		}),
@@ -250,6 +253,9 @@ func NewOperatorAPI(spec *loads.Document) *OperatorAPI {
 		OperatorAPIUpdateTenantHandler: operator_api.UpdateTenantHandlerFunc(func(params operator_api.UpdateTenantParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.UpdateTenant has not yet been implemented")
 		}),
+		OperatorAPIUpdateTenantConfigurationHandler: operator_api.UpdateTenantConfigurationHandlerFunc(func(params operator_api.UpdateTenantConfigurationParams, principal *models.Principal) middleware.Responder {
+			return middleware.NotImplemented("operation operator_api.UpdateTenantConfiguration has not yet been implemented")
+		}),
 		OperatorAPIUpdateTenantDomainsHandler: operator_api.UpdateTenantDomainsHandlerFunc(func(params operator_api.UpdateTenantDomainsParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation operator_api.UpdateTenantDomains has not yet been implemented")
 		}),
@@ -414,6 +420,8 @@ type OperatorAPI struct {
 	OperatorAPISubscriptionValidateHandler operator_api.SubscriptionValidateHandler
 	// OperatorAPITenantAddPoolHandler sets the operation handler for the tenant add pool operation
 	OperatorAPITenantAddPoolHandler operator_api.TenantAddPoolHandler
+	// OperatorAPITenantConfigurationHandler sets the operation handler for the tenant configuration operation
+	OperatorAPITenantConfigurationHandler operator_api.TenantConfigurationHandler
 	// OperatorAPITenantDeleteEncryptionHandler sets the operation handler for the tenant delete encryption operation
 	OperatorAPITenantDeleteEncryptionHandler operator_api.TenantDeleteEncryptionHandler
 	// OperatorAPITenantDetailsHandler sets the operation handler for the tenant details operation
@@ -432,6 +440,8 @@ type OperatorAPI struct {
 	OperatorAPITenantUpdatePoolsHandler operator_api.TenantUpdatePoolsHandler
 	// OperatorAPIUpdateTenantHandler sets the operation handler for the update tenant operation
 	OperatorAPIUpdateTenantHandler operator_api.UpdateTenantHandler
+	// OperatorAPIUpdateTenantConfigurationHandler sets the operation handler for the update tenant configuration operation
+	OperatorAPIUpdateTenantConfigurationHandler operator_api.UpdateTenantConfigurationHandler
 	// OperatorAPIUpdateTenantDomainsHandler sets the operation handler for the update tenant domains operation
 	OperatorAPIUpdateTenantDomainsHandler operator_api.UpdateTenantDomainsHandler
 	// OperatorAPIUpdateTenantIdentityProviderHandler sets the operation handler for the update tenant identity provider operation
@@ -678,6 +688,9 @@ func (o *OperatorAPI) Validate() error {
 	if o.OperatorAPITenantAddPoolHandler == nil {
 		unregistered = append(unregistered, "operator_api.TenantAddPoolHandler")
 	}
+	if o.OperatorAPITenantConfigurationHandler == nil {
+		unregistered = append(unregistered, "operator_api.TenantConfigurationHandler")
+	}
 	if o.OperatorAPITenantDeleteEncryptionHandler == nil {
 		unregistered = append(unregistered, "operator_api.TenantDeleteEncryptionHandler")
 	}
@@ -705,6 +718,9 @@ func (o *OperatorAPI) Validate() error {
 	if o.OperatorAPIUpdateTenantHandler == nil {
 		unregistered = append(unregistered, "operator_api.UpdateTenantHandler")
 	}
+	if o.OperatorAPIUpdateTenantConfigurationHandler == nil {
+		unregistered = append(unregistered, "operator_api.UpdateTenantConfigurationHandler")
+	}
 	if o.OperatorAPIUpdateTenantDomainsHandler == nil {
 		unregistered = append(unregistered, "operator_api.UpdateTenantDomainsHandler")
 	}
@@ -1024,6 +1040,10 @@ func (o *OperatorAPI) initHandlerCache() {
 		o.handlers["POST"] = make(map[string]http.Handler)
 	}
 	o.handlers["POST"]["/namespaces/{namespace}/tenants/{tenant}/pools"] = operator_api.NewTenantAddPool(o.context, o.OperatorAPITenantAddPoolHandler)
+	if o.handlers["GET"] == nil {
+		o.handlers["GET"] = make(map[string]http.Handler)
+	}
+	o.handlers["GET"]["/namespaces/{namespace}/tenants/{tenant}/configuration"] = operator_api.NewTenantConfiguration(o.context, o.OperatorAPITenantConfigurationHandler)
 	if o.handlers["DELETE"] == nil {
 		o.handlers["DELETE"] = make(map[string]http.Handler)
 	}
@@ -1060,6 +1080,10 @@ func (o *OperatorAPI) initHandlerCache() {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
 	o.handlers["PUT"]["/namespaces/{namespace}/tenants/{tenant}"] = operator_api.NewUpdateTenant(o.context, o.OperatorAPIUpdateTenantHandler)
+	if o.handlers["PATCH"] == nil {
+		o.handlers["PATCH"] = make(map[string]http.Handler)
+	}
+	o.handlers["PATCH"]["/namespaces/{namespace}/tenants/{tenant}/configuration"] = operator_api.NewUpdateTenantConfiguration(o.context, o.OperatorAPIUpdateTenantConfigurationHandler)
 	if o.handlers["PUT"] == nil {
 		o.handlers["PUT"] = make(map[string]http.Handler)
 	}
--- a/operatorapi/operations/operator_api/create_namespace.go
+++ b/operatorapi/operations/operator_api/create_namespace.go
@@ -48,10 +48,10 @@ func NewCreateNamespace(ctx *middleware.Context, handler CreateNamespaceHandler)
 	return &CreateNamespace{Context: ctx, Handler: handler}
 }

-/* CreateNamespace swagger:route POST /namespace OperatorAPI createNamespace
+/*
+	CreateNamespace swagger:route POST /namespace OperatorAPI createNamespace

 Creates a new Namespace with given information
-
 */
 type CreateNamespace struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/create_namespace_parameters.go
+++ b/operatorapi/operations/operator_api/create_namespace_parameters.go
@@ -23,7 +23,6 @@ package operator_api
 // Editing this file might prove futile when you re-run the swagger generate command

 import (
-	"context"
 	"io"
 	"net/http"

@@ -83,7 +82,7 @@ func (o *CreateNamespaceParams) BindRequest(r *http.Request, route *middleware.M
 				res = append(res, err)
 			}

-			ctx := validate.WithOperationRequest(context.Background())
+			ctx := validate.WithOperationRequest(r.Context())
 			if err := body.ContextValidate(ctx, route.Formats); err != nil {
 				res = append(res, err)
 			}
--- a/operatorapi/operations/operator_api/create_namespace_responses.go
+++ b/operatorapi/operations/operator_api/create_namespace_responses.go
@@ -33,7 +33,8 @@ import (
 // CreateNamespaceCreatedCode is the HTTP code returned for type CreateNamespaceCreated
 const CreateNamespaceCreatedCode int = 201

-/*CreateNamespaceCreated A successful response.
+/*
+CreateNamespaceCreated A successful response.

 swagger:response createNamespaceCreated
 */
@@ -54,7 +55,8 @@ func (o *CreateNamespaceCreated) WriteResponse(rw http.ResponseWriter, producer
 	rw.WriteHeader(201)
 }

-/*CreateNamespaceDefault Generic error response.
+/*
+CreateNamespaceDefault Generic error response.

 swagger:response createNamespaceDefault
 */
--- a/operatorapi/operations/operator_api/create_tenant.go
+++ b/operatorapi/operations/operator_api/create_tenant.go
@@ -48,10 +48,10 @@ func NewCreateTenant(ctx *middleware.Context, handler CreateTenantHandler) *Crea
 	return &CreateTenant{Context: ctx, Handler: handler}
 }

-/* CreateTenant swagger:route POST /tenants OperatorAPI createTenant
+/*
+	CreateTenant swagger:route POST /tenants OperatorAPI createTenant

 Create Tenant
-
 */
 type CreateTenant struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/create_tenant_parameters.go
+++ b/operatorapi/operations/operator_api/create_tenant_parameters.go
@@ -23,7 +23,6 @@ package operator_api
 // Editing this file might prove futile when you re-run the swagger generate command

 import (
-	"context"
 	"io"
 	"net/http"

@@ -83,7 +82,7 @@ func (o *CreateTenantParams) BindRequest(r *http.Request, route *middleware.Matc
 				res = append(res, err)
 			}

-			ctx := validate.WithOperationRequest(context.Background())
+			ctx := validate.WithOperationRequest(r.Context())
 			if err := body.ContextValidate(ctx, route.Formats); err != nil {
 				res = append(res, err)
 			}
--- a/operatorapi/operations/operator_api/create_tenant_responses.go
+++ b/operatorapi/operations/operator_api/create_tenant_responses.go
@@ -33,7 +33,8 @@ import (
 // CreateTenantOKCode is the HTTP code returned for type CreateTenantOK
 const CreateTenantOKCode int = 200

-/*CreateTenantOK A successful response.
+/*
+CreateTenantOK A successful response.

 swagger:response createTenantOK
 */
@@ -74,7 +75,8 @@ func (o *CreateTenantOK) WriteResponse(rw http.ResponseWriter, producer runtime.
 	}
 }

-/*CreateTenantDefault Generic error response.
+/*
+CreateTenantDefault Generic error response.

 swagger:response createTenantDefault
 */
--- a/operatorapi/operations/operator_api/delete_p_v_c.go
+++ b/operatorapi/operations/operator_api/delete_p_v_c.go
@@ -48,10 +48,10 @@ func NewDeletePVC(ctx *middleware.Context, handler DeletePVCHandler) *DeletePVC
 	return &DeletePVC{Context: ctx, Handler: handler}
 }

-/* DeletePVC swagger:route DELETE /namespaces/{namespace}/tenants/{tenant}/pvc/{PVCName} OperatorAPI deletePVC
+/*
+	DeletePVC swagger:route DELETE /namespaces/{namespace}/tenants/{tenant}/pvc/{PVCName} OperatorAPI deletePVC

 Delete PVC
-
 */
 type DeletePVC struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/delete_p_v_c_responses.go
+++ b/operatorapi/operations/operator_api/delete_p_v_c_responses.go
@@ -33,7 +33,8 @@ import (
 // DeletePVCNoContentCode is the HTTP code returned for type DeletePVCNoContent
 const DeletePVCNoContentCode int = 204

-/*DeletePVCNoContent A successful response.
+/*
+DeletePVCNoContent A successful response.

 swagger:response deletePVCNoContent
 */
@@ -54,7 +55,8 @@ func (o *DeletePVCNoContent) WriteResponse(rw http.ResponseWriter, producer runt
 	rw.WriteHeader(204)
 }

-/*DeletePVCDefault Generic error response.
+/*
+DeletePVCDefault Generic error response.

 swagger:response deletePVCDefault
 */
--- a/operatorapi/operations/operator_api/delete_pod.go
+++ b/operatorapi/operations/operator_api/delete_pod.go
@@ -48,10 +48,10 @@ func NewDeletePod(ctx *middleware.Context, handler DeletePodHandler) *DeletePod
 	return &DeletePod{Context: ctx, Handler: handler}
 }

-/* DeletePod swagger:route DELETE /namespaces/{namespace}/tenants/{tenant}/pods/{podName} OperatorAPI deletePod
+/*
+	DeletePod swagger:route DELETE /namespaces/{namespace}/tenants/{tenant}/pods/{podName} OperatorAPI deletePod

 Delete pod
-
 */
 type DeletePod struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/delete_pod_responses.go
+++ b/operatorapi/operations/operator_api/delete_pod_responses.go
@@ -33,7 +33,8 @@ import (
 // DeletePodNoContentCode is the HTTP code returned for type DeletePodNoContent
 const DeletePodNoContentCode int = 204

-/*DeletePodNoContent A successful response.
+/*
+DeletePodNoContent A successful response.

 swagger:response deletePodNoContent
 */
@@ -54,7 +55,8 @@ func (o *DeletePodNoContent) WriteResponse(rw http.ResponseWriter, producer runt
 	rw.WriteHeader(204)
 }

-/*DeletePodDefault Generic error response.
+/*
+DeletePodDefault Generic error response.

 swagger:response deletePodDefault
 */
--- a/operatorapi/operations/operator_api/delete_tenant.go
+++ b/operatorapi/operations/operator_api/delete_tenant.go
@@ -48,10 +48,10 @@ func NewDeleteTenant(ctx *middleware.Context, handler DeleteTenantHandler) *Dele
 	return &DeleteTenant{Context: ctx, Handler: handler}
 }

-/* DeleteTenant swagger:route DELETE /namespaces/{namespace}/tenants/{tenant} OperatorAPI deleteTenant
+/*
+	DeleteTenant swagger:route DELETE /namespaces/{namespace}/tenants/{tenant} OperatorAPI deleteTenant

 Delete tenant and underlying pvcs
-
 */
 type DeleteTenant struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/delete_tenant_parameters.go
+++ b/operatorapi/operations/operator_api/delete_tenant_parameters.go
@@ -23,7 +23,6 @@ package operator_api
 // Editing this file might prove futile when you re-run the swagger generate command

 import (
-	"context"
 	"net/http"

 	"github.com/go-openapi/errors"
@@ -88,7 +87,7 @@ func (o *DeleteTenantParams) BindRequest(r *http.Request, route *middleware.Matc
 				res = append(res, err)
 			}

-			ctx := validate.WithOperationRequest(context.Background())
+			ctx := validate.WithOperationRequest(r.Context())
 			if err := body.ContextValidate(ctx, route.Formats); err != nil {
 				res = append(res, err)
 			}
--- a/operatorapi/operations/operator_api/delete_tenant_responses.go
+++ b/operatorapi/operations/operator_api/delete_tenant_responses.go
@@ -33,7 +33,8 @@ import (
 // DeleteTenantNoContentCode is the HTTP code returned for type DeleteTenantNoContent
 const DeleteTenantNoContentCode int = 204

-/*DeleteTenantNoContent A successful response.
+/*
+DeleteTenantNoContent A successful response.

 swagger:response deleteTenantNoContent
 */
@@ -54,7 +55,8 @@ func (o *DeleteTenantNoContent) WriteResponse(rw http.ResponseWriter, producer r
 	rw.WriteHeader(204)
 }

-/*DeleteTenantDefault Generic error response.
+/*
+DeleteTenantDefault Generic error response.

 swagger:response deleteTenantDefault
 */
--- a/operatorapi/operations/operator_api/describe_pod.go
+++ b/operatorapi/operations/operator_api/describe_pod.go
@@ -48,10 +48,10 @@ func NewDescribePod(ctx *middleware.Context, handler DescribePodHandler) *Descri
 	return &DescribePod{Context: ctx, Handler: handler}
 }

-/* DescribePod swagger:route GET /namespaces/{namespace}/tenants/{tenant}/pods/{podName}/describe OperatorAPI describePod
+/*
+	DescribePod swagger:route GET /namespaces/{namespace}/tenants/{tenant}/pods/{podName}/describe OperatorAPI describePod

 Describe Pod
-
 */
 type DescribePod struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/describe_pod_responses.go
+++ b/operatorapi/operations/operator_api/describe_pod_responses.go
@@ -33,7 +33,8 @@ import (
 // DescribePodOKCode is the HTTP code returned for type DescribePodOK
 const DescribePodOKCode int = 200

-/*DescribePodOK A successful response.
+/*
+DescribePodOK A successful response.

 swagger:response describePodOK
 */
@@ -74,7 +75,8 @@ func (o *DescribePodOK) WriteResponse(rw http.ResponseWriter, producer runtime.P
 	}
 }

-/*DescribePodDefault Generic error response.
+/*
+DescribePodDefault Generic error response.

 swagger:response describePodDefault
 */
--- a/operatorapi/operations/operator_api/direct_p_v_format_drive.go
+++ b/operatorapi/operations/operator_api/direct_p_v_format_drive.go
@@ -48,10 +48,10 @@ func NewDirectPVFormatDrive(ctx *middleware.Context, handler DirectPVFormatDrive
 	return &DirectPVFormatDrive{Context: ctx, Handler: handler}
 }

-/* DirectPVFormatDrive swagger:route POST /directpv/drives/format OperatorAPI directPVFormatDrive
+/*
+	DirectPVFormatDrive swagger:route POST /directpv/drives/format OperatorAPI directPVFormatDrive

 Format directpv drives from a list
-
 */
 type DirectPVFormatDrive struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/direct_p_v_format_drive_parameters.go
+++ b/operatorapi/operations/operator_api/direct_p_v_format_drive_parameters.go
@@ -23,7 +23,6 @@ package operator_api
 // Editing this file might prove futile when you re-run the swagger generate command

 import (
-	"context"
 	"io"
 	"net/http"

@@ -83,7 +82,7 @@ func (o *DirectPVFormatDriveParams) BindRequest(r *http.Request, route *middlewa
 				res = append(res, err)
 			}

-			ctx := validate.WithOperationRequest(context.Background())
+			ctx := validate.WithOperationRequest(r.Context())
 			if err := body.ContextValidate(ctx, route.Formats); err != nil {
 				res = append(res, err)
 			}
--- a/operatorapi/operations/operator_api/direct_p_v_format_drive_responses.go
+++ b/operatorapi/operations/operator_api/direct_p_v_format_drive_responses.go
@@ -33,7 +33,8 @@ import (
 // DirectPVFormatDriveOKCode is the HTTP code returned for type DirectPVFormatDriveOK
 const DirectPVFormatDriveOKCode int = 200

-/*DirectPVFormatDriveOK A successful response.
+/*
+DirectPVFormatDriveOK A successful response.

 swagger:response directPVFormatDriveOK
 */
@@ -74,7 +75,8 @@ func (o *DirectPVFormatDriveOK) WriteResponse(rw http.ResponseWriter, producer r
 	}
 }

-/*DirectPVFormatDriveDefault Generic error response.
+/*
+DirectPVFormatDriveDefault Generic error response.

 swagger:response directPVFormatDriveDefault
 */
--- a/operatorapi/operations/operator_api/disable_tenant_logging.go
+++ b/operatorapi/operations/operator_api/disable_tenant_logging.go
@@ -48,10 +48,10 @@ func NewDisableTenantLogging(ctx *middleware.Context, handler DisableTenantLoggi
 	return &DisableTenantLogging{Context: ctx, Handler: handler}
 }

-/* DisableTenantLogging swagger:route POST /namespaces/{namespace}/tenants/{tenant}/disable-logging OperatorAPI disableTenantLogging
+/*
+	DisableTenantLogging swagger:route POST /namespaces/{namespace}/tenants/{tenant}/disable-logging OperatorAPI disableTenantLogging

 Disable Tenant Logging
-
 */
 type DisableTenantLogging struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/disable_tenant_logging_responses.go
+++ b/operatorapi/operations/operator_api/disable_tenant_logging_responses.go
@@ -33,7 +33,8 @@ import (
 // DisableTenantLoggingOKCode is the HTTP code returned for type DisableTenantLoggingOK
 const DisableTenantLoggingOKCode int = 200

-/*DisableTenantLoggingOK A successful response.
+/*
+DisableTenantLoggingOK A successful response.

 swagger:response disableTenantLoggingOK
 */
@@ -72,7 +73,8 @@ func (o *DisableTenantLoggingOK) WriteResponse(rw http.ResponseWriter, producer
 	}
 }

-/*DisableTenantLoggingDefault Generic error response.
+/*
+DisableTenantLoggingDefault Generic error response.

 swagger:response disableTenantLoggingDefault
 */
--- a/operatorapi/operations/operator_api/enable_tenant_logging.go
+++ b/operatorapi/operations/operator_api/enable_tenant_logging.go
@@ -48,10 +48,10 @@ func NewEnableTenantLogging(ctx *middleware.Context, handler EnableTenantLogging
 	return &EnableTenantLogging{Context: ctx, Handler: handler}
 }

-/* EnableTenantLogging swagger:route POST /namespaces/{namespace}/tenants/{tenant}/enable-logging OperatorAPI enableTenantLogging
+/*
+	EnableTenantLogging swagger:route POST /namespaces/{namespace}/tenants/{tenant}/enable-logging OperatorAPI enableTenantLogging

 Enable Tenant Logging
-
 */
 type EnableTenantLogging struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/enable_tenant_logging_responses.go
+++ b/operatorapi/operations/operator_api/enable_tenant_logging_responses.go
@@ -33,7 +33,8 @@ import (
 // EnableTenantLoggingOKCode is the HTTP code returned for type EnableTenantLoggingOK
 const EnableTenantLoggingOKCode int = 200

-/*EnableTenantLoggingOK A successful response.
+/*
+EnableTenantLoggingOK A successful response.

 swagger:response enableTenantLoggingOK
 */
@@ -72,7 +73,8 @@ func (o *EnableTenantLoggingOK) WriteResponse(rw http.ResponseWriter, producer r
 	}
 }

-/*EnableTenantLoggingDefault Generic error response.
+/*
+EnableTenantLoggingDefault Generic error response.

 swagger:response enableTenantLoggingDefault
 */
--- a/operatorapi/operations/operator_api/get_allocatable_resources.go
+++ b/operatorapi/operations/operator_api/get_allocatable_resources.go
@@ -48,10 +48,10 @@ func NewGetAllocatableResources(ctx *middleware.Context, handler GetAllocatableR
 	return &GetAllocatableResources{Context: ctx, Handler: handler}
 }

-/* GetAllocatableResources swagger:route GET /cluster/allocatable-resources OperatorAPI getAllocatableResources
+/*
+	GetAllocatableResources swagger:route GET /cluster/allocatable-resources OperatorAPI getAllocatableResources

 Get allocatable cpu and memory for given number of nodes
-
 */
 type GetAllocatableResources struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/get_allocatable_resources_responses.go
+++ b/operatorapi/operations/operator_api/get_allocatable_resources_responses.go
@@ -33,7 +33,8 @@ import (
 // GetAllocatableResourcesOKCode is the HTTP code returned for type GetAllocatableResourcesOK
 const GetAllocatableResourcesOKCode int = 200

-/*GetAllocatableResourcesOK A successful response.
+/*
+GetAllocatableResourcesOK A successful response.

 swagger:response getAllocatableResourcesOK
 */
@@ -74,7 +75,8 @@ func (o *GetAllocatableResourcesOK) WriteResponse(rw http.ResponseWriter, produc
 	}
 }

-/*GetAllocatableResourcesDefault Generic error response.
+/*
+GetAllocatableResourcesDefault Generic error response.

 swagger:response getAllocatableResourcesDefault
 */
--- a/operatorapi/operations/operator_api/get_direct_p_v_drive_list.go
+++ b/operatorapi/operations/operator_api/get_direct_p_v_drive_list.go
@@ -48,10 +48,10 @@ func NewGetDirectPVDriveList(ctx *middleware.Context, handler GetDirectPVDriveLi
 	return &GetDirectPVDriveList{Context: ctx, Handler: handler}
 }

-/* GetDirectPVDriveList swagger:route GET /directpv/drives OperatorAPI getDirectPVDriveList
+/*
+	GetDirectPVDriveList swagger:route GET /directpv/drives OperatorAPI getDirectPVDriveList

 Get directpv drives list
-
 */
 type GetDirectPVDriveList struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/get_direct_p_v_drive_list_responses.go
+++ b/operatorapi/operations/operator_api/get_direct_p_v_drive_list_responses.go
@@ -33,7 +33,8 @@ import (
 // GetDirectPVDriveListOKCode is the HTTP code returned for type GetDirectPVDriveListOK
 const GetDirectPVDriveListOKCode int = 200

-/*GetDirectPVDriveListOK A successful response.
+/*
+GetDirectPVDriveListOK A successful response.

 swagger:response getDirectPVDriveListOK
 */
@@ -74,7 +75,8 @@ func (o *GetDirectPVDriveListOK) WriteResponse(rw http.ResponseWriter, producer
 	}
 }

-/*GetDirectPVDriveListDefault Generic error response.
+/*
+GetDirectPVDriveListDefault Generic error response.

 swagger:response getDirectPVDriveListDefault
 */
--- a/operatorapi/operations/operator_api/get_direct_p_v_volume_list.go
+++ b/operatorapi/operations/operator_api/get_direct_p_v_volume_list.go
@@ -48,10 +48,10 @@ func NewGetDirectPVVolumeList(ctx *middleware.Context, handler GetDirectPVVolume
 	return &GetDirectPVVolumeList{Context: ctx, Handler: handler}
 }

-/* GetDirectPVVolumeList swagger:route GET /directpv/volumes OperatorAPI getDirectPVVolumeList
+/*
+	GetDirectPVVolumeList swagger:route GET /directpv/volumes OperatorAPI getDirectPVVolumeList

 Get directpv volumes list
-
 */
 type GetDirectPVVolumeList struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/get_direct_p_v_volume_list_responses.go
+++ b/operatorapi/operations/operator_api/get_direct_p_v_volume_list_responses.go
@@ -33,7 +33,8 @@ import (
 // GetDirectPVVolumeListOKCode is the HTTP code returned for type GetDirectPVVolumeListOK
 const GetDirectPVVolumeListOKCode int = 200

-/*GetDirectPVVolumeListOK A successful response.
+/*
+GetDirectPVVolumeListOK A successful response.

 swagger:response getDirectPVVolumeListOK
 */
@@ -74,7 +75,8 @@ func (o *GetDirectPVVolumeListOK) WriteResponse(rw http.ResponseWriter, producer
 	}
 }

-/*GetDirectPVVolumeListDefault Generic error response.
+/*
+GetDirectPVVolumeListDefault Generic error response.

 swagger:response getDirectPVVolumeListDefault
 */
--- a/operatorapi/operations/operator_api/get_m_p_integration.go
+++ b/operatorapi/operations/operator_api/get_m_p_integration.go
@@ -51,10 +51,10 @@ func NewGetMPIntegration(ctx *middleware.Context, handler GetMPIntegrationHandle
 	return &GetMPIntegration{Context: ctx, Handler: handler}
 }

-/* GetMPIntegration swagger:route GET /mp-integration OperatorAPI getMPIntegration
+/*
+	GetMPIntegration swagger:route GET /mp-integration OperatorAPI getMPIntegration

 Returns email registered for marketplace integration
-
 */
 type GetMPIntegration struct {
 	Context *middleware.Context
--- a/operatorapi/operations/operator_api/get_m_p_integration_responses.go
+++ b/operatorapi/operations/operator_api/get_m_p_integration_responses.go
@@ -33,7 +33,8 @@ import (
 // GetMPIntegrationOKCode is the HTTP code returned for type GetMPIntegrationOK
 const GetMPIntegrationOKCode int = 200

-/*GetMPIntegrationOK A successful response.
+/*
+GetMPIntegrationOK A successful response.

 swagger:response getMPIntegrationOK
 */
@@ -74,7 +75,8 @@ func (o *GetMPIntegrationOK) WriteResponse(rw http.ResponseWriter, producer runt
 	}
 }

-/*GetMPIntegrationDefault Generic error response.
+/*
+GetMPIntegrationDefault Generic error response.

 swagger:response getMPIntegrationDefault
 */
--- a/Show More
+++ b/Show More