Skip to content

Commit 89eecba

Browse files
committed
backend: server: headlamp: Fix meUserInfoURL and log config items
Before there was a mistake with passing through the meUserInfoURL.
1 parent ddad30a commit 89eecba

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

backend/cmd/headlamp.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ type HeadlampConfig struct {
9393
meEmailPaths string
9494
// meGroupsPaths lists the JMESPath expressions tried for the groups in /clusters/{cluster}/me.
9595
meGroupsPaths string
96-
// MeUserInfoURL is the URL to fetch additional user info for the /me endpoint. /oauth2/userinfo
97-
MeUserInfoURL string
96+
// meUserInfoURL is the URL to fetch additional user info for the /me endpoint. /oauth2/userinfo
97+
meUserInfoURL string
9898
}
9999

100100
const DrainNodeCacheTTL = 20 // seconds
@@ -496,7 +496,7 @@ func createHeadlampHandler(config *HeadlampConfig) http.Handler {
496496
UsernamePaths: config.meUsernamePaths,
497497
EmailPaths: config.meEmailPaths,
498498
GroupsPaths: config.meGroupsPaths,
499-
UserInfoURL: config.MeUserInfoURL,
499+
UserInfoURL: config.meUserInfoURL,
500500
}),
501501
).Methods("GET")
502502

backend/cmd/server.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ func createHeadlampConfig(conf *config.Config) *HeadlampConfig {
120120
meUsernamePaths: conf.MeUsernamePath,
121121
meEmailPaths: conf.MeEmailPath,
122122
meGroupsPaths: conf.MeGroupsPath,
123+
meUserInfoURL: conf.MeUserInfoURL,
123124
cache: cache,
124125
multiplexer: multiplexer,
125126
telemetryConfig: buildTelemetryConfig(conf),

0 commit comments

Comments
 (0)