Skip to content

Commit 77a074b

Browse files
dvaldiviadvaldivia
committed
Support for Hop into tenants
Signed-off-by: Daniel Valdivia <[email protected]>
1 parent 9b6d14c commit 77a074b

21 files changed

+197
-34
lines changed

‎operatorapi/proxy.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ func serveProxy(responseWriter http.ResponseWriter, req *http.Request) {
6464
return
6565
}
6666

67-
//STSSessionToken := currToken.Value
6867
STSSessionToken := claims.STSSessionToken
6968

7069
opClientClientSet, err := cluster.OperatorClient(STSSessionToken)
@@ -98,7 +97,6 @@ func serveProxy(responseWriter http.ResponseWriter, req *http.Request) {
9897

9998
h := sha1.New()
10099
h.Write([]byte(nsTenant))
101-
log.Printf("Proxying request for %s/%s", namespace, tenantName)
102100
tenantCookieName := fmt.Sprintf("token-%x", string(h.Sum(nil)))
103101
tenantCookie, err := req.Cookie(tenantCookieName)
104102
if err != nil {
@@ -113,7 +111,7 @@ func serveProxy(responseWriter http.ResponseWriter, req *http.Request) {
113111
return
114112
}
115113

116-
currentSecret, err := clientSet.CoreV1().Secrets(namespace).Get(req.Context(), tenant.Spec.CredsSecret.Name, metav1.GetOptions{})
114+
currentSecret, err := clientSet.CoreV1().Secrets(tenant.Namespace).Get(req.Context(), tenant.Spec.CredsSecret.Name, metav1.GetOptions{})
117115
if err != nil {
118116
log.Println(err)
119117
responseWriter.WriteHeader(500)

‎pkg/acl/endpoints.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ var (
4444
changePassword = "/account/change-password"
4545
tenants = "/tenants"
4646
tenantsDetail = "/namespaces/:tenantNamespace/tenants/:tenantName"
47+
tenantHop = "/namespaces/:tenantNamespace/tenants/:tenantName/hop"
4748
podsDetail = "/namespaces/:tenantNamespace/tenants/:tenantName/pods/:podName"
4849
tenantsDetailSummary = "/namespaces/:tenantNamespace/tenants/:tenantName/summary"
4950
tenantsDetailMetrics = "/namespaces/:tenantNamespace/tenants/:tenantName/metrics"
@@ -324,6 +325,7 @@ var endpointRules = map[string]ConfigurationActionSet{
324325
var operatorRules = map[string]ConfigurationActionSet{
325326
tenants: tenantsActionSet,
326327
tenantsDetail: tenantsActionSet,
328+
tenantHop: tenantsActionSet,
327329
tenantsDetailSummary: tenantsActionSet,
328330
tenantsDetailMetrics: tenantsActionSet,
329331
tenantsDetailPods: tenantsActionSet,

‎pkg/acl/endpoints_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func TestOperatorOnlyEndpoints(t *testing.T) {
116116
"admin:*",
117117
},
118118
},
119-
want: 13,
119+
want: 14,
120120
},
121121
{
122122
name: "Operator Only - all s3 endpoints",
@@ -125,7 +125,7 @@ func TestOperatorOnlyEndpoints(t *testing.T) {
125125
"s3:*",
126126
},
127127
},
128-
want: 13,
128+
want: 14,
129129
},
130130
{
131131
name: "Operator Only - all admin and s3 endpoints",
@@ -135,14 +135,14 @@ func TestOperatorOnlyEndpoints(t *testing.T) {
135135
"s3:*",
136136
},
137137
},
138-
want: 13,
138+
want: 14,
139139
},
140140
{
141141
name: "Operator Only - default endpoints",
142142
args: args{
143143
[]string{},
144144
},
145-
want: 13,
145+
want: 14,
146146
},
147147
}
148148

‎portal-ui/build/asset-manifest.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.8cfac526.chunk.css",
4-
"main.js": "/static/js/main.059e1608.chunk.js",
5-
"main.js.map": "/static/js/main.059e1608.chunk.js.map",
4+
"main.js": "/static/js/main.0fbd07b7.chunk.js",
5+
"main.js.map": "/static/js/main.0fbd07b7.chunk.js.map",
66
"runtime-main.js": "/static/js/runtime-main.43a31377.js",
77
"runtime-main.js.map": "/static/js/runtime-main.43a31377.js.map",
8-
"static/css/2.c5a51b70.chunk.css": "/static/css/2.c5a51b70.chunk.css",
9-
"static/js/2.dd405112.chunk.js": "/static/js/2.dd405112.chunk.js",
10-
"static/js/2.dd405112.chunk.js.map": "/static/js/2.dd405112.chunk.js.map",
8+
"static/css/2.20c81d8d.chunk.css": "/static/css/2.20c81d8d.chunk.css",
9+
"static/js/2.8942656d.chunk.js": "/static/js/2.8942656d.chunk.js",
10+
"static/js/2.8942656d.chunk.js.map": "/static/js/2.8942656d.chunk.js.map",
1111
"index.html": "/index.html",
12-
"static/css/2.c5a51b70.chunk.css.map": "/static/css/2.c5a51b70.chunk.css.map",
12+
"static/css/2.20c81d8d.chunk.css.map": "/static/css/2.20c81d8d.chunk.css.map",
1313
"static/css/main.8cfac526.chunk.css.map": "/static/css/main.8cfac526.chunk.css.map",
14-
"static/js/2.dd405112.chunk.js.LICENSE.txt": "/static/js/2.dd405112.chunk.js.LICENSE.txt",
14+
"static/js/2.8942656d.chunk.js.LICENSE.txt": "/static/js/2.8942656d.chunk.js.LICENSE.txt",
1515
"static/media/minio_console_logo.0837460e.svg": "/static/media/minio_console_logo.0837460e.svg",
1616
"static/media/minio_operator_logo.1312b7c9.svg": "/static/media/minio_operator_logo.1312b7c9.svg"
1717
},
1818
"entrypoints": [
1919
"static/js/runtime-main.43a31377.js",
20-
"static/css/2.c5a51b70.chunk.css",
21-
"static/js/2.dd405112.chunk.js",
20+
"static/css/2.20c81d8d.chunk.css",
21+
"static/js/2.8942656d.chunk.js",
2222
"static/css/main.8cfac526.chunk.css",
23-
"static/js/main.059e1608.chunk.js"
23+
"static/js/main.0fbd07b7.chunk.js"
2424
]
2525
}

