diff --git a/test/images/BUILD b/test/images/BUILD index 6083d383bee..4cb04ad2302 100644 --- a/test/images/BUILD +++ b/test/images/BUILD @@ -22,6 +22,7 @@ filegroup( "//test/images/entrypoint-tester:all-srcs", "//test/images/fakegitserver:all-srcs", "//test/images/goproxy:all-srcs", + "//test/images/liveness:all-srcs", "//test/images/logs-generator:all-srcs", "//test/images/mounttest:all-srcs", "//test/images/n-way-http:all-srcs", diff --git a/test/images/kitten/BASEIMAGE b/test/images/kitten/BASEIMAGE new file mode 100644 index 00000000000..1d2837d2ff4 --- /dev/null +++ b/test/images/kitten/BASEIMAGE @@ -0,0 +1,5 @@ +amd64=gcr.io/kubernetes-e2e-test-images/test-webserver-amd64:1.0 +arm=gcr.io/kubernetes-e2e-test-images/test-webserver-arm:1.0 +arm64=gcr.io/kubernetes-e2e-test-images/test-webserver-arm64:1.0 +ppc64le=gcr.io/kubernetes-e2e-test-images/test-webserver-ppc64le:1.0 +s390x=gcr.io/kubernetes-e2e-test-images/test-webserver-s390x:1.0 diff --git a/test/images/kitten/Dockerfile b/test/images/kitten/Dockerfile new file mode 100644 index 00000000000..29834a005df --- /dev/null +++ b/test/images/kitten/Dockerfile @@ -0,0 +1,17 @@ +# Copyright 2016 The Kubernetes Authors. +# +# 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 BASEIMAGE +COPY html/kitten.jpg kitten.jpg +COPY html/data.json data.json diff --git a/test/images/kitten/VERSION b/test/images/kitten/VERSION new file mode 100644 index 00000000000..d3827e75a5c --- /dev/null +++ b/test/images/kitten/VERSION @@ -0,0 +1 @@ +1.0 diff --git a/test/images/kitten/html/data.json b/test/images/kitten/html/data.json new file mode 100644 index 00000000000..0be61a42b30 --- /dev/null +++ b/test/images/kitten/html/data.json @@ -0,0 +1,3 @@ +{ + "image": "kitten.jpg" +} diff --git a/test/images/kitten/html/kitten.jpg b/test/images/kitten/html/kitten.jpg new file mode 100644 index 00000000000..a382bf16ace Binary files /dev/null and b/test/images/kitten/html/kitten.jpg differ diff --git a/test/images/liveness/BUILD b/test/images/liveness/BUILD new file mode 100644 index 00000000000..d15af903256 --- /dev/null +++ b/test/images/liveness/BUILD @@ -0,0 +1,34 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_binary", + "go_library", +) + +go_binary( + name = "liveness", + library = ":go_default_library", + tags = ["automanaged"], +) + +go_library( + name = "go_default_library", + srcs = ["server.go"], + tags = ["automanaged"], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/test/images/liveness/Dockerfile b/test/images/liveness/Dockerfile new file mode 100644 index 00000000000..fe022752c82 --- /dev/null +++ b/test/images/liveness/Dockerfile @@ -0,0 +1,17 @@ +# Copyright 2016 The Kubernetes Authors. +# +# 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 + +COPY liveness /server diff --git a/test/images/liveness/Makefile b/test/images/liveness/Makefile new file mode 100644 index 00000000000..e23182351bd --- /dev/null +++ b/test/images/liveness/Makefile @@ -0,0 +1,25 @@ +# Copyright 2016 The Kubernetes Authors. +# +# 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. + +SRCS = liveness +ARCH ?= amd64 +TARGET ?= $(CURDIR) +GOLANG_VERSION ?= latest +SRC_DIR = $(notdir $(shell pwd)) +export + +bin: + ../image-util.sh bin $(SRCS) + +.PHONY: bin diff --git a/test/images/liveness/VERSION b/test/images/liveness/VERSION new file mode 100644 index 00000000000..d3827e75a5c --- /dev/null +++ b/test/images/liveness/VERSION @@ -0,0 +1 @@ +1.0 diff --git a/test/images/liveness/server.go b/test/images/liveness/server.go new file mode 100644 index 00000000000..889d2776568 --- /dev/null +++ b/test/images/liveness/server.go @@ -0,0 +1,46 @@ +/* +Copyright 2014 The Kubernetes Authors. + +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/test/images/nautilus/BASEIMAGE b/test/images/nautilus/BASEIMAGE new file mode 100644 index 00000000000..1d2837d2ff4 --- /dev/null +++ b/test/images/nautilus/BASEIMAGE @@ -0,0 +1,5 @@ +amd64=gcr.io/kubernetes-e2e-test-images/test-webserver-amd64:1.0 +arm=gcr.io/kubernetes-e2e-test-images/test-webserver-arm:1.0 +arm64=gcr.io/kubernetes-e2e-test-images/test-webserver-arm64:1.0 +ppc64le=gcr.io/kubernetes-e2e-test-images/test-webserver-ppc64le:1.0 +s390x=gcr.io/kubernetes-e2e-test-images/test-webserver-s390x:1.0 diff --git a/test/images/nautilus/Dockerfile b/test/images/nautilus/Dockerfile new file mode 100644 index 00000000000..92ba02a4ddb --- /dev/null +++ b/test/images/nautilus/Dockerfile @@ -0,0 +1,17 @@ +# Copyright 2016 The Kubernetes Authors. +# +# 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 BASEIMAGE +COPY html/nautilus.jpg nautilus.jpg +COPY html/data.json data.json diff --git a/test/images/nautilus/VERSION b/test/images/nautilus/VERSION new file mode 100644 index 00000000000..d3827e75a5c --- /dev/null +++ b/test/images/nautilus/VERSION @@ -0,0 +1 @@ +1.0 diff --git a/test/images/nautilus/html/data.json b/test/images/nautilus/html/data.json new file mode 100644 index 00000000000..2debee09a91 --- /dev/null +++ b/test/images/nautilus/html/data.json @@ -0,0 +1,3 @@ +{ + "image": "nautilus.jpg" +} diff --git a/test/images/nautilus/html/nautilus.jpg b/test/images/nautilus/html/nautilus.jpg new file mode 100644 index 00000000000..544d2bd471a Binary files /dev/null and b/test/images/nautilus/html/nautilus.jpg differ