Skip to content

Bug 1795398: Support dashboard config map lister in off-cluster mode #4407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Feb 21, 2020
Merged

Bug 1795398: Support dashboard config map lister in off-cluster mode #4407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions cmd/bridge/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,24 +381,6 @@ func main() {
},
}

srv.MonitoringDashboardConfigMapLister = &server.ResourceLister{
BearerToken: k8sAuthServiceAccountBearerToken,
RequestURL: &url.URL{
Scheme: k8sEndpoint.Scheme,
Host: k8sEndpoint.Host,
Path: "/api/v1/namespaces/openshift-config-managed/configmaps",
RawQuery: url.Values{
"labelSelector": {"console.openshift.io/dashboard=true"},
}.Encode(),
},

Client: &http.Client{
Transport: &http.Transport{
TLSClientConfig: srv.K8sProxyConfig.TLSClientConfig,
},
},
}

switch *fUserAuth {
case "oidc", "openshift":
bridge.ValidateFlagNotEmpty("base-address", *fBaseAddress)
Expand Down Expand Up @@ -497,21 +479,43 @@ func main() {
bridge.FlagFatalf("user-auth", "must be one of: oidc, disabled")
}

var resourceListerToken string
switch *fK8sAuth {
case "service-account":
bridge.ValidateFlagIs("k8s-mode", *fK8sMode, "in-cluster")
srv.StaticUser = &auth.User{
Token: k8sAuthServiceAccountBearerToken,
}
resourceListerToken = k8sAuthServiceAccountBearerToken
case "bearer-token":
bridge.ValidateFlagNotEmpty("k8s-auth-bearer-token", *fK8sAuthBearerToken)
srv.StaticUser = &auth.User{
Token: *fK8sAuthBearerToken,
}
resourceListerToken = *fK8sAuthBearerToken
case "oidc", "openshift":
bridge.ValidateFlagIs("user-auth", *fUserAuth, "oidc", "openshift")
resourceListerToken = k8sAuthServiceAccountBearerToken
default:
bridge.FlagFatalf("k8s-mode", "must be one of: service-account, bearer-token, oidc")
bridge.FlagFatalf("k8s-mode", "must be one of: service-account, bearer-token, oidc, openshift")
}

srv.MonitoringDashboardConfigMapLister = &server.ResourceLister{
BearerToken: resourceListerToken,
RequestURL: &url.URL{
Scheme: k8sEndpoint.Scheme,
Host: k8sEndpoint.Host,
Path: "/api/v1/namespaces/openshift-config-managed/configmaps",
RawQuery: url.Values{
"labelSelector": {"console.openshift.io/dashboard=true"},
}.Encode(),
},

Client: &http.Client{
Transport: &http.Transport{
TLSClientConfig: srv.K8sProxyConfig.TLSClientConfig,
},
},
}

listenURL := bridge.ValidateFlagIsURL("listen", *fListen)
Expand Down