Move update-demo and liveness images to kubernetes/test/images (#4536)

* Move update-demo and liveness images to kubernetes/test/images

* Skip the README.md files

docs/user-guide/liveness/image/Dockerfile

@@ -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
-

docs/user-guide/liveness/image/Makefile

@@ -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

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

docs/user-guide/liveness/image/server.go

@@ -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))
-}

docs/user-guide/update-demo/build-images.sh

@@ -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"

docs/user-guide/update-demo/images/kitten/Dockerfile

@@ -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

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

docs/user-guide/update-demo/images/kitten/html/data.json

@@ -1,3 +0,0 @@
-{
-  "image": "kitten.jpg"
-}

docs/user-guide/update-demo/images/nautilus/Dockerfile

@@ -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

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

docs/user-guide/update-demo/images/nautilus/html/data.json

@@ -1,3 +0,0 @@
-{
-  "image": "nautilus.jpg"
-}