mirror of https://github.com/k3s-io/k3s
remove other cluster addon references for container build
Patrick Reilly
parent
ecd93f97ae
commit
bf02aaa97d
|
|
@ -1 +0,0 @@
|
|||
kube-ui
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
# 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"]
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
# 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.1
|
||||
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
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
/*
|
||||
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/golang/glog"
|
||||
"k8s.io/kubernetes/pkg/ui/data/dashboard"
|
||||
|
||||
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))
|
||||
}
|
||||
|
|
@ -26,13 +26,11 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
|
|||
cd "${KUBE_ROOT}"
|
||||
|
||||
if ! which go-bindata > /dev/null 2>&1 ; then
|
||||
echo "Cannot find go-bindata. Install with \"go get github.com/jteeuwen/go-bindata/...\""
|
||||
exit 1
|
||||
echo "Cannot find go-bindata. Install with \"go get github.com/jteeuwen/go-bindata/...\""
|
||||
exit 1
|
||||
fi
|
||||
|
||||
readonly TMP_DATAFILE="/tmp/datafile.go"
|
||||
readonly DASHBOARD_SRC="www/app/..."
|
||||
readonly DASHBOARD_PKG="dashboard"
|
||||
readonly SWAGGER_SRC="third_party/swagger-ui/..."
|
||||
readonly SWAGGER_PKG="swagger"
|
||||
|
||||
|
|
@ -51,18 +49,6 @@ function kube::hack::build_ui() {
|
|||
gofmt -s -w "${TMP_DATAFILE}"
|
||||
|
||||
mv "${TMP_DATAFILE}" "${output_file}"
|
||||
|
||||
}
|
||||
|
||||
case "${1:-}" in
|
||||
dashboard)
|
||||
kube::hack::build_ui "${DASHBOARD_PKG}" "${DASHBOARD_SRC}"
|
||||
;;
|
||||
swagger)
|
||||
kube::hack::build_ui "${SWAGGER_PKG}" "${SWAGGER_SRC}"
|
||||
;;
|
||||
*)
|
||||
kube::hack::build_ui "${DASHBOARD_PKG}" "${DASHBOARD_SRC}"
|
||||
kube::hack::build_ui "${SWAGGER_PKG}" "${SWAGGER_SRC}"
|
||||
;;
|
||||
esac
|
||||
kube::hack::build_ui "${SWAGGER_PKG}" "${SWAGGER_SRC}"
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue