Move heal and watch to tenant details view on operator-ui (#449)

Use insecure: true in the meantime so the wss/watch endpoint works while we add support for custotm TLS transport in the S3 client library. Removed "InsecureSkipVerify: true" from s3AdminClient and s3Client HTTP clients
2020-11-30 12:41:58 -08:00
parent 59b43884ff
commit 4a27ef4b2c
35 changed files with 1320 additions and 539 deletions
--- a/go.sum
+++ b/go.sum
@@ -13,6 +13,7 @@ cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
 cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0 h1:EpMNVUorLiZIELdMZbCYX/ByTFCdoYopYAGxaGVz9ms=
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
@@ -29,6 +30,7 @@ cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjp
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0 h1:86K1Gel7BQ9/WmNWn7dTKMvTLFzwtBe5FNqYbi9X35g=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 code.gitea.io/sdk/gitea v0.12.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
 contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA=
@@ -37,9 +39,11 @@ contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e
 contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE=
 contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+git.apache.org/thrift.git v0.13.0 h1:/3bz5WZ+sqYArk7MBBBbDufMxKKOA56/6JO6psDpUDY=
 git.apache.org/thrift.git v0.13.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU=
 github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
+github.com/Azure/azure-pipeline-go v0.2.2 h1:6oiIS9yaG6XCCzhgAgKFfIWyo4LLCiDhZot6ltoThhY=
 github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc=
 github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v30.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
@@ -48,13 +52,16 @@ github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
 github.com/Azure/azure-sdk-for-go v42.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0=
 github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0=
+github.com/Azure/azure-storage-blob-go v0.10.0 h1:evCwGreYo3XLeBV4vSxLbLiYb6e0SzsJiXQVRGsRXxs=
 github.com/Azure/azure-storage-blob-go v0.10.0/go.mod h1:ep1edmW+kNQx4UfWM9heESNmQdijykocJ0YOxmMX8SE=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v14.1.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
+github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
 github.com/Azure/go-autorest/autorest v0.9.3/go.mod h1:GsRuLYvwzLjjjRoWEIyMUaYq8GNUx2nRB378IPt/1p0=
+github.com/Azure/go-autorest/autorest v0.10.2 h1:NuSF3gXetiHyUbVdneJMEVyPUYAe5wh+aN08JYAf1tI=
 github.com/Azure/go-autorest/autorest v0.10.2/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
 github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
 github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
@@ -62,11 +69,13 @@ github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMl
 github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
 github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
 github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
+github.com/Azure/go-autorest/autorest/adal v0.9.1 h1:xjPqigMQe2+0DAJ5A6MLUPp5D2r2Io8qHCuCMMI/yJU=
 github.com/Azure/go-autorest/autorest/adal v0.9.1/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
 github.com/Azure/go-autorest/autorest/azure/auth v0.4.2/go.mod h1:90gmfKdlmKgfjUpnCEpOJzsUEjrWDSLwHIG73tSXddM=
 github.com/Azure/go-autorest/autorest/azure/cli v0.3.1/go.mod h1:ZG5p860J94/0kI9mNJVoIoLgXcirM2gF5i2kWloofxw=
 github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
 github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
+github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
 github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
 github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
 github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
@@ -76,8 +85,10 @@ github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocm
 github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA=
 github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
 github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI=
+github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
 github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
+github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -109,6 +120,7 @@ github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrU
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE=
+github.com/alecthomas/participle v0.2.1 h1:4AVLj1viSGa4LG5HDXKXrm5xRx19SB/rS/skPQB1Grw=
 github.com/alecthomas/participle v0.2.1/go.mod h1:SW6HZGeZgSIpcUWX3fXpfZhuaWHnmoD5KCVaqSaNTkk=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -142,8 +154,10 @@ github.com/aws/aws-sdk-go v1.27.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aws/aws-sdk-go v1.29.11/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg=
 github.com/aws/aws-sdk-go v1.31.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
+github.com/bcicen/jstream v0.0.0-20190220045926-16c1f8af81c2 h1:M+TYzBcNIRyzPRg66ndEqUMd7oWDmhvdQmaPC6EZNwM=
 github.com/bcicen/jstream v0.0.0-20190220045926-16c1f8af81c2/go.mod h1:RDu/qcrnpEdJC/p8tx34+YBFqqX71lB7dOX9QE+ZC4M=
 github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
+github.com/beevik/ntp v0.3.0 h1:xzVrPrE4ziasFXgBVBZJDP0Wg/KpMwk2KHJ4Ba8GrDw=
 github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
@@ -162,7 +176,9 @@ github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMS
 github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A=
 github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cheggaaa/pb v1.0.28/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
 github.com/cheggaaa/pb v1.0.29 h1:FckUN5ngEk2LpvuG0fw1GEFx6LtyY2pWI/Z2QgCnEYo=
@@ -178,8 +194,10 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codegangsta/negroni v1.0.0 h1:+aYywywx4bnKXWvoWtRfJ91vC59NbEhEY03sZjQhbVY=
 github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
+github.com/colinmarc/hdfs/v2 v2.1.1 h1:x0hw/m+o3UE20Scso/KCkvYNc9Di39TBlCfGMkJ1/a0=
 github.com/colinmarc/hdfs/v2 v2.1.1/go.mod h1:M3x+k8UKKmxtFu++uAZ0OtDU8jR3jnaZIAc6yK4Ue0c=
 github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
+github.com/coredns/coredns v1.4.0 h1:RubBkYmkByUqZWWkjRHvNLnUHgkRVqAWgSMmRFvpE1A=
 github.com/coredns/coredns v1.4.0/go.mod h1:zASH/MVDgR6XZTbxvOnsZfffS+31vg6Ackf/wo1+AM0=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -207,18 +225,23 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4=
 github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4=
 github.com/devigned/tab v0.1.1/go.mod h1:XG9mPq0dFghrYvoBF3xdRrJzSTX1b7IQrvaL9mzjeJY=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
+github.com/djherbis/atime v1.0.0 h1:ySLvBAM0EvOGaX7TI4dAM5lWj+RdJUCKtGSEHN8SGBg=
 github.com/djherbis/atime v1.0.0/go.mod h1:5W+KBIuTwVGcqjIfaTwt+KSYX1o6uep8dtevevQP/f8=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017 h1:2HQmlpI3yI9deH18Q6xiSOIjXD4sLI55Y/gfpa8/558=
 github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7 h1:Cvj7S8I4Xpx78KAl6TwTmMHuHlZ/0SM60NUneGJQ7IE=
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -469,6 +492,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-containerregistry v0.1.2 h1:YjFNKqxzWUVZND8d4ItF9wuYlE75WQfECE7yKX/Nu3o=
 github.com/google/go-containerregistry v0.1.2/go.mod h1:GPivBPgdAyd2SU+vf6EpsgOtWDuPqjW0hJZt4rNdTZ4=
 github.com/google/go-github/v28 v28.1.1/go.mod h1:bsqJWQX05omyWVmc00nEUql9mhQyv38lDZ8kPZcQVoM=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
@@ -494,25 +518,30 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/wire v0.3.0/go.mod h1:i1DMg/Lu8Sz5yYl25iOdmc5CT5qusaa+zmRWs16741s=
 github.com/google/wire v0.4.0/go.mod h1:ngWDr9Qvq3yZA10YrxfyGELY/AFWGVpy9c1LTRi1EoU=
+github.com/googleapis/gax-go v2.0.2+incompatible h1:silFMLAnr330+NRuag/VjIGF7TLp/LBrV2CJKFLWEww=
 github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
+github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/googleapis/gnostic v0.2.2 h1:DcFegQ7+ECdmkJMfVwWlC+89I4esJ7p8nkGt9ainGDk=
 github.com/googleapis/gnostic v0.2.2/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg=
+github.com/gophercloud/gophercloud v0.1.0 h1:P/nh25+rzXouhytV2pUHBb65fnds26Ghl8/391+sT5o=
 github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/goreleaser/goreleaser v0.136.0/go.mod h1:wiKrPUeSNh6Wu8nUHxZydSOVQ/OZvOaO7DTtFqie904=
 github.com/goreleaser/nfpm v1.2.1/go.mod h1:TtWrABZozuLOttX2uDlYyECfQX7x5XYkVxhjYcR6G9w=
 github.com/goreleaser/nfpm v1.3.0/go.mod h1:w0p7Kc9TAUgWMyrub63ex3M2Mgw88M4GZXoTq5UCb40=
+github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.5-0.20200711200521-98cb6bf42e08/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/rpc v1.2.0 h1:WvvdC2lNeT1SP32zrIce5l0ECBfbAlmrmSBsuc57wfk=
 github.com/gorilla/rpc v1.2.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ=
 github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
@@ -536,6 +565,7 @@ github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyN
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
 github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
@@ -553,10 +583,13 @@ github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn
 github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-retryablehttp v0.6.4/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
+github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
 github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/hashicorp/go-rootcerts v1.0.1 h1:DMo4fmknnz0E0evoNYnV48RjWndOsmd6OW+09R3cEP8=
 github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
+github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
 github.com/hashicorp/go-uuid v0.0.0-20180228145832-27454136f036/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -570,6 +603,7 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.3 h1:YPkqC67at8FYaadspW/6uE0COsBxS2656RLEr8Bppgk=
 github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
@@ -578,7 +612,9 @@ github.com/hashicorp/raft v1.1.2 h1:oxEL5DDeurYxLd3UbcY/hccgSPhLLpiBZ1YxtWEq59c=
 github.com/hashicorp/raft v1.1.2/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8=
 github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod h1:pNv7Wc3ycL6F5oOWn+tPGo2gWD4a5X+yp/ntwdKLjRk=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/hashicorp/vault/api v1.0.4 h1:j08Or/wryXT4AcHj1oCbMd7IijXcKzYUGw59LGu9onU=
 github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q=
+github.com/hashicorp/vault/sdk v0.1.13 h1:mOEPeOhT7jl0J4AMl1E705+BcmeRs1VmKNb9F0sMLy8=
 github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
@@ -587,6 +623,7 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
 github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7VjIE6z8dIvMsI4/s+1qr5EL+zoIGev1BQj1eoJ8=
 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg=
@@ -640,8 +677,11 @@ github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgo
 github.com/klauspost/cpuid v1.2.4/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s=
 github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4=
+github.com/klauspost/pgzip v1.2.1 h1:oIPZROsWuPHpOdMVWLuJZXwgjhrW8r1yEX8UqMyeNHM=
 github.com/klauspost/pgzip v1.2.1/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
+github.com/klauspost/readahead v1.3.1 h1:QqXNYvm+VvqYcbrRT4LojUciM0XrznFRIDrbHiJtu/0=
 github.com/klauspost/readahead v1.3.1/go.mod h1:AH9juHzNH7xqdqFHrMRSHeH2Ps+vFf+kblDqzPFiLJg=
+github.com/klauspost/reedsolomon v1.9.9 h1:qCL7LZlv17xMixl55nq2/Oa1Y86nfO8EqDfv2GHND54=
 github.com/klauspost/reedsolomon v1.9.9/go.mod h1:O7yFFHiQwDR6b2t63KPUpccPtNdp5ADgh1gg4fd12wo=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -709,6 +749,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5
 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.8 h1:1QYRAKU3lN5cRfLCkPU08hwvLJFhvjP6MqNMmQz6ZVI=
 github.com/miekg/dns v1.1.8/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/minio/cli v1.22.0 h1:VTQm7lmXm3quxO917X3p+el1l0Ca5X3S4PM2ruUYO68=
 github.com/minio/cli v1.22.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY=
@@ -730,12 +771,15 @@ github.com/minio/minio-go/v7 v7.0.6-0.20201119032702-6914cb678dde h1:Ag2kFFpCxct
 github.com/minio/minio-go/v7 v7.0.6-0.20201119032702-6914cb678dde/go.mod h1:HcIuq+11d/3MfavIPZiswSzfQ1VJ2Lwxp/XLtW46IWQ=
 github.com/minio/operator v0.0.0-20201022162018-527e5c32132b h1:ggfD6V3nodTzhHJHCYIT1F897gscrz+hHsan0a2Wtqw=
 github.com/minio/operator v0.0.0-20201022162018-527e5c32132b/go.mod h1:At+++4/6W5BEXK11tN5DKIvkJKhYBZybbb5zmxb0LQI=
+github.com/minio/selfupdate v0.3.1 h1:BWEFSNnrZVMUWXbXIgLDNDjbejkmpAmZvy/nCz1HlEs=
 github.com/minio/selfupdate v0.3.1/go.mod h1:b8ThJzzH7u2MkF6PcIra7KaXO9Khf6alWPvMSyTDCFM=
 github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU=
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/simdjson-go v0.1.5-0.20200303142138-b17fe061ea37/go.mod h1:oKURrZZEBtqObgJrSjN1Ln2n9MJj2icuBTkeJzZnvSI=
+github.com/minio/simdjson-go v0.1.5 h1:6T5mHh7r3kUvgwhmFWQAjoPV5Yt5oD/VPjAI9ViH1kM=
 github.com/minio/simdjson-go v0.1.5/go.mod h1:oKURrZZEBtqObgJrSjN1Ln2n9MJj2icuBTkeJzZnvSI=
 github.com/minio/sio v0.2.0/go.mod h1:nKM5GIWSrqbOZp0uhyj6M1iA0X6xQzSGtYSaTKSCut0=
+github.com/minio/sio v0.2.1 h1:NjzKiIMSMcHediVQR0AFVx2tp7Wxh9tKPfDI3kH7aHQ=
 github.com/minio/sio v0.2.1/go.mod h1:8b0yPp2avGThviy/+OCJBI6OMpvxoUuiLvE6F1lebhw=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
@@ -829,6 +873,7 @@ github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bA
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
+github.com/philhofer/fwd v1.1.0 h1:PAdZw9+/BCf4gc/kA2L/PbGPkFe72Kl2GLZXTG8HpU8=
 github.com/philhofer/fwd v1.1.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.2.6+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -885,6 +930,7 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
@@ -895,6 +941,7 @@ github.com/ryancurrah/gomodguard v1.0.4/go.mod h1:9T/Cfuxs5StfsocWr4WzDL36HqnX0f
 github.com/ryancurrah/gomodguard v1.1.0/go.mod h1:4O8tr7hBODaGE6VIhfJDHcwzh5GUccKSJBU0UMXJFVM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/sassoftware/go-rpmutils v0.0.0-20190420191620-a8f1baeba37b/go.mod h1:am+Fp8Bt506lA3Rk3QCmSqmYmLMnPDhdDUcosQCAx+I=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
@@ -936,6 +983,7 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k
 github.com/sourcegraph/go-diff v0.5.1/go.mod h1:j2dHj3m8aZgQO8lMTcTnBcXkRRRqi34cd2MNlA9u1mE=
 github.com/sourcegraph/go-diff v0.5.3/go.mod h1:v9JDtjCE4HHHCZGId75rg8gkKKa98RVjBcBGsVmMmak=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
@@ -959,6 +1007,7 @@ github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94 h1:0ngsPmuP6XIjiFRN
 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -972,14 +1021,18 @@ github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0
 github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM=
 github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/tetafro/godot v0.4.2/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
+github.com/tidwall/gjson v1.3.5 h1:2oW9FBNu8qt9jy5URgrzsVx/T/KSn3qn/smJQ0crlDQ=
 github.com/tidwall/gjson v1.3.5/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
+github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
 github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/sjson v1.0.4 h1:UcdIRXff12Lpnu3OLtZvnc03g4vH2suXDXhBwBqmzYg=
 github.com/tidwall/sjson v1.0.4/go.mod h1:bURseu1nuBkFpIES5cz6zBtjmYeOQmEESshn7VpF15Y=
 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
+github.com/tinylib/msgp v1.1.3 h1:3giwAkmtaEDLSV0MdO1lDLuPgklgPzmk8H9+So2BVfA=
 github.com/tinylib/msgp v1.1.3/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
 github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0=
@@ -1010,7 +1063,9 @@ github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV
 github.com/vdemeester/k8s-pkg-credentialprovider v1.17.4/go.mod h1:inCTmtUdr5KJbreVojo06krnTgaeAz/Z7lynpPk/Q2c=
 github.com/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
 github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
+github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
+github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA=
 github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8=
 github.com/xanzy/go-gitlab v0.31.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
 github.com/xanzy/go-gitlab v0.32.0/go.mod h1:sPLojNBn68fMUWSxIJtdVVIP8uSBYqesTfDUseX11Ug=
@@ -1044,6 +1099,7 @@ go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1185,6 +1241,7 @@ golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -1358,6 +1415,7 @@ google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/
 google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.25.0 h1:LodzhlzZEUfhXzNUMIfVlf9Gr6Ua5MMtoFWh7+f47qA=
 google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1423,6 +1481,7 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1453,6 +1512,7 @@ gopkg.in/jcmturner/gokrb5.v7 v7.3.0 h1:0709Jtq/6QXEuWRfAm260XqlpcwL1vxtO1tUE2qK8
 gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM=
 gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU=
 gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8=
+gopkg.in/ldap.v3 v3.0.3 h1:YKRHW/2sIl05JsCtx/5ZuUueFuJyoj/6+DGXe3wp6ro=
 gopkg.in/ldap.v3 v3.0.3/go.mod h1:oxD7NyBuxchC+SgJDE1Q5Od05eGt29SDQVBmV+HYbzw=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/olivere/elastic.v5 v5.0.80/go.mod h1:uhHoB4o3bvX5sorxBU29rPcmBQdV2Qfg0FBrx5D6pV0=
--- a/k8s/operator-console/base/kustomization.yaml
+++ b/k8s/operator-console/base/kustomization.yaml
@@ -8,4 +8,4 @@ resources:
  - console-configmap.yaml
  - console-service.yaml
  - console-deployment.yaml
-  - https://github.com/minio/operator/?ref=v3.0.19
+  - https://github.com/minio/operator/?ref=v3.0.29
--- a/pkg/acl/endpoints.go
+++ b/pkg/acl/endpoints.go
@@ -28,14 +28,12 @@ var (
 	iamPolicies         = "/policies"
 	dashboard           = "/dashboard"
 	profiling           = "/profiling"
-	watch               = "/watch"
 	notifications       = "/notification-endpoints"
 	buckets             = "/buckets"
 	bucketsDetail       = "/buckets/:bucketName"
 	serviceAccounts     = "/service-accounts"
 	tenants             = "/tenants"
 	tenantsDetail       = "/namespaces/:tenantNamespace/tenants/:tenantName"
-	heal                = "/heal"
 	remoteBuckets       = "/remote-buckets"
 	replication         = "/replication"
 	objectBrowser       = "/object-browser/:bucket/*"
@@ -122,16 +120,6 @@ var usersActionSet = ConfigurationActionSet{
 	),
 }

-// watchActionSet contains the list of admin actions required for this endpoint to work
-var watchActionSet = ConfigurationActionSet{
-	actionTypes: iampolicy.NewActionSet(
-		iampolicy.AllAdminActions,
-	),
-	actions: iampolicy.NewActionSet(
-		iampolicy.ListenBucketNotificationAction,
-	),
-}
-
 // notificationsActionSet contains the list of admin actions required for this endpoint to work
 var notificationsActionSet = ConfigurationActionSet{
 	actionTypes: iampolicy.NewActionSet(
@@ -182,16 +170,6 @@ var tenantsActionSet = ConfigurationActionSet{
 	actions:     iampolicy.NewActionSet(),
 }

-// healActionSet contains the list of admin actions required for this endpoint to work
-var healActionSet = ConfigurationActionSet{
-	actionTypes: iampolicy.NewActionSet(
-		iampolicy.AllAdminActions,
-	),
-	actions: iampolicy.NewActionSet(
-		iampolicy.HealAdminAction,
-	),
-}
-
 var remoteBucketsActionSet = ConfigurationActionSet{
 	actionTypes: iampolicy.NewActionSet(
 		iampolicy.AllAdminActions,
@@ -230,12 +208,10 @@ var endpointRules = map[string]ConfigurationActionSet{
 	iamPolicies:         iamPoliciesActionSet,
 	dashboard:           dashboardActionSet,
 	profiling:           profilingActionSet,
-	watch:               watchActionSet,
 	notifications:       notificationsActionSet,
 	buckets:             bucketsActionSet,
 	bucketsDetail:       bucketsActionSet,
 	serviceAccounts:     serviceAccountsActionSet,
-	heal:                healActionSet,
 	remoteBuckets:       remoteBucketsActionSet,
 	replication:         replicationActionSet,
 	objectBrowser:       objectBrowserActionSet,
--- a/pkg/acl/endpoints_test.go
+++ b/pkg/acl/endpoints_test.go
@@ -72,7 +72,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"admin:*",
 				},
 			},
-			want: 15,
+			want: 13,
 		},
 		{
 			name: "all s3 endpoints",
@@ -91,7 +91,7 @@ func TestGetAuthorizedEndpoints(t *testing.T) {
 					"s3:*",
 				},
 			},
-			want: 18,
+			want: 16,
 		},
 		{
 			name: "no endpoints",
--- a/portal-ui/bindata_assetfs.go
+++ b/portal-ui/bindata_assetfs.go
--- a/portal-ui/src/screens/Console/Console.tsx
+++ b/portal-ui/src/screens/Console/Console.tsx
@@ -42,8 +42,6 @@ import ListNotificationEndpoints from "./NotificationEndopoints/ListNotification
 import ConfigurationsList from "./Configurations/ConfigurationPanels/ConfigurationsList";
 import { Button, LinearProgress } from "@material-ui/core";
 import WebhookPanel from "./Configurations/ConfigurationPanels/WebhookPanel";
-import Heal from "./Heal/Heal";
-import Watch from "./Watch/Watch";
 import ListTenants from "./Tenants/ListTenants/ListTenants";
 import { ISessionResponse } from "./types";
 import TenantDetails from "./Tenants/TenantDetails/TenantDetails";
@@ -221,10 +219,6 @@ const Console = ({
      component: ObjectRouting,
      path: "/object-browser/:bucket/*",
    },
-    {
-      component: Watch,
-      path: "/watch",
-    },
    {
      component: Users,
      path: "/users",
@@ -237,10 +231,6 @@ const Console = ({
      component: Policies,
      path: "/policies",
    },
-    {
-      component: Heal,
-      path: "/heal",
-    },
    {
      component: ListNotificationEndpoints,
      path: "/notification-endpoints",
--- a/portal-ui/src/screens/Console/Menu/Menu.tsx
+++ b/portal-ui/src/screens/Console/Menu/Menu.tsx
@@ -240,22 +240,6 @@ const Menu = ({ userLoggedIn, classes, pages }: IMenuProps) => {
      name: "IAM Policies",
      icon: <IAMPoliciesIcon />,
    },
-    {
-      group: "Tools",
-      type: "item",
-      component: NavLink,
-      to: "/watch",
-      name: "Watch",
-      icon: <WatchIcon />,
-    },
-    {
-      group: "Tools",
-      type: "item",
-      component: NavLink,
-      to: "/heal",
-      name: "Heal",
-      icon: <HealIcon />,
-    },
    {
      group: "Admin",
      type: "item",
--- a/portal-ui/src/screens/Console/Menu/utils.ts
+++ b/portal-ui/src/screens/Console/Menu/utils.ts
@@ -18,7 +18,6 @@ export const menuGroups = [
  { label: "", group: "common", collapsible: false },
  { label: "User", group: "User", collapsible: true },
  { label: "Admin", group: "Admin", collapsible: true },
-  { label: "Tools", group: "Tools", collapsible: true },
  { label: "Operator", group: "Operator", collapsible: true },
  { label: "", group: "License", collapsible: false },
 ];
--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/Heal/Heal.tsx
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/Heal/Heal.tsx
@@ -3,19 +3,20 @@ import React, { useEffect, useState } from "react";
 import { Button, Grid, TextField, InputBase } from "@material-ui/core";
 import { IMessageEvent, w3cwebsocket as W3CWebSocket } from "websocket";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import { wsProtocol } from "../../../utils/wsUtils";
-import api from "../../../common/api";
+import { wsProtocol } from "../../../../../utils/wsUtils";
+import api from "../../../../../common/api";
 import { FormControl, MenuItem, Select } from "@material-ui/core";
 import { BucketList, Bucket } from "../Watch/types";
 import { HealStatus, colorH } from "./types";
-import { niceBytes } from "../../../common/utils";
+import { niceBytes } from "../../../../../common/utils";
+import InputLabel from "@material-ui/core/InputLabel";
 import {
  actionsTray,
  containerForHeader,
  searchField,
-} from "../Common/FormComponents/common/styleLibrary";
-import PageHeader from "../Common/PageHeader/PageHeader";
-import CheckboxWrapper from "../Common/FormComponents/CheckboxWrapper/CheckboxWrapper";
+} from "../../../Common/FormComponents/common/styleLibrary";
+import PageHeader from "../../../Common/PageHeader/PageHeader";
+import CheckboxWrapper from "../../../Common/FormComponents/CheckboxWrapper/CheckboxWrapper";

 const styles = (theme: Theme) =>
  createStyles({
@@ -60,13 +61,15 @@ const styles = (theme: Theme) =>

 interface IHeal {
  classes: any;
+  namespace: string;
+  tenant: string;
 }

 const SelectStyled = withStyles((theme: Theme) =>
  createStyles({
    root: {
      width: 450,
-      lineHeight: 1,
+      lineHeight: "50px",
      marginRight: 15,
      "label + &": {
        marginTop: theme.spacing(3),
@@ -76,15 +79,17 @@ const SelectStyled = withStyles((theme: Theme) =>
      },
    },
    input: {
+      height: 50,
      fontSize: 13,
-      lineHeight: 15,
+      lineHeight: "50px",
+      width: 450,
    },
  })
 )(InputBase);

-const Heal = ({ classes }: IHeal) => {
+const Heal = ({ classes, namespace, tenant }: IHeal) => {
  const [start, setStart] = useState(false);
-  const [bucketName, setBucketName] = useState("Select Bucket");
+  const [bucketName, setBucketName] = useState("");
  const [bucketList, setBucketList] = useState<Bucket[]>([]);
  const [prefix, setPrefix] = useState("");
  const [recursive, setRecursive] = useState(false);
@@ -102,7 +107,7 @@ const Heal = ({ classes }: IHeal) => {

  const fetchBucketList = () => {
    api
-      .invoke("GET", `/api/v1/buckets`)
+      .invoke("GET", `/api/v1/operator/${namespace}/${tenant}/buckets`)
      .then((res: BucketList) => {
        let buckets: Bucket[] = [];
        if (res.buckets !== null) {
@@ -149,7 +154,7 @@ const Heal = ({ classes }: IHeal) => {

      const wsProt = wsProtocol(url.protocol);
      const c = new W3CWebSocket(
-        `${wsProt}://${url.hostname}:${port}/ws/heal/${bucketName}?prefix=${prefix}&recursive=${recursive}&force-start=${forceStart}&force-stop=${forceStop}`
+        `${wsProt}://${url.hostname}:${port}/ws/heal/${namespace}/${tenant}/${bucketName}?prefix=${prefix}&recursive=${recursive}&force-start=${forceStart}&force-stop=${forceStop}`
      );

      if (c !== null) {
@@ -212,129 +217,125 @@ const Heal = ({ classes }: IHeal) => {
    value: bucketName.name,
  }));
  return (
-    <React.Fragment>
-      <PageHeader label="Heal" />
-      <Grid container>
-        <Grid item xs={12} className={classes.container}>
-          <Grid item xs={12} className={classes.actionsTray}>
-            <FormControl variant="outlined">
-              <Select
-                id="bucket-name"
-                name="bucket-name"
-                value={bucketName}
-                onChange={(e) => {
-                  setBucketName(e.target.value as string);
-                }}
-                className={classes.searchField}
-                input={<SelectStyled />}
+    <Grid item xs={12}>
+      <Grid item xs={12} className={classes.actionsTray}>
+        <FormControl variant="outlined">
+          <Select
+            id="bucket-name"
+            name="bucket-name"
+            value={bucketName}
+            onChange={(e) => {
+              setBucketName(e.target.value as string);
+            }}
+            className={classes.searchField}
+            input={<SelectStyled />}
+            displayEmpty
+          >
+            <MenuItem value="" key={`select-bucket-name-default`}>
+              Select Bucket
+            </MenuItem>
+            {bucketNames.map((option) => (
+              <MenuItem
+                value={option.value}
+                key={`select-bucket-name-${option.label}`}
              >
-                <MenuItem value="" key={`select-bucket-name-default`}>
-                  Select Bucket
-                </MenuItem>
-                {bucketNames.map((option) => (
-                  <MenuItem
-                    value={option.value}
-                    key={`select-bucket-name-${option.label}`}
-                  >
-                    {option.label}
-                  </MenuItem>
-                ))}
-              </Select>
-            </FormControl>
-            <TextField
-              placeholder="Prefix"
-              className={classes.searchField}
-              id="prefix-resource"
-              label=""
-              disabled={false}
-              InputProps={{
-                disableUnderline: true,
-              }}
-              onChange={(e) => {
-                setPrefix(e.target.value);
-              }}
-            />
-            <Button
-              type="submit"
-              variant="contained"
-              color="primary"
-              disabled={start}
-              onClick={() => setStart(true)}
-            >
-              Start
-            </Button>
-          </Grid>
-          <Grid item xs={12} className={classes.inlineCheckboxes}>
-            <CheckboxWrapper
-              name="recursive"
-              id="recursive"
-              value="recursive"
-              checked={recursive}
-              onChange={(e) => {
-                setRecursive(e.target.checked);
-              }}
-              disabled={false}
-              label="Recursive"
-            />
-            <CheckboxWrapper
-              name="forceStart"
-              id="forceStart"
-              value="forceStart"
-              checked={forceStart}
-              onChange={(e) => {
-                setForceStart(e.target.checked);
-              }}
-              disabled={false}
-              label="Force Start"
-            />
-            <CheckboxWrapper
-              name="forceStop"
-              id="forceStop"
-              value="forceStop"
-              checked={forceStop}
-              onChange={(e) => {
-                setForceStop(e.target.checked);
-              }}
-              disabled={false}
-              label="Force Stop"
-            />
-          </Grid>
-          <Grid item xs={12}>
-            <br />
-          </Grid>
-          <Grid item xs={12} className={classes.graphContainer}>
-            <HorizontalBar
-              data={data}
-              width={80}
-              height={30}
-              options={{
-                title: {
-                  display: true,
-                  text: "Item's Health Status [%]",
-                  fontSize: 20,
-                },
-                legend: {
-                  display: true,
-                  position: "right",
-                },
-              }}
-            />
-            <Grid item xs={12} className={classes.scanInfo}>
-              <div className={classes.scanData}>
-                <strong>Size scanned:</strong> {hStatus.sizeScanned}
-              </div>
-              <div className={classes.scanData}>
-                <strong>Objects healed:</strong> {hStatus.objectsHealed} /{" "}
-                {hStatus.objectsScanned}
-              </div>
-              <div className={classes.scanData}>
-                <strong>Healing time:</strong> {hStatus.healDuration}s
-              </div>
-            </Grid>
-          </Grid>
+                {option.label}
+              </MenuItem>
+            ))}
+          </Select>
+        </FormControl>
+        <TextField
+          placeholder="Prefix"
+          className={classes.searchField}
+          id="prefix-resource"
+          label=""
+          disabled={false}
+          InputProps={{
+            disableUnderline: true,
+          }}
+          onChange={(e) => {
+            setPrefix(e.target.value);
+          }}
+        />
+        <Button
+          type="submit"
+          variant="contained"
+          color="primary"
+          disabled={start}
+          onClick={() => setStart(true)}
+        >
+          Start
+        </Button>
+      </Grid>
+      <Grid item xs={12} className={classes.inlineCheckboxes}>
+        <CheckboxWrapper
+          name="recursive"
+          id="recursive"
+          value="recursive"
+          checked={recursive}
+          onChange={(e) => {
+            setRecursive(e.target.checked);
+          }}
+          disabled={false}
+          label="Recursive"
+        />
+        <CheckboxWrapper
+          name="forceStart"
+          id="forceStart"
+          value="forceStart"
+          checked={forceStart}
+          onChange={(e) => {
+            setForceStart(e.target.checked);
+          }}
+          disabled={false}
+          label="Force Start"
+        />
+        <CheckboxWrapper
+          name="forceStop"
+          id="forceStop"
+          value="forceStop"
+          checked={forceStop}
+          onChange={(e) => {
+            setForceStop(e.target.checked);
+          }}
+          disabled={false}
+          label="Force Stop"
+        />
+      </Grid>
+      <Grid item xs={12}>
+        <br />
+      </Grid>
+      <Grid item xs={12} className={classes.graphContainer}>
+        <HorizontalBar
+          data={data}
+          width={80}
+          height={30}
+          options={{
+            title: {
+              display: true,
+              text: "Item's Health Status [%]",
+              fontSize: 20,
+            },
+            legend: {
+              display: true,
+              position: "right",
+            },
+          }}
+        />
+        <Grid item xs={12} className={classes.scanInfo}>
+          <div className={classes.scanData}>
+            <strong>Size scanned:</strong> {hStatus.sizeScanned}
+          </div>
+          <div className={classes.scanData}>
+            <strong>Objects healed:</strong> {hStatus.objectsHealed} /{" "}
+            {hStatus.objectsScanned}
+          </div>
+          <div className={classes.scanData}>
+            <strong>Healing time:</strong> {hStatus.healDuration}s
+          </div>
        </Grid>
      </Grid>
-    </React.Fragment>
+    </Grid>
  );
 };

--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/Heal/types.ts
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/Heal/types.ts
--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/TenantDetails.tsx
@@ -21,13 +21,11 @@ import {
  modalBasic,
 } from "../../Common/FormComponents/common/styleLibrary";
 import Grid from "@material-ui/core/Grid";
-import Typography from "@material-ui/core/Typography";
 import { Button } from "@material-ui/core";
 import Tabs from "@material-ui/core/Tabs";
 import Tab from "@material-ui/core/Tab";
 import { CreateIcon } from "../../../../icons";
 import TableWrapper from "../../Common/TableWrapper/TableWrapper";
-import { MinTablePaginationActions } from "../../../../common/MinTablePaginationActions";
 import Paper from "@material-ui/core/Paper";
 import { niceBytes } from "../../../../common/utils";
 import AddZoneModal from "./AddZoneModal";
@@ -37,6 +35,8 @@ import api from "../../../../common/api";
 import { ITenant, IZone } from "../ListTenants/types";
 import Logs from "./Logs/Logs";
 import Trace from "./Trace/Trace";
+import Watch from "./Watch/Watch";
+import Heal from "./Heal/Heal";
 import PageHeader from "../../Common/PageHeader/PageHeader";

 interface ITenantDetailsProps {
@@ -230,7 +230,7 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
        <Grid item xs={12}>
          <br />
        </Grid>
-        <Grid item xs={6}>
+        <Grid item xs={7}>
          <Tabs
            value={selectedTab}
            indicatorColor="primary"
@@ -243,9 +243,11 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
            <Tab label="Clusters" />
            <Tab label="Logs" />
            <Tab label="Trace" />
+            <Tab label="Watch" />
+            <Tab label="Heal" />
          </Tabs>
        </Grid>
-        <Grid item xs={6} className={classes.actionsTray}>
+        <Grid item xs={5} className={classes.actionsTray}>
          <Button
            variant="contained"
            color="primary"
@@ -291,6 +293,12 @@ const TenantDetails = ({ classes, match }: ITenantDetailsProps) => {
        {selectedTab === 2 && tenant !== null && (
          <Trace namespace={tenant.namespace} tenant={tenant.name} />
        )}
+        {selectedTab === 3 && tenant !== null && (
+          <Watch namespace={tenant.namespace} tenant={tenant.name} />
+        )}
+        {selectedTab === 4 && tenant !== null && (
+          <Heal namespace={tenant.namespace} tenant={tenant.name} />
+        )}
      </Grid>
    </React.Fragment>
  );
--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/Watch/Watch.tsx
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/Watch/Watch.tsx
@@ -16,22 +16,21 @@
 import React, { useEffect, useState } from "react";
 import { Button, Grid, TextField, InputBase } from "@material-ui/core";
 import { IMessageEvent, w3cwebsocket as W3CWebSocket } from "websocket";
-import { AppState } from "../../../store";
+import { AppState } from "../../../../../store";
 import { connect } from "react-redux";
 import { watchMessageReceived, watchResetMessages } from "./actions";
 import { EventInfo, BucketList, Bucket } from "./types";
 import { createStyles, Theme, withStyles } from "@material-ui/core/styles";
-import { niceBytes, timeFromDate } from "../../../common/utils";
-import { wsProtocol } from "../../../utils/wsUtils";
-import api from "../../../common/api";
+import { niceBytes, timeFromDate } from "../../../../../common/utils";
+import { wsProtocol } from "../../../../../utils/wsUtils";
+import api from "../../../../../common/api";
 import { FormControl, MenuItem, Select } from "@material-ui/core";
 import {
  actionsTray,
  containerForHeader,
  searchField,
-} from "../Common/FormComponents/common/styleLibrary";
-import PageHeader from "../Common/PageHeader/PageHeader";
-import TableWrapper from "../Common/TableWrapper/TableWrapper";
+} from "../../../Common/FormComponents/common/styleLibrary";
+import TableWrapper from "../../../Common/TableWrapper/TableWrapper";

 const styles = (theme: Theme) =>
  createStyles({
@@ -63,7 +62,7 @@ const SelectStyled = withStyles((theme: Theme) =>
  createStyles({
    root: {
      width: 450,
-      lineHeight: 1,
+      lineHeight: "50px",
      "label + &": {
        marginTop: theme.spacing(3),
      },
@@ -72,8 +71,10 @@ const SelectStyled = withStyles((theme: Theme) =>
      },
    },
    input: {
+      height: 50,
      fontSize: 13,
-      lineHeight: 15,
+      lineHeight: "50px",
+      width: 450,
    },
  })
 )(InputBase);
@@ -83,6 +84,8 @@ interface IWatch {
  watchMessageReceived: typeof watchMessageReceived;
  watchResetMessages: typeof watchResetMessages;
  messages: EventInfo[];
+  namespace: string;
+  tenant: string;
 }

 const Watch = ({
@@ -90,6 +93,8 @@ const Watch = ({
  watchMessageReceived,
  watchResetMessages,
  messages,
+  namespace,
+  tenant,
 }: IWatch) => {
  const [start, setStart] = useState(false);
  const [bucketName, setBucketName] = useState("Select Bucket");
@@ -99,7 +104,7 @@ const Watch = ({

  const fetchBucketList = () => {
    api
-      .invoke("GET", `/api/v1/buckets`)
+      .invoke("GET", `/api/v1/operator/${namespace}/${tenant}/buckets`)
      .then((res: BucketList) => {
        let buckets: Bucket[] = [];
        if (res.buckets !== null) {
@@ -125,7 +130,7 @@ const Watch = ({

      const wsProt = wsProtocol(url.protocol);
      const c = new W3CWebSocket(
-        `${wsProt}://${url.hostname}:${port}/ws/watch/${bucketName}?prefix=${prefix}&suffix=${suffix}`
+        `${wsProt}://${url.hostname}:${port}/ws/watch/${namespace}/${tenant}/${bucketName}?prefix=${prefix}&suffix=${suffix}`
      );

      let interval: any | null = null;
@@ -146,6 +151,8 @@ const Watch = ({
        c.onclose = () => {
          clearInterval(interval);
          console.log("connection closed by server");
+          // reset start status
+          setStart(false);
        };
        return () => {
          // close websocket on useEffect cleanup
@@ -174,103 +181,98 @@ const Watch = ({
  }));

  return (
-    <React.Fragment>
-      <PageHeader label="Watch" />
-      <Grid container>
-        <Grid item xs={12} className={classes.container}>
-          <Grid item xs={12} className={classes.actionsTray}>
-            <FormControl variant="outlined">
-              <Select
-                id="bucket-name"
-                name="bucket-name"
-                value={bucketName}
-                onChange={(e) => {
-                  setBucketName(e.target.value as string);
-                }}
-                className={classes.searchField}
-                disabled={start}
-                input={<SelectStyled />}
-              >
-                <MenuItem
-                  value={bucketName}
-                  key={`select-bucket-name-default`}
-                  disabled={true}
-                >
-                  Select Bucket
-                </MenuItem>
-                {bucketNames.map((option) => (
-                  <MenuItem
-                    value={option.value}
-                    key={`select-bucket-name-${option.label}`}
-                  >
-                    {option.label}
-                  </MenuItem>
-                ))}
-              </Select>
-            </FormControl>
-            <TextField
-              placeholder="Prefix"
-              className={`${classes.searchField} ${classes.searchPrefix}`}
-              id="prefix-resource"
-              label=""
-              disabled={start}
-              InputProps={{
-                disableUnderline: true,
-              }}
-              onChange={(e) => {
-                setPrefix(e.target.value);
-              }}
-            />
-            <TextField
-              placeholder="Suffix"
-              className={`${classes.searchField} ${classes.searchPrefix}`}
-              id="suffix-resource"
-              label=""
-              disabled={start}
-              InputProps={{
-                disableUnderline: true,
-              }}
-              onChange={(e) => {
-                setSuffix(e.target.value);
-              }}
-            />
-            <Button
-              type="submit"
-              variant="contained"
-              color="primary"
-              disabled={start}
-              onClick={() => setStart(true)}
+    <Grid item xs={12}>
+      <Grid item xs={12} className={classes.actionsTray}>
+        <FormControl variant="outlined">
+          <Select
+            id="bucket-name"
+            name="bucket-name"
+            value={bucketName}
+            onChange={(e) => {
+              setBucketName(e.target.value as string);
+            }}
+            className={classes.searchField}
+            disabled={start}
+            input={<SelectStyled />}
+          >
+            <MenuItem
+              value={bucketName}
+              key={`select-bucket-name-default`}
+              disabled={true}
            >
-              Start
-            </Button>
-          </Grid>
-          <Grid item xs={12}>
-            <br />
-          </Grid>
-          <TableWrapper
-            columns={[
-              {
-                label: "Time",
-                elementKey: "Time",
-                renderFunction: timeFromDate,
-              },
-              {
-                label: "Size",
-                elementKey: "Size",
-                renderFunction: niceBytes,
-              },
-              { label: "Type", elementKey: "Type" },
-              { label: "Path", elementKey: "Path" },
-            ]}
-            records={messages}
-            entityName={"Watch"}
-            customEmptyMessage={"No Changes at this time"}
-            idField={"watch_table"}
-            isLoading={false}
-          />
-        </Grid>
+              Select Bucket
+            </MenuItem>
+            {bucketNames.map((option) => (
+              <MenuItem
+                value={option.value}
+                key={`select-bucket-name-${option.label}`}
+              >
+                {option.label}
+              </MenuItem>
+            ))}
+          </Select>
+        </FormControl>
+        <TextField
+          placeholder="Prefix"
+          className={`${classes.searchField} ${classes.searchPrefix}`}
+          id="prefix-resource"
+          label=""
+          disabled={start}
+          InputProps={{
+            disableUnderline: true,
+          }}
+          onChange={(e) => {
+            setPrefix(e.target.value);
+          }}
+        />
+        <TextField
+          placeholder="Suffix"
+          className={`${classes.searchField} ${classes.searchPrefix}`}
+          id="suffix-resource"
+          label=""
+          disabled={start}
+          InputProps={{
+            disableUnderline: true,
+          }}
+          onChange={(e) => {
+            setSuffix(e.target.value);
+          }}
+        />
+        <Button
+          type="submit"
+          variant="contained"
+          color="primary"
+          disabled={start}
+          onClick={() => setStart(true)}
+        >
+          Start
+        </Button>
      </Grid>
-    </React.Fragment>
+      <Grid item xs={12}>
+        <br />
+      </Grid>
+      <TableWrapper
+        columns={[
+          {
+            label: "Time",
+            elementKey: "Time",
+            renderFunction: timeFromDate,
+          },
+          {
+            label: "Size",
+            elementKey: "Size",
+            renderFunction: niceBytes,
+          },
+          { label: "Type", elementKey: "Type" },
+          { label: "Path", elementKey: "Path" },
+        ]}
+        records={messages}
+        entityName={"Watch"}
+        customEmptyMessage={"No Changes at this time"}
+        idField={"watch_table"}
+        isLoading={false}
+      />
+    </Grid>
  );
 };

--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/Watch/actions.ts
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/Watch/actions.ts
--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/Watch/reducers.ts
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/Watch/reducers.ts
--- a/portal-ui/src/screens/Console/Tenants/TenantDetails/Watch/types.ts
+++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/Watch/types.ts
--- a/portal-ui/src/store.ts
+++ b/portal-ui/src/store.ts
@@ -19,7 +19,7 @@ import thunk from "redux-thunk";
 import { systemReducer } from "./reducer";
 import { traceReducer } from "./screens/Console/Tenants/TenantDetails/Trace/reducers";
 import { logReducer } from "./screens/Console/Tenants/TenantDetails/Logs/reducers";
-import { watchReducer } from "./screens/Console/Watch/reducers";
+import { watchReducer } from "./screens/Console/Tenants/TenantDetails/Watch/reducers";
 import { consoleReducer } from "./screens/Console/reducer";
 import { bucketsReducer } from "./screens/Console/Buckets/reducers";
 import { objectBrowserReducer } from "./screens/Console/ObjectBrowser/reducers";
--- a/restapi/admin_console.go
+++ b/restapi/admin_console.go
@@ -98,22 +98,26 @@ func getLogTime(lt string) string {

 // getConsoleLogOptionsFromReq return tenant name from url
 // path come as : `/console/<namespace>/<tenantName>`
-func getConsoleLogOptionsFromReq(req *http.Request) (namespace, tenant string) {
+func getConsoleLogOptionsFromReq(req *http.Request) (namespace, tenant string, err error) {
 	re := regexp.MustCompile(`(/console/)(.*?)/(.*?)(\?.*?$|$)`)
 	matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
-	// len matches is always 4
+	if len(matches) == 0 || len(matches[0]) < 4 {
+		return "", "", fmt.Errorf("invalid url: %s", req.URL.Path)
+	}
 	namespace = strings.TrimSpace(string(matches[0][2]))
 	tenant = strings.TrimSpace(string(matches[0][3]))
-	return namespace, tenant
+	return namespace, tenant, nil
 }

 // getTraceOptionsFromReq return tenant name from url
 // path come as : `/trace/<namespace>/<tenantName>`
-func getTraceOptionsFromReq(req *http.Request) (namespace, tenant string) {
+func getTraceOptionsFromReq(req *http.Request) (namespace, tenant string, err error) {
 	re := regexp.MustCompile(`(/trace/)(.*?)/(.*?)(\?.*?$|$)`)
 	matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
-	// len matches is always 4
+	if len(matches) == 0 || len(matches[0]) < 4 {
+		return "", "", fmt.Errorf("invalid url: %s", req.URL.Path)
+	}
 	namespace = strings.TrimSpace(string(matches[0][2]))
 	tenant = strings.TrimSpace(string(matches[0][3]))
-	return namespace, tenant
+	return namespace, tenant, nil
 }
--- a/restapi/admin_heal.go
+++ b/restapi/admin_heal.go
@@ -103,6 +103,8 @@ type healStatus struct {
 }

 type healOptions struct {
+	Namespace  string
+	Tenant     string
 	BucketName string
 	Prefix     string
 	ForceStart bool
@@ -313,18 +315,22 @@ func getHRITypeAndName(i madmin.HealResultItem) (typ, name string) {
 }

 // getHealOptionsFromReq return options from request for healing process
-// path come as : `/heal/bucket1` and query params come on request form
+// path come as : `/heal/<namespace>/<tenantName>/bucket1`
+// and query params come on request form
 func getHealOptionsFromReq(req *http.Request) (*healOptions, error) {
 	hOptions := healOptions{}
-	re := regexp.MustCompile(`(/heal/)(.*?)(\?.*?$|$)`)
+	re := regexp.MustCompile(`(/heal/)(.*?)/(.*?)/(.*?)(\?.*?$|$)`)
 	matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
-	// len matches is always 3
 	// matches comes as e.g.
-	// [["...", "/heal/" "bucket1"]]
+	// [["...", "/heal/", "namespace", "tenant", "bucket1"]]
 	// [["/heal/" "/heal/" ""]]

-	// bucket name is on the second group, third position
-	hOptions.BucketName = strings.TrimSpace(string(matches[0][2]))
+	if len(matches) == 0 || len(matches[0]) < 5 {
+		return nil, fmt.Errorf("invalid url: %s", req.URL.Path)
+	}
+	hOptions.Namespace = strings.TrimSpace(string(matches[0][2]))
+	hOptions.Tenant = strings.TrimSpace(string(matches[0][3]))
+	hOptions.BucketName = strings.TrimSpace(string(matches[0][4]))
 	hOptions.Prefix = req.FormValue("prefix")
 	hOptions.HealOpts.ScanMode = transformScanStr(req.FormValue("scan"))

--- a/restapi/admin_heal_test.go
+++ b/restapi/admin_heal_test.go
@@ -205,42 +205,33 @@ func TestHeal(t *testing.T) {
 	}

 	// Test-3: getHealOptionsFromReq return heal options from request
-	u, _ := url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
+	u, _ := url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
 	req := &http.Request{
 		URL: u,
 	}
 	opts, err := getHealOptionsFromReq(req)
-	if err != nil {
-		t.Errorf("Failed on %s:, error occurred: %s", "getHealOptionsFromReq", err.Error())
-	}
-	expectedOptions := healOptions{
-		BucketName: "bucket1",
-		ForceStart: true,
-		ForceStop:  true,
-		Prefix:     "file/",
-		HealOpts: madmin.HealOpts{
-			Recursive: true,
-			DryRun:    true,
-			ScanMode:  madmin.HealDeepScan,
-		},
-	}
-	assert.Equal(expectedOptions.BucketName, opts.BucketName)
-	assert.Equal(expectedOptions.Prefix, opts.Prefix)
-	assert.Equal(expectedOptions.Recursive, opts.Recursive)
-	assert.Equal(expectedOptions.ForceStart, opts.ForceStart)
-	assert.Equal(expectedOptions.DryRun, opts.DryRun)
-	assert.Equal(expectedOptions.ScanMode, opts.ScanMode)
-	// Test-3: getHealOptionsFromReq return error if boolean value not valid
-	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=nonbool&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
-	req = &http.Request{
-		URL: u,
-	}
-	opts, err = getHealOptionsFromReq(req)
-	if assert.Error(err) {
-		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
+	if assert.NoError(err) {
+		expectedOptions := healOptions{
+			BucketName: "bucket1",
+			ForceStart: true,
+			ForceStop:  true,
+			Prefix:     "file/",
+			HealOpts: madmin.HealOpts{
+				Recursive: true,
+				DryRun:    true,
+				ScanMode:  madmin.HealDeepScan,
+			},
+		}
+		assert.Equal(expectedOptions.BucketName, opts.BucketName)
+		assert.Equal(expectedOptions.Prefix, opts.Prefix)
+		assert.Equal(expectedOptions.Recursive, opts.Recursive)
+		assert.Equal(expectedOptions.ForceStart, opts.ForceStart)
+		assert.Equal(expectedOptions.DryRun, opts.DryRun)
+		assert.Equal(expectedOptions.ScanMode, opts.ScanMode)
 	}
+
 	// Test-4: getHealOptionsFromReq return error if boolean value not valid
-	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=nonbool&dry-run=true&scan=deep")
+	u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=nonbool&force-start=true&force-stop=true&remove=true&dry-run=true&scan=deep")
 	req = &http.Request{
 		URL: u,
 	}
@@ -249,7 +240,7 @@ func TestHeal(t *testing.T) {
 		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
 	}
 	// Test-5: getHealOptionsFromReq return error if boolean value not valid
-	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=nonbool&force-stop=true&remove=true&dry-run=true&scan=deep")
+	u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=nonbool&dry-run=true&scan=deep")
 	req = &http.Request{
 		URL: u,
 	}
@@ -258,7 +249,7 @@ func TestHeal(t *testing.T) {
 		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
 	}
 	// Test-6: getHealOptionsFromReq return error if boolean value not valid
-	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=nonbool&remove=true&dry-run=true&scan=deep")
+	u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=nonbool&force-stop=true&remove=true&dry-run=true&scan=deep")
 	req = &http.Request{
 		URL: u,
 	}
@@ -267,7 +258,16 @@ func TestHeal(t *testing.T) {
 		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
 	}
 	// Test-7: getHealOptionsFromReq return error if boolean value not valid
-	u, _ = url.Parse("http://localhost/api/v1/heal/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=nonbool&scan=deep")
+	u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=nonbool&remove=true&dry-run=true&scan=deep")
+	req = &http.Request{
+		URL: u,
+	}
+	opts, err = getHealOptionsFromReq(req)
+	if assert.Error(err) {
+		assert.Equal("strconv.ParseBool: parsing \"nonbool\": invalid syntax", err.Error())
+	}
+	// Test-8: getHealOptionsFromReq return error if boolean value not valid
+	u, _ = url.Parse("http://localhost/api/v1/heal/namespace/tenantName/bucket1?prefix=file/&recursive=true&force-start=true&force-stop=true&remove=true&dry-run=nonbool&scan=deep")
 	req = &http.Request{
 		URL: u,
 	}
--- a/restapi/admin_tenants.go
+++ b/restapi/admin_tenants.go
@@ -231,6 +231,24 @@ func GetTenantServiceURL(mi *operator.Tenant) (svcURL string) {
 }

 func getTenantAdminClient(ctx context.Context, client K8sClientI, tenant *operator.Tenant, svcURL string, insecure bool) (*madmin.AdminClient, error) {
+	tenantCreds, err := getTenantCreds(ctx, client, tenant)
+	if err != nil {
+		return nil, err
+	}
+	sessionToken := ""
+	mAdmin, pErr := NewAdminClientWithInsecure(svcURL, tenantCreds.accessKey, tenantCreds.secretKey, sessionToken, insecure)
+	if pErr != nil {
+		return nil, pErr.Cause
+	}
+	return mAdmin, nil
+}
+
+type tenantKeys struct {
+	accessKey string
+	secretKey string
+}
+
+func getTenantCreds(ctx context.Context, client K8sClientI, tenant *operator.Tenant) (*tenantKeys, error) {
 	if tenant == nil || tenant.Spec.CredsSecret == nil {
 		return nil, errors.New("invalid arguments")
 	}
@@ -239,12 +257,12 @@ func getTenantAdminClient(ctx context.Context, client K8sClientI, tenant *operat
 	if err != nil {
 		return nil, err
 	}
-	accessKey, ok := creds.Data["accesskey"]
+	tenantAccessKey, ok := creds.Data["accesskey"]
 	if !ok {
 		log.Println("tenant's secret doesn't contain accesskey")
 		return nil, errorGeneric
 	}
-	secretkey, ok := creds.Data["secretkey"]
+	tenantSecretKey, ok := creds.Data["secretkey"]
 	if !ok {
 		log.Println("tenant's secret doesn't contain secretkey")
 		return nil, errorGeneric
@@ -252,14 +270,7 @@ func getTenantAdminClient(ctx context.Context, client K8sClientI, tenant *operat
 	// TODO:
 	// We need to avoid using minio root credentials to talk to tenants, and instead use a different user credentials
 	// when that its implemented we also need to check here if the tenant has LDAP enabled so we authenticate first against AD
-	tenantAccessKey := string(accessKey)
-	tenantSecretKey := string(secretkey)
-	sessionToken := ""
-	mAdmin, pErr := NewAdminClientWithInsecure(svcURL, tenantAccessKey, tenantSecretKey, sessionToken, insecure)
-	if pErr != nil {
-		return nil, pErr.Cause
-	}
-	return mAdmin, nil
+	return &tenantKeys{accessKey: string(tenantAccessKey), secretKey: string(tenantSecretKey)}, nil
 }

 func getTenant(ctx context.Context, operatorClient OperatorClientI, namespace, tenantName string) (*operator.Tenant, error) {
@@ -1052,7 +1063,8 @@ func getTenantUsageResponse(session *models.Principal, params admin_api.GetTenan
 		k8sClient,
 		minTenant,
 		svcURL,
-		true)
+		true,
+	)
 	if err != nil {
 		return nil, prepareError(err, errorUnableToGetTenantUsage)
 	}
--- a/restapi/client.go
+++ b/restapi/client.go
@@ -364,9 +364,32 @@ func newS3BucketClient(claims *models.Principal, bucketName string, prefix strin
 	return s3Client, nil
 }

+// newTenantS3BucketClient creates a new mc S3Client for an specific tenant on a namespace to talk to the server based on a bucket
+func newTenantS3BucketClient(claims *models.Principal, tenantEndpoint, bucketName string, isSecure bool) (*mc.S3Client, error) {
+	if strings.TrimSpace(bucketName) != "" {
+		tenantEndpoint += fmt.Sprintf("/%s", bucketName)
+	}
+
+	if claims == nil {
+		return nil, fmt.Errorf("the provided credentials are invalid")
+	}
+
+	s3Config := newS3Config(tenantEndpoint, claims.AccessKeyID, claims.SecretAccessKey, claims.SessionToken, !isSecure)
+	client, pErr := mc.S3New(s3Config)
+	if pErr != nil {
+		return nil, pErr.Cause
+	}
+	s3Client, ok := client.(*mc.S3Client)
+	if !ok {
+		return nil, fmt.Errorf("the provided url doesn't point to a S3 server")
+	}
+
+	return s3Client, nil
+}
+
 // newS3Config simply creates a new Config struct using the passed
 // parameters.
-func newS3Config(endpoint, accessKey, secretKey, sessionToken string, isSecure bool) *mc.Config {
+func newS3Config(endpoint, accessKey, secretKey, sessionToken string, insecure bool) *mc.Config {
 	// We have a valid alias and hostConfig. We populate the
 	// consoleCredentials from the match found in the config file.
 	s3Config := new(mc.Config)
@@ -375,12 +398,13 @@ func newS3Config(endpoint, accessKey, secretKey, sessionToken string, isSecure b
 	s3Config.AppVersion = ""     // TODO: get this from constant or build
 	s3Config.AppComments = []string{}
 	s3Config.Debug = false
-	s3Config.Insecure = isSecure
+	s3Config.Insecure = insecure

 	s3Config.HostURL = endpoint
 	s3Config.AccessKey = accessKey
 	s3Config.SecretKey = secretKey
 	s3Config.SessionToken = sessionToken
 	s3Config.Signature = "S3v4"
+
 	return s3Config
 }
--- a/restapi/configure_console.go
+++ b/restapi/configure_console.go
@@ -133,6 +133,8 @@ func configureAPI(api *operations.ConsoleAPI) http.Handler {
 	registerObjectsHandlers(api)
 	// Register Bucket Quota's Handlers
 	registerBucketQuotaHandlers(api)
+	// List buckets
+	registerOperatorBucketsHandlers(api)

 	api.PreServerShutdown = func() {}

--- a/restapi/embedded_spec.go
+++ b/restapi/embedded_spec.go
@@ -1982,6 +1982,43 @@ func init() {
        }
      }
    },
+    "/operator/{namespace}/{tenant}/buckets": {
+      "get": {
+        "tags": [
+          "OperatorAPI"
+        ],
+        "summary": "List Buckets for Operator Console",
+        "operationId": "OperatorListBuckets",
+        "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/listBucketsResponse"
+            }
+          },
+          "default": {
+            "description": "Generic error response.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        }
+      }
+    },
    "/policies": {
      "get": {
        "tags": [
@@ -6848,6 +6885,43 @@ func init() {
        }
      }
    },
+    "/operator/{namespace}/{tenant}/buckets": {
+      "get": {
+        "tags": [
+          "OperatorAPI"
+        ],
+        "summary": "List Buckets for Operator Console",
+        "operationId": "OperatorListBuckets",
+        "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/listBucketsResponse"
+            }
+          },
+          "default": {
+            "description": "Generic error response.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        }
+      }
+    },
    "/policies": {
      "get": {
        "tags": [
--- a/restapi/operations/console_api.go
+++ b/restapi/operations/console_api.go
@@ -38,6 +38,7 @@ import (

 	"github.com/minio/console/models"
 	"github.com/minio/console/restapi/operations/admin_api"
+	"github.com/minio/console/restapi/operations/operator_api"
 	"github.com/minio/console/restapi/operations/user_api"
 )

@@ -220,6 +221,9 @@ func NewConsoleAPI(spec *loads.Document) *ConsoleAPI {
 		AdminAPINotificationEndpointListHandler: admin_api.NotificationEndpointListHandlerFunc(func(params admin_api.NotificationEndpointListParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation admin_api.NotificationEndpointList has not yet been implemented")
 		}),
+		OperatorAPIOperatorListBucketsHandler: operator_api.OperatorListBucketsHandlerFunc(func(params operator_api.OperatorListBucketsParams, principal *models.Principal) middleware.Responder {
+			return middleware.NotImplemented("operation operator_api.OperatorListBuckets has not yet been implemented")
+		}),
 		AdminAPIPolicyInfoHandler: admin_api.PolicyInfoHandlerFunc(func(params admin_api.PolicyInfoParams, principal *models.Principal) middleware.Responder {
 			return middleware.NotImplemented("operation admin_api.PolicyInfo has not yet been implemented")
 		}),
@@ -457,6 +461,8 @@ type ConsoleAPI struct {
 	UserAPIMakeBucketHandler user_api.MakeBucketHandler
 	// AdminAPINotificationEndpointListHandler sets the operation handler for the notification endpoint list operation
 	AdminAPINotificationEndpointListHandler admin_api.NotificationEndpointListHandler
+	// OperatorAPIOperatorListBucketsHandler sets the operation handler for the operator list buckets operation
+	OperatorAPIOperatorListBucketsHandler operator_api.OperatorListBucketsHandler
 	// AdminAPIPolicyInfoHandler sets the operation handler for the policy info operation
 	AdminAPIPolicyInfoHandler admin_api.PolicyInfoHandler
 	// UserAPIPostBucketsBucketNameObjectsUploadHandler sets the operation handler for the post buckets bucket name objects upload operation
@@ -743,6 +749,9 @@ func (o *ConsoleAPI) Validate() error {
 	if o.AdminAPINotificationEndpointListHandler == nil {
 		unregistered = append(unregistered, "admin_api.NotificationEndpointListHandler")
 	}
+	if o.OperatorAPIOperatorListBucketsHandler == nil {
+		unregistered = append(unregistered, "operator_api.OperatorListBucketsHandler")
+	}
 	if o.AdminAPIPolicyInfoHandler == nil {
 		unregistered = append(unregistered, "admin_api.PolicyInfoHandler")
 	}
@@ -1137,6 +1146,10 @@ func (o *ConsoleAPI) initHandlerCache() {
 	if o.handlers["GET"] == nil {
 		o.handlers["GET"] = make(map[string]http.Handler)
 	}
+	o.handlers["GET"]["/operator/{namespace}/{tenant}/buckets"] = operator_api.NewOperatorListBuckets(o.context, o.OperatorAPIOperatorListBucketsHandler)
+	if o.handlers["GET"] == nil {
+		o.handlers["GET"] = make(map[string]http.Handler)
+	}
 	o.handlers["GET"]["/policies/{name}"] = admin_api.NewPolicyInfo(o.context, o.AdminAPIPolicyInfoHandler)
 	if o.handlers["POST"] == nil {
 		o.handlers["POST"] = make(map[string]http.Handler)
--- a/restapi/operations/operator_api/operator_list_buckets.go
+++ b/restapi/operations/operator_api/operator_list_buckets.go
@@ -0,0 +1,90 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package operator_api
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime/middleware"
+
+	"github.com/minio/console/models"
+)
+
+// OperatorListBucketsHandlerFunc turns a function with the right signature into a operator list buckets handler
+type OperatorListBucketsHandlerFunc func(OperatorListBucketsParams, *models.Principal) middleware.Responder
+
+// Handle executing the request and returning a response
+func (fn OperatorListBucketsHandlerFunc) Handle(params OperatorListBucketsParams, principal *models.Principal) middleware.Responder {
+	return fn(params, principal)
+}
+
+// OperatorListBucketsHandler interface for that can handle valid operator list buckets params
+type OperatorListBucketsHandler interface {
+	Handle(OperatorListBucketsParams, *models.Principal) middleware.Responder
+}
+
+// NewOperatorListBuckets creates a new http.Handler for the operator list buckets operation
+func NewOperatorListBuckets(ctx *middleware.Context, handler OperatorListBucketsHandler) *OperatorListBuckets {
+	return &OperatorListBuckets{Context: ctx, Handler: handler}
+}
+
+/*OperatorListBuckets swagger:route GET /operator/{namespace}/{tenant}/buckets OperatorAPI operatorListBuckets
+
+List Buckets for Operator Console
+
+*/
+type OperatorListBuckets struct {
+	Context *middleware.Context
+	Handler OperatorListBucketsHandler
+}
+
+func (o *OperatorListBuckets) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	route, rCtx, _ := o.Context.RouteInfo(r)
+	if rCtx != nil {
+		r = rCtx
+	}
+	var Params = NewOperatorListBucketsParams()
+
+	uprinc, aCtx, err := o.Context.Authorize(r, route)
+	if err != nil {
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+	if aCtx != nil {
+		r = aCtx
+	}
+	var principal *models.Principal
+	if uprinc != nil {
+		principal = uprinc.(*models.Principal) // this is really a models.Principal, I promise
+	}
+
+	if err := o.Context.BindValidRequest(r, route, &Params); err != nil { // bind params
+		o.Context.Respond(rw, r, route.Produces, route, err)
+		return
+	}
+
+	res := o.Handler.Handle(Params, principal) // actually handle the request
+
+	o.Context.Respond(rw, r, route.Produces, route, res)
+
+}
--- a/restapi/operations/operator_api/operator_list_buckets_parameters.go
+++ b/restapi/operations/operator_api/operator_list_buckets_parameters.go
@@ -0,0 +1,114 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package operator_api
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/errors"
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/go-openapi/strfmt"
+)
+
+// NewOperatorListBucketsParams creates a new OperatorListBucketsParams object
+// no default values defined in spec.
+func NewOperatorListBucketsParams() OperatorListBucketsParams {
+
+	return OperatorListBucketsParams{}
+}
+
+// OperatorListBucketsParams contains all the bound params for the operator list buckets operation
+// typically these are obtained from a http.Request
+//
+// swagger:parameters OperatorListBuckets
+type OperatorListBucketsParams struct {
+
+	// HTTP Request Object
+	HTTPRequest *http.Request `json:"-"`
+
+	/*
+	  Required: true
+	  In: path
+	*/
+	Namespace string
+	/*
+	  Required: true
+	  In: path
+	*/
+	Tenant string
+}
+
+// BindRequest both binds and validates a request, it assumes that complex things implement a Validatable(strfmt.Registry) error interface
+// for simple values it will use straight method calls.
+//
+// To ensure default values, the struct must have been initialized with NewOperatorListBucketsParams() beforehand.
+func (o *OperatorListBucketsParams) BindRequest(r *http.Request, route *middleware.MatchedRoute) error {
+	var res []error
+
+	o.HTTPRequest = r
+
+	rNamespace, rhkNamespace, _ := route.Params.GetOK("namespace")
+	if err := o.bindNamespace(rNamespace, rhkNamespace, route.Formats); err != nil {
+		res = append(res, err)
+	}
+
+	rTenant, rhkTenant, _ := route.Params.GetOK("tenant")
+	if err := o.bindTenant(rTenant, rhkTenant, route.Formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+// bindNamespace binds and validates parameter Namespace from path.
+func (o *OperatorListBucketsParams) bindNamespace(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: true
+	// Parameter is provided by construction from the route
+
+	o.Namespace = raw
+
+	return nil
+}
+
+// bindTenant binds and validates parameter Tenant from path.
+func (o *OperatorListBucketsParams) bindTenant(rawData []string, hasKey bool, formats strfmt.Registry) error {
+	var raw string
+	if len(rawData) > 0 {
+		raw = rawData[len(rawData)-1]
+	}
+
+	// Required: true
+	// Parameter is provided by construction from the route
+
+	o.Tenant = raw
+
+	return nil
+}
--- a/restapi/operations/operator_api/operator_list_buckets_responses.go
+++ b/restapi/operations/operator_api/operator_list_buckets_responses.go
@@ -0,0 +1,133 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package operator_api
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
+
+import (
+	"net/http"
+
+	"github.com/go-openapi/runtime"
+
+	"github.com/minio/console/models"
+)
+
+// OperatorListBucketsOKCode is the HTTP code returned for type OperatorListBucketsOK
+const OperatorListBucketsOKCode int = 200
+
+/*OperatorListBucketsOK A successful response.
+
+swagger:response operatorListBucketsOK
+*/
+type OperatorListBucketsOK struct {
+
+	/*
+	  In: Body
+	*/
+	Payload *models.ListBucketsResponse `json:"body,omitempty"`
+}
+
+// NewOperatorListBucketsOK creates OperatorListBucketsOK with default headers values
+func NewOperatorListBucketsOK() *OperatorListBucketsOK {
+
+	return &OperatorListBucketsOK{}
+}
+
+// WithPayload adds the payload to the operator list buckets o k response
+func (o *OperatorListBucketsOK) WithPayload(payload *models.ListBucketsResponse) *OperatorListBucketsOK {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the operator list buckets o k response
+func (o *OperatorListBucketsOK) SetPayload(payload *models.ListBucketsResponse) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *OperatorListBucketsOK) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(200)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}
+
+/*OperatorListBucketsDefault Generic error response.
+
+swagger:response operatorListBucketsDefault
+*/
+type OperatorListBucketsDefault struct {
+	_statusCode int
+
+	/*
+	  In: Body
+	*/
+	Payload *models.Error `json:"body,omitempty"`
+}
+
+// NewOperatorListBucketsDefault creates OperatorListBucketsDefault with default headers values
+func NewOperatorListBucketsDefault(code int) *OperatorListBucketsDefault {
+	if code <= 0 {
+		code = 500
+	}
+
+	return &OperatorListBucketsDefault{
+		_statusCode: code,
+	}
+}
+
+// WithStatusCode adds the status to the operator list buckets default response
+func (o *OperatorListBucketsDefault) WithStatusCode(code int) *OperatorListBucketsDefault {
+	o._statusCode = code
+	return o
+}
+
+// SetStatusCode sets the status to the operator list buckets default response
+func (o *OperatorListBucketsDefault) SetStatusCode(code int) {
+	o._statusCode = code
+}
+
+// WithPayload adds the payload to the operator list buckets default response
+func (o *OperatorListBucketsDefault) WithPayload(payload *models.Error) *OperatorListBucketsDefault {
+	o.Payload = payload
+	return o
+}
+
+// SetPayload sets the payload to the operator list buckets default response
+func (o *OperatorListBucketsDefault) SetPayload(payload *models.Error) {
+	o.Payload = payload
+}
+
+// WriteResponse to the client
+func (o *OperatorListBucketsDefault) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
+
+	rw.WriteHeader(o._statusCode)
+	if o.Payload != nil {
+		payload := o.Payload
+		if err := producer.Produce(rw, payload); err != nil {
+			panic(err) // let the recovery middleware deal with this
+		}
+	}
+}
--- a/restapi/operations/operator_api/operator_list_buckets_urlbuilder.go
+++ b/restapi/operations/operator_api/operator_list_buckets_urlbuilder.go
@@ -0,0 +1,124 @@
+// Code generated by go-swagger; DO NOT EDIT.
+
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+package operator_api
+
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the generate command
+
+import (
+	"errors"
+	"net/url"
+	golangswaggerpaths "path"
+	"strings"
+)
+
+// OperatorListBucketsURL generates an URL for the operator list buckets operation
+type OperatorListBucketsURL struct {
+	Namespace string
+	Tenant    string
+
+	_basePath string
+	// avoid unkeyed usage
+	_ struct{}
+}
+
+// WithBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *OperatorListBucketsURL) WithBasePath(bp string) *OperatorListBucketsURL {
+	o.SetBasePath(bp)
+	return o
+}
+
+// SetBasePath sets the base path for this url builder, only required when it's different from the
+// base path specified in the swagger spec.
+// When the value of the base path is an empty string
+func (o *OperatorListBucketsURL) SetBasePath(bp string) {
+	o._basePath = bp
+}
+
+// Build a url path and query string
+func (o *OperatorListBucketsURL) Build() (*url.URL, error) {
+	var _result url.URL
+
+	var _path = "/operator/{namespace}/{tenant}/buckets"
+
+	namespace := o.Namespace
+	if namespace != "" {
+		_path = strings.Replace(_path, "{namespace}", namespace, -1)
+	} else {
+		return nil, errors.New("namespace is required on OperatorListBucketsURL")
+	}
+
+	tenant := o.Tenant
+	if tenant != "" {
+		_path = strings.Replace(_path, "{tenant}", tenant, -1)
+	} else {
+		return nil, errors.New("tenant is required on OperatorListBucketsURL")
+	}
+
+	_basePath := o._basePath
+	if _basePath == "" {
+		_basePath = "/api/v1"
+	}
+	_result.Path = golangswaggerpaths.Join(_basePath, _path)
+
+	return &_result, nil
+}
+
+// Must is a helper function to panic when the url builder returns an error
+func (o *OperatorListBucketsURL) Must(u *url.URL, err error) *url.URL {
+	if err != nil {
+		panic(err)
+	}
+	if u == nil {
+		panic("url can't be nil")
+	}
+	return u
+}
+
+// String returns the string representation of the path with query string
+func (o *OperatorListBucketsURL) String() string {
+	return o.Must(o.Build()).String()
+}
+
+// BuildFull builds a full url with scheme, host, path and query string
+func (o *OperatorListBucketsURL) BuildFull(scheme, host string) (*url.URL, error) {
+	if scheme == "" {
+		return nil, errors.New("scheme is required for a full url on OperatorListBucketsURL")
+	}
+	if host == "" {
+		return nil, errors.New("host is required for a full url on OperatorListBucketsURL")
+	}
+
+	base, err := o.Build()
+	if err != nil {
+		return nil, err
+	}
+
+	base.Scheme = scheme
+	base.Host = host
+	return base, nil
+}
+
+// StringFull returns the string representation of a complete url
+func (o *OperatorListBucketsURL) StringFull(scheme, host string) string {
+	return o.Must(o.BuildFull(scheme, host)).String()
+}
--- a/restapi/operator_buckets.go
+++ b/restapi/operator_buckets.go
@@ -0,0 +1,94 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2020 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 restapi
+
+import (
+	"context"
+	"time"
+
+	"github.com/go-openapi/runtime/middleware"
+	"github.com/minio/console/cluster"
+	"github.com/minio/console/models"
+	"github.com/minio/console/restapi/operations"
+	"github.com/minio/console/restapi/operations/operator_api"
+)
+
+func registerOperatorBucketsHandlers(api *operations.ConsoleAPI) {
+	// list buckets
+	api.OperatorAPIOperatorListBucketsHandler = operator_api.OperatorListBucketsHandlerFunc(func(params operator_api.OperatorListBucketsParams, session *models.Principal) middleware.Responder {
+		listBucketsResponse, err := getOperatorListBucketsResponse(session, params.Namespace, params.Tenant)
+		if err != nil {
+			return operator_api.NewOperatorListBucketsDefault(int(err.Code)).WithPayload(err)
+		}
+		return operator_api.NewOperatorListBucketsOK().WithPayload(listBucketsResponse)
+	})
+}
+
+// getListBucketsResponse performs listBuckets() and serializes it to the handler's output
+func getOperatorListBucketsResponse(session *models.Principal, namespace, tenant string) (*models.ListBucketsResponse, *models.Error) {
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	opClientClientSet, err := cluster.OperatorClient(session.SessionToken)
+	if err != nil {
+		return nil, prepareError(err)
+	}
+	clientSet, err := cluster.K8sClient(session.SessionToken)
+	if err != nil {
+		return nil, prepareError(err)
+	}
+
+	opClient := &operatorClient{
+		client: opClientClientSet,
+	}
+	k8sClient := &k8sClient{
+		client: clientSet,
+	}
+
+	minTenant, err := getTenant(ctx, opClient, namespace, tenant)
+	if err != nil {
+		return nil, prepareError(err)
+	}
+	minTenant.EnsureDefaults()
+
+	svcURL := GetTenantServiceURL(minTenant)
+	// getTenantAdminClient will use all certificates under ~/.console/certs/CAs to trust the TLS connections with MinIO tenants
+	mAdmin, err := getTenantAdminClient(
+		ctx,
+		k8sClient,
+		minTenant,
+		svcURL,
+		true,
+	)
+	if err != nil {
+		return nil, prepareError(err)
+	}
+	// create a minioClient interface implementation
+	// defining the client to be used
+	adminClient := adminClient{client: mAdmin}
+	buckets, err := getAccountUsageInfo(ctx, adminClient)
+	if err != nil {
+		return nil, prepareError(err)
+	}
+
+	// serialize output
+	listBucketsResponse := &models.ListBucketsResponse{
+		Buckets: buckets,
+		Total:   int64(len(buckets)),
+	}
+	return listBucketsResponse, nil
+}
--- a/restapi/user_buckets.go
+++ b/restapi/user_buckets.go
@@ -245,8 +245,8 @@ func getBucketVersionedResponse(session *models.Principal, bucketName string) (*
 	return listBucketsResponse, nil
 }

-// getaAcountUsageInfo fetches a list of all buckets allowed to that particular client from MinIO Servers
-func getaAcountUsageInfo(ctx context.Context, client MinioAdmin) ([]*models.Bucket, error) {
+// getAccountUsageInfo fetches a list of all buckets allowed to that particular client from MinIO Servers
+func getAccountUsageInfo(ctx context.Context, client MinioAdmin) ([]*models.Bucket, error) {
 	info, err := client.accountUsageInfo(ctx)
 	if err != nil {
 		return []*models.Bucket{}, err
@@ -271,7 +271,7 @@ func getListBucketsResponse(session *models.Principal) (*models.ListBucketsRespo
 	// create a minioClient interface implementation
 	// defining the client to be used
 	adminClient := adminClient{client: mAdmin}
-	buckets, err := getaAcountUsageInfo(ctx, adminClient)
+	buckets, err := getAccountUsageInfo(ctx, adminClient)
 	if err != nil {
 		return nil, prepareError(err)
 	}
--- a/restapi/user_buckets_test.go
+++ b/restapi/user_buckets_test.go
@@ -110,7 +110,7 @@ func TestListBucket(t *testing.T) {
 	// get list buckets response this response should have Name, CreationDate, Size and Access
 	// as part of of each bucket
 	function := "getaAcountUsageInfo()"
-	bucketList, err := getaAcountUsageInfo(ctx, adminClient)
+	bucketList, err := getAccountUsageInfo(ctx, adminClient)
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", function, err.Error())
 	}
@@ -127,7 +127,7 @@ func TestListBucket(t *testing.T) {
 	minioAccountUsageInfoMock = func(ctx context.Context) (madmin.AccountUsageInfo, error) {
 		return madmin.AccountUsageInfo{}, errors.New("error")
 	}
-	_, err = getaAcountUsageInfo(ctx, adminClient)
+	_, err = getAccountUsageInfo(ctx, adminClient)
 	if assert.Error(err) {
 		assert.Equal("error", err.Error())
 	}
--- a/restapi/user_watch.go
+++ b/restapi/user_watch.go
@@ -30,11 +30,13 @@ import (
 )

 type watchOptions struct {
+	Namespace  string
+	Tenant     string
 	BucketName string
 	mc.WatchOptions
 }

-func startWatch(ctx context.Context, conn WSConn, wsc MCClient, options watchOptions) error {
+func startWatch(ctx context.Context, conn WSConn, wsc MCClient, options *watchOptions) error {
 	wo, pErr := wsc.watch(ctx, options.WatchOptions)
 	if pErr != nil {
 		fmt.Println("error initializing watch:", pErr.Cause)
@@ -80,21 +82,26 @@ func startWatch(ctx context.Context, conn WSConn, wsc MCClient, options watchOpt

 // getWatchOptionsFromReq gets bucket name, events, prefix, suffix from a websocket
 // watch path if defined.
-// path come as : `/watch/bucket1` and query params come on request form
-func getWatchOptionsFromReq(req *http.Request) watchOptions {
+// path come as : `/watch/<namespace>/<tenantName>/bucket1` and query
+// params come on request form
+func getWatchOptionsFromReq(req *http.Request) (*watchOptions, error) {
 	wOptions := watchOptions{}
 	// Default Events if not defined
 	wOptions.Events = []string{"put", "get", "delete"}

-	re := regexp.MustCompile(`(/watch/)(.*?$)`)
+	re := regexp.MustCompile(`(/watch/)(.*?)/(.*?)/(.*?)(\?.*?$|$)`)
 	matches := re.FindAllSubmatch([]byte(req.URL.Path), -1)
-	// len matches is always 3
 	// matches comes as e.g.
-	// [["...", "/watch/" "bucket1"]]
+	// [["...", "/watch/", "namespace", "tenant", "bucket1"]]
 	// [["/watch/" "/watch/" ""]]

-	// bucket name is on the second group, third position
-	wOptions.BucketName = strings.TrimSpace(string(matches[0][2]))
+	if len(matches) == 0 || len(matches[0]) < 5 {
+		return nil, fmt.Errorf("invalid url: %s", req.URL.Path)
+	}
+
+	wOptions.Namespace = strings.TrimSpace(string(matches[0][2]))
+	wOptions.Tenant = strings.TrimSpace(string(matches[0][3]))
+	wOptions.BucketName = strings.TrimSpace(string(matches[0][4]))

 	events := req.FormValue("events")
 	if strings.TrimSpace(events) != "" {
@@ -102,5 +109,5 @@ func getWatchOptionsFromReq(req *http.Request) watchOptions {
 	}
 	wOptions.Prefix = req.FormValue("prefix")
 	wOptions.Suffix = req.FormValue("suffix")
-	return wOptions
+	return &wOptions, nil
 }
--- a/restapi/user_watch_test.go
+++ b/restapi/user_watch_test.go
@@ -47,7 +47,7 @@ func TestWatch(t *testing.T) {
 	testReceiver := make(chan []mc.EventInfo, testStreamSize)
 	isClosed := false // testReceiver is closed?
 	textToReceive := "test message"
-	testOptions := watchOptions{}
+	testOptions := &watchOptions{}
 	testOptions.BucketName = "bucktest"
 	testOptions.Prefix = "file/"
 	testOptions.Suffix = ".png"
@@ -199,60 +199,67 @@ func TestWatch(t *testing.T) {
 	}

 	// Test-6: getWatchOptionsFromReq return parameters from path
-	u, err := url.Parse("http://localhost/api/v1/watch/bucket1?prefix=&suffix=.jpg&events=put,get")
+	u, err := url.Parse("http://localhost/api/v1/watch/namespace/tenantName/bucket1?prefix=&suffix=.jpg&events=put,get")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
 	}
 	req := &http.Request{
 		URL: u,
 	}
-	opts := getWatchOptionsFromReq(req)
-	expectedOptions := watchOptions{
-		BucketName: "bucket1",
+	opts, err := getWatchOptionsFromReq(req)
+	if assert.NoError(err) {
+		expectedOptions := watchOptions{
+			BucketName: "bucket1",
+		}
+		expectedOptions.Prefix = ""
+		expectedOptions.Suffix = ".jpg"
+		expectedOptions.Events = []string{"put", "get"}
+		assert.Equal(expectedOptions.BucketName, opts.BucketName)
+		assert.Equal(expectedOptions.Prefix, opts.Prefix)
+		assert.Equal(expectedOptions.Suffix, opts.Suffix)
+		assert.Equal(expectedOptions.Events, opts.Events)
 	}
-	expectedOptions.Prefix = ""
-	expectedOptions.Suffix = ".jpg"
-	expectedOptions.Events = []string{"put", "get"}
-	assert.Equal(expectedOptions.BucketName, opts.BucketName)
-	assert.Equal(expectedOptions.Prefix, opts.Prefix)
-	assert.Equal(expectedOptions.Suffix, opts.Suffix)
-	assert.Equal(expectedOptions.Events, opts.Events)

 	// Test-7: getWatchOptionsFromReq return default events if not defined
-	u, err = url.Parse("http://localhost/api/v1/watch/bucket1?prefix=&suffix=.jpg&events=")
+	u, err = url.Parse("http://localhost/api/v1/watch/namespace/tenantName/bucket1?prefix=&suffix=.jpg&events=")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
 	}
 	req = &http.Request{
 		URL: u,
 	}
-	opts = getWatchOptionsFromReq(req)
-	expectedOptions = watchOptions{
-		BucketName: "bucket1",
+	opts, err = getWatchOptionsFromReq(req)
+	if assert.NoError(err) {
+		expectedOptions := watchOptions{
+			BucketName: "bucket1",
+		}
+		expectedOptions.Prefix = ""
+		expectedOptions.Suffix = ".jpg"
+		expectedOptions.Events = []string{"put", "get", "delete"}
+		assert.Equal(expectedOptions.BucketName, opts.BucketName)
+		assert.Equal(expectedOptions.Prefix, opts.Prefix)
+		assert.Equal(expectedOptions.Suffix, opts.Suffix)
+		assert.Equal(expectedOptions.Events, opts.Events)
+
 	}
-	expectedOptions.Prefix = ""
-	expectedOptions.Suffix = ".jpg"
-	expectedOptions.Events = []string{"put", "get", "delete"}
-	assert.Equal(expectedOptions.BucketName, opts.BucketName)
-	assert.Equal(expectedOptions.Prefix, opts.Prefix)
-	assert.Equal(expectedOptions.Suffix, opts.Suffix)
-	assert.Equal(expectedOptions.Events, opts.Events)

 	// Test-8: getWatchOptionsFromReq return default events if not defined
-	u, err = url.Parse("http://localhost/api/v1/watch/bucket2?prefix=&suffix=")
+	u, err = url.Parse("http://localhost/api/v1/watch/namespace/tenantName/bucket2?prefix=&suffix=")
 	if err != nil {
 		t.Errorf("Failed on %s:, error occurred: %s", "url.Parse()", err.Error())
 	}
 	req = &http.Request{
 		URL: u,
 	}
-	opts = getWatchOptionsFromReq(req)
-	expectedOptions = watchOptions{
-		BucketName: "bucket2",
+	opts, err = getWatchOptionsFromReq(req)
+	if assert.NoError(err) {
+		expectedOptions := watchOptions{
+			BucketName: "bucket2",
+		}
+		expectedOptions.Events = []string{"put", "get", "delete"}
+		assert.Equal(expectedOptions.BucketName, opts.BucketName)
+		assert.Equal(expectedOptions.Prefix, opts.Prefix)
+		assert.Equal(expectedOptions.Suffix, opts.Suffix)
+		assert.Equal(expectedOptions.Events, opts.Events)
 	}
-	expectedOptions.Events = []string{"put", "get", "delete"}
-	assert.Equal(expectedOptions.BucketName, opts.BucketName)
-	assert.Equal(expectedOptions.Prefix, opts.Prefix)
-	assert.Equal(expectedOptions.Suffix, opts.Suffix)
-	assert.Equal(expectedOptions.Events, opts.Events)
 }
--- a/restapi/ws_handle.go
+++ b/restapi/ws_handle.go
@@ -122,7 +122,12 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
 	switch {
 	case strings.HasPrefix(wsPath, `/trace`):
 		// Trace api only for operator Console
-		namespace, tenant := getTraceOptionsFromReq(req)
+		namespace, tenant, err := getTraceOptionsFromReq(req)
+		if err != nil {
+			log.Println("error getting trace options:", err)
+			closeWsConn(conn)
+			return
+		}
 		wsAdminClient, err := newWebSocketTenantAdminClient(conn, session, namespace, tenant)
 		if err != nil {
 			closeWsConn(conn)
@@ -131,7 +136,12 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
 		go wsAdminClient.trace()
 	case strings.HasPrefix(wsPath, `/console`):
 		// Trace api only for operator Console
-		namespace, tenant := getConsoleLogOptionsFromReq(req)
+		namespace, tenant, err := getConsoleLogOptionsFromReq(req)
+		if err != nil {
+			log.Println("error getting log options:", err)
+			closeWsConn(conn)
+			return
+		}
 		wsAdminClient, err := newWebSocketTenantAdminClient(conn, session, namespace, tenant)
 		if err != nil {
 			closeWsConn(conn)
@@ -145,15 +155,20 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
 			closeWsConn(conn)
 			return
 		}
-		wsAdminClient, err := newWebSocketAdminClient(conn, session)
+		wsAdminClient, err := newWebSocketTenantAdminClient(conn, session, hOptions.Namespace, hOptions.Tenant)
 		if err != nil {
 			closeWsConn(conn)
 			return
 		}
 		go wsAdminClient.heal(hOptions)
 	case strings.HasPrefix(wsPath, `/watch`):
-		wOptions := getWatchOptionsFromReq(req)
-		wsS3Client, err := newWebSocketS3Client(conn, session, wOptions.BucketName)
+		wOptions, err := getWatchOptionsFromReq(req)
+		if err != nil {
+			log.Println("error getting watch options:", err)
+			closeWsConn(conn)
+			return
+		}
+		wsS3Client, err := newWebSocketS3Client(conn, session, wOptions.Namespace, wOptions.Tenant, wOptions.BucketName)
 		if err != nil {
 			closeWsConn(conn)
 			return
@@ -195,13 +210,14 @@ func newWebSocketTenantAdminClient(conn *websocket.Conn, session *models.Princip
 	minTenant.EnsureDefaults()

 	svcURL := GetTenantServiceURL(minTenant)
-	// TODO: in the feature we need to load all tenants public certificates under ~/.console/certs/CAs to avoid using insecure: true
+	// getTenantAdminClient will use all certificates under ~/.console/certs/CAs to trust the TLS connections with MinIO tenants
 	mAdmin, err := getTenantAdminClient(
 		ctx,
 		k8sClient,
 		minTenant,
 		svcURL,
-		true)
+		true,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -216,34 +232,50 @@ func newWebSocketTenantAdminClient(conn *websocket.Conn, session *models.Princip
 	return wsAdminClient, nil
 }

-// newWebSocketAdminClient returns a wsAdminClient authenticated as an admin user
-func newWebSocketAdminClient(conn *websocket.Conn, autClaims *models.Principal) (*wsAdminClient, error) {
-	// Only start Websocket Interaction after user has been
-	// authenticated with MinIO
-	mAdmin, err := newAdminFromClaims(autClaims)
-	if err != nil {
-		log.Println("error creating Madmin Client:", err)
-		// close connection
-		conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
-		conn.Close()
-		return nil, err
-	}
-	// create a websocket connection interface implementation
-	// defining the connection to be used
-	wsConnection := wsConn{conn: conn}
-	// create a minioClient interface implementation
-	// defining the client to be used
-	adminClient := adminClient{client: mAdmin}
-	// create websocket client and handle request
-	wsAdminClient := &wsAdminClient{conn: wsConnection, client: adminClient}
-	return wsAdminClient, nil
-}
-
 // newWebSocketS3Client returns a wsAdminClient authenticated as Console admin
-func newWebSocketS3Client(conn *websocket.Conn, claims *models.Principal, bucketName string) (*wsS3Client, error) {
+func newWebSocketS3Client(conn *websocket.Conn, claims *models.Principal, namespace, tenant, bucketName string) (*wsS3Client, error) {
 	// Only start Websocket Interaction after user has been
 	// authenticated with MinIO
-	s3Client, err := newS3BucketClient(claims, bucketName, "")
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+
+	opClientClientSet, err := cluster.OperatorClient(claims.SessionToken)
+	if err != nil {
+		return nil, err
+	}
+
+	clientSet, err := cluster.K8sClient(claims.SessionToken)
+	if err != nil {
+		return nil, err
+	}
+
+	opClient := &operatorClient{
+		client: opClientClientSet,
+	}
+	k8sClient := &k8sClient{
+		client: clientSet,
+	}
+
+	minTenant, err := getTenant(ctx, opClient, namespace, tenant)
+	if err != nil {
+		return nil, err
+	}
+	minTenant.EnsureDefaults()
+
+	// Get Tenant Creds and substitute session ones
+	tenantCreds, err := getTenantCreds(ctx, k8sClient, minTenant)
+	if err != nil {
+		return nil, err
+	}
+
+	tenantClaims := &models.Principal{
+		AccessKeyID:     tenantCreds.accessKey,
+		SecretAccessKey: tenantCreds.secretKey,
+	}
+
+	svcURL := GetTenantServiceURL(minTenant)
+	// TODO: change isSecure: true to minTenant.TLS() and add support to S3Client to accept custom TLS Transport
+	s3Client, err := newTenantS3BucketClient(tenantClaims, svcURL, bucketName, false)
 	if err != nil {
 		log.Println("error creating S3Client:", err)
 		conn.WriteMessage(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""))
@@ -332,7 +364,7 @@ func (wsc *wsAdminClient) console() {
 	sendWsCloseMessage(wsc.conn, err)
 }

-func (wsc *wsS3Client) watch(params watchOptions) {
+func (wsc *wsS3Client) watch(params *watchOptions) {
 	defer func() {
 		log.Println("watch stopped")
 		// close connection after return
--- a/swagger.yml
+++ b/swagger.yml
@@ -1853,6 +1853,31 @@ paths:
            $ref: "#/definitions/error"
      tags:
        - AdminAPI
+  
+  /operator/{namespace}/{tenant}/buckets:
+    get:
+      summary: List Buckets for Operator Console
+      operationId: OperatorListBuckets
+      parameters:
+        - name: namespace
+          in: path
+          required: true
+          type: string
+        - name: tenant
+          in: path
+          required: true
+          type: string
+      responses:
+        200:
+          description: A successful response.
+          schema:
+            $ref: "#/definitions/listBucketsResponse"
+        default:
+          description: Generic error response.
+          schema:
+            $ref: "#/definitions/error"
+      tags:
+        - OperatorAPI

 definitions:
  bucketEncryptionType: