Skip to content

Commit 34b821d

Browse files
dvaldiviadvaldivia
committed
Remove Operator mode references in Console mode
Signed-off-by: Daniel Valdivia <[email protected]>
1 parent 6f7c026 commit 34b821d

18 files changed

+44
-68
lines changed

‎operatorapi/consts.go‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ package operatorapi
1919
// list of all console environment constants
2020
const (
2121
// Constants for common configuration
22-
ConsoleMinIOServer = "CONSOLE_MINIO_SERVER"
23-
ConsoleMinIORegion = "CONSOLE_MINIO_REGION"
24-
ConsoleProductionMode = "CONSOLE_PRODUCTION_MODE"
25-
ConsoleHostname = "CONSOLE_HOSTNAME"
26-
ConsolePort = "CONSOLE_PORT"
27-
ConsoleTLSHostname = "CONSOLE_TLS_HOSTNAME"
28-
ConsoleTLSPort = "CONSOLE_TLS_PORT"
29-
ConsoleSubnetLicense = "CONSOLE_SUBNET_LICENSE"
22+
ConsoleMinIOServer = "CONSOLE_MINIO_SERVER"
23+
ConsoleMinIORegion = "CONSOLE_MINIO_REGION"
24+
ConsoleHostname = "CONSOLE_HOSTNAME"
25+
ConsolePort = "CONSOLE_PORT"
26+
ConsoleTLSHostname = "CONSOLE_TLS_HOSTNAME"
27+
ConsoleTLSPort = "CONSOLE_TLS_PORT"
28+
ConsoleSubnetLicense = "CONSOLE_SUBNET_LICENSE"
3029

3130
// Constants for Secure middleware
3231
ConsoleSecureAllowedHosts = "CONSOLE_SECURE_ALLOWED_HOSTS"
@@ -50,11 +49,6 @@ const (
5049
ConsoleSecureExpectCTHeader = "CONSOLE_SECURE_EXPECT_CT_HEADER"
5150
ConsoleOperatorSAToken = "CONSOLE_OPERATOR_SA_TOKEN"
5251
ConsoleOperatorConsoleImage = "CONSOLE_OPERATOR_CONSOLE_IMAGE"
53-
PrometheusURL = "CONSOLE_PROMETHEUS_URL"
54-
PrometheusJobID = "CONSOLE_PROMETHEUS_JOB_ID"
55-
ConsoleLogQueryURL = "CONSOLE_LOG_QUERY_URL"
56-
ConsoleLogQueryAuthToken = "CONSOLE_LOG_QUERY_AUTH_TOKEN"
57-
LogSearchQueryAuthToken = "LOGSEARCH_QUERY_AUTH_TOKEN"
5852

5953
// Constants for prometheus annotations
6054
prometheusPath = "prometheus.io/path"

‎operatorapi/operator_login.go‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import (
2222
"net/http"
2323
"time"
2424

25+
"github.com/minio/minio-go/v7/pkg/credentials"
26+
2527
"github.com/minio/console/restapi"
2628

2729
iampolicy "github.com/minio/pkg/iam/policy"
@@ -114,7 +116,7 @@ func getAccountPolicy(ctx context.Context, client restapi.MinioAdmin) (*iampolic
114116

115117
// getConsoleCredentials will return consoleCredentials interface including the associated policy of the current account
116118
func getConsoleCredentials(ctx context.Context, accessKey, secretKey string) (*restapi.ConsoleCredentials, error) {
117-
creds, err := restapi.NewConsoleCredentials(accessKey, secretKey, restapi.GetMinIORegion())
119+
creds, err := newConsoleCredentials(secretKey)
118120
if err != nil {
119121
return nil, err
120122
}
@@ -180,7 +182,7 @@ func getLoginResponse(lr *models.LoginRequest) (*models.LoginResponse, *models.E
180182
func getLoginDetailsResponse() (*models.LoginDetails, *models.Error) {
181183
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
182184
defer cancel()
183-
loginStrategy := models.LoginDetailsLoginStrategyForm
185+
loginStrategy := models.LoginDetailsLoginStrategyServiceDashAccount
184186
redirectURL := ""
185187

186188
if oauth2.IsIdpEnabled() {
@@ -193,8 +195,6 @@ func getLoginDetailsResponse() (*models.LoginDetails, *models.Error) {
193195
// Validate user against IDP
194196
identityProvider := &auth.IdentityProvider{Client: oauth2Client}
195197
redirectURL = identityProvider.GenerateLoginURL()
196-
} else if acl.GetOperatorMode() {
197-
loginStrategy = models.LoginDetailsLoginStrategyServiceDashAccount
198198
}
199199

200200
loginDetails := &models.LoginDetails{
@@ -206,12 +206,12 @@ func getLoginDetailsResponse() (*models.LoginDetails, *models.Error) {
206206

207207
func getLoginOauth2AuthResponse() (*models.LoginResponse, *models.Error) {
208208

209-
creds, err := restapi.NewConsoleCredentials("", getK8sSAToken(), "")
209+
creds, err := newConsoleCredentials(getK8sSAToken())
210210
if err != nil {
211211
return nil, prepareError(err)
212212
}
213-
credentials := restapi.ConsoleCredentials{ConsoleCredentials: creds, Actions: []string{}}
214-
token, err := login(credentials)
213+
consoleCredentials := restapi.ConsoleCredentials{ConsoleCredentials: creds, Actions: []string{}}
214+
token, err := login(consoleCredentials)
215215
if err != nil {
216216
return nil, prepareError(errInvalidCredentials, nil, err)
217217
}
@@ -222,9 +222,17 @@ func getLoginOauth2AuthResponse() (*models.LoginResponse, *models.Error) {
222222
return loginResponse, nil
223223
}
224224

225+
func newConsoleCredentials(secretKey string) (*credentials.Credentials, error) {
226+
creds, err := auth.GetConsoleCredentialsForOperator(secretKey)
227+
if err != nil {
228+
return nil, err
229+
}
230+
return creds, nil
231+
}
232+
225233
// getLoginOperatorResponse validate the provided service account token against k8s api
226234
func getLoginOperatorResponse(lmr *models.LoginOperatorRequest) (*models.LoginResponse, *models.Error) {
227-
creds, err := restapi.NewConsoleCredentials("", *lmr.Jwt, "")
235+
creds, err := newConsoleCredentials(*lmr.Jwt)
228236
if err != nil {
229237
return nil, prepareError(err)
230238
}

‎operatorapi/operator_session.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func getSessionResponse(session *models.Principal) (*models.SessionResponse, *mo
4545
Pages: acl.GetAuthorizedEndpoints(session.Actions),
4646
Features: getListOfEnabledFeatures(),
4747
Status: models.SessionResponseStatusOk,
48-
Operator: acl.GetOperatorMode(),
48+
Operator: true,
4949
}
5050
return sessionResp, nil
5151
}

‎operatorapi/operator_subscription.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func getOperatorSubscriptionActivateResponse(session *models.Principal, namespac
108108
client: clientSet,
109109
}
110110
// Get cluster subscription license
111-
license, err := getSubscriptionLicense(ctx, &k8sClient, cluster.Namespace, restapi.OperatorSubnetLicenseSecretName)
111+
license, err := getSubscriptionLicense(ctx, &k8sClient, cluster.Namespace, OperatorSubnetLicenseSecretName)
112112
if err != nil {
113113
return prepareError(errInvalidCredentials, nil, err)
114114
}

‎operatorapi/operator_tenants.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,7 @@ func getTenantCreatedResponse(session *models.Principal, params operator_api.Cre
12201220
}
12211221
// If Subnet License is present in k8s secrets, copy that to the CONSOLE_SUBNET_LICENSE env variable
12221222
// of the console tenant
1223-
license, _ := getSubscriptionLicense(ctx, &k8sClient, cluster.Namespace, restapi.OperatorSubnetLicenseSecretName)
1223+
license, _ := getSubscriptionLicense(ctx, &k8sClient, cluster.Namespace, OperatorSubnetLicenseSecretName)
12241224
if license != "" {
12251225
consoleSecretData[restapi.ConsoleSubnetLicense] = []byte(license)
12261226
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"files": {
33
"main.css": "/static/css/main.8cfac526.chunk.css",
4-
"main.js": "/static/js/main.439bfd00.chunk.js",
5-
"main.js.map": "/static/js/main.439bfd00.chunk.js.map",
4+
"main.js": "/static/js/main.93bb6503.chunk.js",
5+
"main.js.map": "/static/js/main.93bb6503.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",
88
"static/css/2.20c81d8d.chunk.css": "/static/css/2.20c81d8d.chunk.css",
@@ -20,6 +20,6 @@
2020
"static/css/2.20c81d8d.chunk.css",
2121
"static/js/2.02087608.chunk.js",
2222
"static/css/main.8cfac526.chunk.css",
23-
"static/js/main.439bfd00.chunk.js"
23+
"static/js/main.93bb6503.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 href="/styles/root-styles.css" 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 id="loader-block"><svg class="loader-svg-container" viewBox="22 22 44 44"><circle class="loader-style MuiCircularProgress-circle MuiCircularProgress-circleIndeterminate" cx="44" cy="44" r="20.2" fill="none" stroke-width="3.6"></circle></svg></div></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.55ef6ad7.chunk.js"></script><script src="/static/js/main.439bfd00.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 href="/styles/root-styles.css" 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 id="loader-block"><svg class="loader-svg-container" viewBox="22 22 44 44"><circle class="loader-style MuiCircularProgress-circle MuiCircularProgress-circleIndeterminate" cx="44" cy="44" r="20.2" fill="none" stroke-width="3.6"></circle></svg></div></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.02087608.chunk.js"></script><script src="/static/js/main.93bb6503.chunk.js"></script></body></html>

‎portal-ui/build/static/js/main.439bfd00.chunk.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎portal-ui/build/static/js/main.439bfd00.chunk.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎portal-ui/build/static/js/main.8c8fdb63.chunk.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)