Add kube-ui cluster addon for serving k8s dashboard UI.

Changes include:
- Add kube-ui binary for serving static dashboard UI
- Add kube-ui docker image, replication controller, and service
- Make the kube-ui a cluster-addon (enabled by default)
- Split the compiled pkg/ui/datafile.go into separate dashboard and swagger packages
- Update docs to reflect changes
This commit is contained in:
Tim St. Clair
2015-06-11 17:45:17 -07:00
parent 7689391c68
commit b6b2d6df42
15 changed files with 22305 additions and 21811 deletions

View File

@@ -0,0 +1,19 @@
# Copyright 2015 The Kubernetes Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM scratch
MAINTAINER Tim St. Clair <stclair@google.com>
ADD kube-ui kube-ui
EXPOSE 8080
ENTRYPOINT ["/kube-ui"]

View File

@@ -0,0 +1,23 @@
# Makefile for the Docker image gcr.io/google_containers/kube-ui
# MAINTAINER: Tim St. Clair <stclair@google.com>
# If you update this image please check the tag value before pushing.
.PHONY: all container push clean
# Keep this at dev, so no one accidentally blows away the latest published version.
TAG = dev # current version: v1
PREFIX = gcr.io/google_containers
all: push
kube-ui: kube-ui.go
CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags '-w' ./kube-ui.go
container: kube-ui
docker build -t $(PREFIX)/kube-ui:$(TAG) .
push: container
gcloud docker push $(PREFIX)/kube-ui:$(TAG)
clean:
rm -f kube-ui

View File

@@ -0,0 +1,54 @@
/*
Copyright 2014 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// A simple static web server for hosting the Kubernetes cluster UI.
package main
import (
"flag"
"fmt"
"mime"
"net/http"
"github.com/GoogleCloudPlatform/kubernetes/pkg/ui/data/dashboard"
"github.com/golang/glog"
assetfs "github.com/elazarl/go-bindata-assetfs"
)
var (
port = flag.Int("port", 8080, "Port number to serve at.")
)
func main() {
flag.Parse()
// Send correct mime type for .svg files. TODO: remove when
// https://github.com/golang/go/commit/21e47d831bafb59f22b1ea8098f709677ec8ce33
// makes it into all of our supported go versions.
mime.AddExtensionType(".svg", "image/svg+xml")
// Expose files in www/ on <host>
fileServer := http.FileServer(&assetfs.AssetFS{
Asset: dashboard.Asset,
AssetDir: dashboard.AssetDir,
Prefix: "www/app",
})
http.Handle("/", fileServer)
// TODO: Add support for serving over TLS.
glog.Fatal(http.ListenAndServe(fmt.Sprintf("0.0.0.0:%d", *port), nil))
}

View File

@@ -0,0 +1,26 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-ui-v1
namespace: default
labels:
k8s-app: kube-ui
version: v1
kubernetes.io/cluster-service: "true"
spec:
replicas: 1
selector:
k8s-app: kube-ui
version: v1
template:
metadata:
labels:
k8s-app: kube-ui
version: v1
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kube-ui
image: gcr.io/google_containers/kube-ui:v1
ports:
- containerPort: 8080

View File

@@ -0,0 +1,15 @@
apiVersion: v1
kind: Service
metadata:
name: kube-ui
namespace: default
labels:
k8s-app: kube-ui
kubernetes.io/cluster-service: "true"
kubernetes.io/name: "KubeUI"
spec:
selector:
k8s-app: kube-ui
ports:
- port: 80
targetPort: 8080

View File

@@ -87,6 +87,17 @@ addon-dir-create:
- file_mode: 644
{% endif %}
{% if pillar.get('enable_cluster_ui', 'true').lower() == 'true' %}
/etc/kubernetes/addons/kube-ui:
file.recurse:
- source: salt://kube-addons/kube-ui
- include_pat: E@^.+\.yaml$
- user: root
- group: root
- dir_mode: 755
- file_mode: 644
{% endif %}
/etc/kubernetes/kube-addons.sh:
file.managed:
- source: salt://kube-addons/kube-addons.sh