‎portal-ui/build/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MinIO Console"/><link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;500;700;900&display=swap" rel="stylesheet"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png"/><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"/><link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png"/><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"/><link rel="manifest" href="/manifest.json"/><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#3a4e54"/><title>MinIO Console</title><link href="/static/css/2.c5a51b70.chunk.css" rel="stylesheet"><link href="/static/css/main.8cfac526.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,i=r[0],a=r[1],p=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var a=t[i];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonpportal-ui"]=this["webpackJsonpportal-ui"]||[],a=i.push.bind(i);i.push=r,i=i.slice();for(var p=0;p<i.length;p++)r(i[p]);var f=a;t()}([])</script><script src="/static/js/2.dd405112.chunk.js"></script><script src="/static/js/main.059e1608.chunk.js"></script></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="MinIO Console"/><link href="https://fonts.googleapis.com/css2?family=Lato:wght@400;500;700;900&display=swap" rel="stylesheet"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png"/><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"/><link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png"/><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"/><link rel="manifest" href="/manifest.json"/><link rel="mask-icon" href="/safari-pinned-tab.svg" color="#3a4e54"/><title>MinIO Console</title><link href="/static/css/2.20c81d8d.chunk.css" rel="stylesheet"><link href="/static/css/main.8cfac526.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,l,i=r[0],a=r[1],p=r[2],c=0,s=[];c<i.length;c++)l=i[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var a=t[i];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var i=this["webpackJsonpportal-ui"]=this["webpackJsonpportal-ui"]||[],a=i.push.bind(i);i.push=r,i=i.slice();for(var p=0;p<i.length;p++)r(i[p]);var f=a;t()}([])</script><script src="/static/js/2.8942656d.chunk.js"></script><script src="/static/js/main.0fbd07b7.chunk.js"></script></body></html>

‎portal-ui/build/static/css/2.c5a51b70.chunk.css‎ renamed to ‎portal-ui/build/static/css/2.20c81d8d.chunk.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)