github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 22:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1598 from brendandburns/nginx

Browse Source 
Add UX documentation, link into the apiserver, add a missing file.
This commit is contained in:
Clayton Coleman
2014-10-07 14:06:20 -04:00
parent 0212c9b29a 414473607a
commit 897c59a713
10 changed files with 2961 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/apiserver/apiserver.go
View File

@@ -34,6 +34,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/cloudprovider"
"github.com/GoogleCloudPlatform/kubernetes/pkg/master"
"github.com/GoogleCloudPlatform/kubernetes/pkg/resources"
"github.com/GoogleCloudPlatform/kubernetes/pkg/ui"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/GoogleCloudPlatform/kubernetes/pkg/version/verflag"
"github.com/golang/glog"
@@ -168,6 +169,7 @@ func main() {
apiserver.NewAPIGroup(m.API_v1beta1()).InstallREST(mux, *apiPrefix+"/v1beta1")
apiserver.NewAPIGroup(m.API_v1beta2()).InstallREST(mux, *apiPrefix+"/v1beta2")
apiserver.InstallSupport(mux)
ui.InstallSupport(mux)
handler := http.Handler(mux)
if len(corsAllowedOriginList) > 0 {