mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #49196 from mkumatag/github_io
Automatic merge from submit-queue (batch tested with PRs 47738, 49196, 48907, 48533, 48822) Move e2e dependent images from kubernetes/kubernetes.github.io repo **What this PR does / why we need it**: Move e2e dependent images from kubernetes/kubernetes.github.io repo **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #48530 **Special notes for your reviewer**: **Release note**: ```NONE ```
This commit is contained in:
commit
d5f05de1d4
@ -22,6 +22,7 @@ filegroup(
|
|||||||
"//test/images/entrypoint-tester:all-srcs",
|
"//test/images/entrypoint-tester:all-srcs",
|
||||||
"//test/images/fakegitserver:all-srcs",
|
"//test/images/fakegitserver:all-srcs",
|
||||||
"//test/images/goproxy:all-srcs",
|
"//test/images/goproxy:all-srcs",
|
||||||
|
"//test/images/liveness:all-srcs",
|
||||||
"//test/images/logs-generator:all-srcs",
|
"//test/images/logs-generator:all-srcs",
|
||||||
"//test/images/mounttest:all-srcs",
|
"//test/images/mounttest:all-srcs",
|
||||||
"//test/images/n-way-http:all-srcs",
|
"//test/images/n-way-http:all-srcs",
|
||||||
|
5
test/images/kitten/BASEIMAGE
Normal file
5
test/images/kitten/BASEIMAGE
Normal file
@ -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
|
17
test/images/kitten/Dockerfile
Normal file
17
test/images/kitten/Dockerfile
Normal file
@ -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
|
1
test/images/kitten/VERSION
Normal file
1
test/images/kitten/VERSION
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.0
|
3
test/images/kitten/html/data.json
Normal file
3
test/images/kitten/html/data.json
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"image": "kitten.jpg"
|
||||||
|
}
|
BIN
test/images/kitten/html/kitten.jpg
Normal file
BIN
test/images/kitten/html/kitten.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
34
test/images/liveness/BUILD
Normal file
34
test/images/liveness/BUILD
Normal file
@ -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"],
|
||||||
|
)
|
17
test/images/liveness/Dockerfile
Normal file
17
test/images/liveness/Dockerfile
Normal file
@ -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
|
25
test/images/liveness/Makefile
Normal file
25
test/images/liveness/Makefile
Normal file
@ -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
|
1
test/images/liveness/VERSION
Normal file
1
test/images/liveness/VERSION
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.0
|
46
test/images/liveness/server.go
Normal file
46
test/images/liveness/server.go
Normal file
@ -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))
|
||||||
|
}
|
5
test/images/nautilus/BASEIMAGE
Normal file
5
test/images/nautilus/BASEIMAGE
Normal file
@ -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
|
17
test/images/nautilus/Dockerfile
Normal file
17
test/images/nautilus/Dockerfile
Normal file
@ -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
|
1
test/images/nautilus/VERSION
Normal file
1
test/images/nautilus/VERSION
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.0
|
3
test/images/nautilus/html/data.json
Normal file
3
test/images/nautilus/html/data.json
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
{
|
||||||
|
"image": "nautilus.jpg"
|
||||||
|
}
|
BIN
test/images/nautilus/html/nautilus.jpg
Normal file
BIN
test/images/nautilus/html/nautilus.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 21 KiB |
Loading…
Reference in New Issue
Block a user