Skip to content

Commit a280ba6

Browse files
adrianliechtiadrianliechti
committed
bump dashboard
1 parent cc331dd commit a280ba6

File tree

7 files changed

+272
-163
lines changed

7 files changed

+272
-163
lines changed

‎app/dashboard/dashboard.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ var Command = &cli.Command{
4343
}
4444
}
4545

46-
options := &dashboard.DashboardOptions{
47-
Port: port,
46+
addr := fmt.Sprintf("localhost:%d", port)
4847

48+
options := &dashboard.DashboardOptions{
4949
OpenAIKey: openaiKey,
5050
OpenAIModel: openaiModel,
5151
OpenAIBaseURL: openaiURL,
@@ -55,6 +55,6 @@ var Command = &cli.Command{
5555
cli.OpenURL(fmt.Sprintf("http://localhost:%d", port))
5656
})
5757

58-
return dashboard.Run(ctx, client, options)
58+
return dashboard.ListenAndServe(ctx, addr, client, options)
5959
},
6060
}

‎pkg/dashboard/dashboard.go‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ import (
1818
)
1919

2020
var (
21-
//go:embed public/*
21+
//go:embed all:public
2222
publicFS embed.FS
23+
24+
PublicFS, _ = fs.Sub(publicFS, "public")
2325
)
2426

2527
type DashboardOptions struct {
26-
Port int
27-
2828
OpenAIKey string
2929
OpenAIModel string
3030
OpenAIBaseURL string
@@ -33,33 +33,27 @@ type DashboardOptions struct {
3333
PlatformSpaceLabels []string
3434
}
3535

36-
func Run(ctx context.Context, client kubernetes.Client, options *DashboardOptions) error {
36+
func NewHandler(client kubernetes.Client, options *DashboardOptions) (http.Handler, error) {
3737
if options == nil {
3838
options = new(DashboardOptions)
3939
}
4040

41-
if options.Port == 0 {
42-
options.Port = 8888
43-
}
44-
4541
config := client.Config()
4642

4743
tr, err := rest.TransportFor(config)
4844

4945
if err != nil {
50-
return err
46+
return nil, err
5147
}
5248

5349
target, path, err := rest.DefaultServerUrlFor(config)
5450

5551
if err != nil {
56-
return fmt.Errorf("failed to parse host: %w", err)
52+
return nil, fmt.Errorf("failed to parse host: %w", err)
5753
}
5854

5955
target.Path = path
6056

61-
fs, _ := fs.Sub(publicFS, "public")
62-
6357
mux := http.NewServeMux()
6458

6559
proxy := &httputil.ReverseProxy{
@@ -80,7 +74,7 @@ func Run(ctx context.Context, client kubernetes.Client, options *DashboardOption
8074
target, err := url.Parse(options.OpenAIBaseURL)
8175

8276
if err != nil {
83-
return err
77+
return nil, err
8478
}
8579

8680
proxy := &httputil.ReverseProxy{
@@ -138,10 +132,24 @@ func Run(ctx context.Context, client kubernetes.Client, options *DashboardOption
138132
json.NewEncoder(w).Encode(config)
139133
})
140134

141-
mux.Handle("/", http.FileServerFS(fs))
135+
mux.Handle("/", http.FileServerFS(PublicFS))
136+
137+
return mux, nil
138+
}
139+
140+
func ListenAndServe(ctx context.Context, addr string, client kubernetes.Client, options *DashboardOptions) error {
141+
if options == nil {
142+
options = new(DashboardOptions)
143+
}
144+
145+
mux, err := NewHandler(client, options)
146+
147+
if err != nil {
148+
return err
149+
}
142150

143151
server := &http.Server{
144-
Addr: fmt.Sprintf("localhost:%d", options.Port),
152+
Addr: addr,
145153
Handler: mux,
146154
}
147155

‎pkg/dashboard/public/assets/index-B6wc2qAF.css‎

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

‎pkg/dashboard/public/assets/index-BZtqywEy.js‎

Lines changed: 243 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/dashboard/public/assets/index-BaZYsIGl.css‎

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

‎pkg/dashboard/public/assets/index-CDoWoIdJ.js‎

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

‎pkg/dashboard/public/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<link rel="icon" type="image/svg+xml" href="/icon.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover" />
77
<title>Dashboard</title>
8-
<script type="module" crossorigin src="/assets/index-CDoWoIdJ.js"></script>
9-
<link rel="stylesheet" crossorigin href="/assets/index-B6wc2qAF.css">
8+
<script type="module" crossorigin src="/assets/index-BZtqywEy.js"></script>
9+
<link rel="stylesheet" crossorigin href="/assets/index-BaZYsIGl.css">
1010
</head>
1111
<body>
1212
<div id="root"></div>

0 commit comments

Comments
 (0)