Merge pull request #49196 from mkumatag/github_io

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

test/images/kitten/BASEIMAGE

+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

test/images/kitten/Dockerfile

+# 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

test/images/kitten/VERSION

+1.0

test/images/kitten/html/data.json

+{
+  "image": "kitten.jpg"
+}

test/images/liveness/BUILD

+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"],
+)

test/images/liveness/Dockerfile

+# 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

test/images/liveness/Makefile

+# 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

test/images/liveness/VERSION

+1.0

test/images/liveness/server.go

+/*
+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))
+}

test/images/nautilus/BASEIMAGE

+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

test/images/nautilus/Dockerfile

+# 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

test/images/nautilus/VERSION

+1.0

test/images/nautilus/html/data.json

+{
+  "image": "nautilus.jpg"
+}