diff --git a/docs/user-guide/liveness/image/Dockerfile b/docs/user-guide/liveness/image/Dockerfile deleted file mode 100644 index 2c5481c63e..0000000000 --- a/docs/user-guide/liveness/image/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2016 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 - -ADD server /server - diff --git a/docs/user-guide/liveness/image/Makefile b/docs/user-guide/liveness/image/Makefile deleted file mode 100644 index b1a708dc14..0000000000 --- a/docs/user-guide/liveness/image/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2016 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. - -all: push - -server: server.go - CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./server.go - -container: server - docker build -t gcr.io/google_containers/liveness . - -push: container - gcloud docker -- push gcr.io/google_containers/liveness - -clean: - rm -f server diff --git a/docs/user-guide/liveness/image/README.md b/docs/user-guide/liveness/image/README.md new file mode 100644 index 0000000000..3b316fee59 --- /dev/null +++ b/docs/user-guide/liveness/image/README.md @@ -0,0 +1 @@ +This image has moved to https://github.com/kubernetes/kubernetes/tree/master/test/images/liveness \ No newline at end of file diff --git a/docs/user-guide/liveness/image/server.go b/docs/user-guide/liveness/image/server.go deleted file mode 100644 index 26c337e767..0000000000 --- a/docs/user-guide/liveness/image/server.go +++ /dev/null @@ -1,46 +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 server that is alive for 10 seconds, then reports unhealthy for -// the rest of its (hopefully) short existence. -package main - -import ( - "fmt" - "log" - "net/http" - "time" -) - -func main() { - started := time.Now() - http.HandleFunc("/started", func(w http.ResponseWriter, r *http.Request) { - w.WriteHeader(200) - data := (time.Now().Sub(started)).String() - w.Write([]byte(data)) - }) - http.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) { - duration := time.Now().Sub(started) - if duration.Seconds() > 10 { - w.WriteHeader(500) - w.Write([]byte(fmt.Sprintf("error: %v", duration.Seconds()))) - } else { - w.WriteHeader(200) - w.Write([]byte("ok")) - } - }) - log.Fatal(http.ListenAndServe(":8080", nil)) -} diff --git a/docs/user-guide/update-demo/build-images.sh b/docs/user-guide/update-demo/build-images.sh deleted file mode 100755 index 63c0fe9298..0000000000 --- a/docs/user-guide/update-demo/build-images.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# 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. - -# This script will build and push the images necessary for the demo. - -set -o errexit -set -o nounset -set -o pipefail - -DOCKER_HUB_USER=${DOCKER_HUB_USER:-kubernetes} - -set -x - -docker build -t "${DOCKER_HUB_USER}/update-demo:kitten" images/kitten -docker build -t "${DOCKER_HUB_USER}/update-demo:nautilus" images/nautilus - -docker push "${DOCKER_HUB_USER}/update-demo" diff --git a/docs/user-guide/update-demo/images/kitten/Dockerfile b/docs/user-guide/update-demo/images/kitten/Dockerfile deleted file mode 100644 index aef0de58c6..0000000000 --- a/docs/user-guide/update-demo/images/kitten/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2016 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 kubernetes/test-webserver -COPY html/kitten.jpg kitten.jpg -COPY html/data.json data.json diff --git a/docs/user-guide/update-demo/images/kitten/README.md b/docs/user-guide/update-demo/images/kitten/README.md new file mode 100644 index 0000000000..bc5f072bbc --- /dev/null +++ b/docs/user-guide/update-demo/images/kitten/README.md @@ -0,0 +1 @@ +This image has moved to https://github.com/kubernetes/kubernetes/tree/master/test/images/kitten \ No newline at end of file diff --git a/docs/user-guide/update-demo/images/kitten/html/data.json b/docs/user-guide/update-demo/images/kitten/html/data.json deleted file mode 100644 index 0be61a42b3..0000000000 --- a/docs/user-guide/update-demo/images/kitten/html/data.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "image": "kitten.jpg" -} diff --git a/docs/user-guide/update-demo/images/kitten/html/kitten.jpg b/docs/user-guide/update-demo/images/kitten/html/kitten.jpg deleted file mode 100644 index a382bf16ac..0000000000 Binary files a/docs/user-guide/update-demo/images/kitten/html/kitten.jpg and /dev/null differ diff --git a/docs/user-guide/update-demo/images/nautilus/Dockerfile b/docs/user-guide/update-demo/images/nautilus/Dockerfile deleted file mode 100644 index 16280b8215..0000000000 --- a/docs/user-guide/update-demo/images/nautilus/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2016 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 kubernetes/test-webserver -COPY html/nautilus.jpg nautilus.jpg -COPY html/data.json data.json diff --git a/docs/user-guide/update-demo/images/nautilus/README.md b/docs/user-guide/update-demo/images/nautilus/README.md new file mode 100644 index 0000000000..4b2ddc9a60 --- /dev/null +++ b/docs/user-guide/update-demo/images/nautilus/README.md @@ -0,0 +1 @@ +This image has moved to https://github.com/kubernetes/kubernetes/tree/master/test/images/nautilus \ No newline at end of file diff --git a/docs/user-guide/update-demo/images/nautilus/html/data.json b/docs/user-guide/update-demo/images/nautilus/html/data.json deleted file mode 100644 index 2debee09a9..0000000000 --- a/docs/user-guide/update-demo/images/nautilus/html/data.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "image": "nautilus.jpg" -} diff --git a/docs/user-guide/update-demo/images/nautilus/html/nautilus.jpg b/docs/user-guide/update-demo/images/nautilus/html/nautilus.jpg deleted file mode 100644 index 544d2bd471..0000000000 Binary files a/docs/user-guide/update-demo/images/nautilus/html/nautilus.jpg and /dev/null differ diff --git a/skip_title_check.txt b/skip_title_check.txt index 7f1de8578c..29d3195ed9 100644 --- a/skip_title_check.txt +++ b/skip_title_check.txt @@ -11,4 +11,7 @@ docs/api-reference/v1/operations.md docs/user-guide/pods/_viewing-a-pod.md docs/user-guide/simple-yaml.md docs/concepts/abstractions/pod-termination.md -docs/contribute/README.md \ No newline at end of file +docs/contribute/README.md +docs/user-guide/liveness/image/README.md +docs/user-guide/update-demo/images/kitten/README.md +docs/user-guide/update-demo/images/nautilus/README.md diff --git a/skip_toc_check.txt b/skip_toc_check.txt index 60666bc805..46d01b0ec2 100644 --- a/skip_toc_check.txt +++ b/skip_toc_check.txt @@ -128,7 +128,6 @@ docs/user-guide/walkthrough/index.md docs/user-guide/walkthrough/k8s201.md docs/user-guide/working-with-resources.md docs/whatisk8s.md - docs/user-guide/configmap/index.md docs/user-guide/horizontal-pod-autoscaling/walkthrough.md docs/getting-started-guides/network-policy/walkthrough.md @@ -149,20 +148,6 @@ docs/admin/garbage-collection.md docs/admin/node-allocatable.md docs/user-guide/jobs/expansions/index.md docs/user-guide/ui/index.md - - - - - - - - - - - - - - - - - +docs/user-guide/liveness/image/README.md +docs/user-guide/update-demo/images/kitten/README.md +docs/user-guide/update-demo/images/nautilus/README.md