mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-27 05:27:21 +00:00
Fix review comments - luxas, ixdy
This commit is contained in:
Manjunath A Kumatagi
parent
60778cdaa4
commit
19ca6ca9f2
@ -23,17 +23,17 @@ filegroup(
|
|||||||
"//test/images/fakegitserver:all-srcs",
|
"//test/images/fakegitserver:all-srcs",
|
||||||
"//test/images/goproxy:all-srcs",
|
"//test/images/goproxy:all-srcs",
|
||||||
"//test/images/logs-generator:all-srcs",
|
"//test/images/logs-generator:all-srcs",
|
||||||
"//test/images/mount-tester:all-srcs",
|
"//test/images/mounttest:all-srcs",
|
||||||
"//test/images/n-way-http:all-srcs",
|
"//test/images/n-way-http:all-srcs",
|
||||||
"//test/images/net:all-srcs",
|
"//test/images/net:all-srcs",
|
||||||
"//test/images/netexec:all-srcs",
|
"//test/images/netexec:all-srcs",
|
||||||
"//test/images/network-tester:all-srcs",
|
"//test/images/nettest:all-srcs",
|
||||||
"//test/images/no-snat-test:all-srcs",
|
"//test/images/no-snat-test:all-srcs",
|
||||||
"//test/images/no-snat-test-proxy:all-srcs",
|
"//test/images/no-snat-test-proxy:all-srcs",
|
||||||
"//test/images/port-forward-tester:all-srcs",
|
"//test/images/port-forward-tester:all-srcs",
|
||||||
"//test/images/porter:all-srcs",
|
"//test/images/porter:all-srcs",
|
||||||
"//test/images/resource-consumer:all-srcs",
|
"//test/images/resource-consumer:all-srcs",
|
||||||
"//test/images/serve_hostname:all-srcs",
|
"//test/images/serve-hostname:all-srcs",
|
||||||
],
|
],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
|||||||
@ -12,7 +12,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
REGISTRY ?= gcr.io/k8s-e2e-images
|
REGISTRY ?= gcr.io/kubernetes-e2e-test-images
|
||||||
GOARM=7
|
GOARM=7
|
||||||
QEMUVERSION=v2.7.0
|
QEMUVERSION=v2.7.0
|
||||||
GOLANG_VERSION=1.8.3
|
GOLANG_VERSION=1.8.3
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
clusterapi-tester
|
|
||||||
@ -1 +1 @@
|
|||||||
1.1
|
1.0
|
||||||
|
|||||||
1
test/images/cuda-vector-add/VERSION
Normal file
1
test/images/cuda-vector-add/VERSION
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.0
|
||||||
@ -1 +0,0 @@
|
|||||||
dnsutils
|
|
||||||
@ -1 +1 @@
|
|||||||
1.1
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
ep
|
|
||||||
@ -1 +1 @@
|
|||||||
0.2
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
fakegitserver
|
|
||||||
@ -1 +1 @@
|
|||||||
0.2
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
goproxy
|
|
||||||
@ -1 +1 @@
|
|||||||
0.2
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
hostexec
|
|
||||||
@ -1 +1 @@
|
|||||||
1.3
|
1.0
|
||||||
|
|||||||
@ -63,8 +63,6 @@ build() {
|
|||||||
pushd ${temp_dir}
|
pushd ${temp_dir}
|
||||||
# image tag
|
# image tag
|
||||||
TAG=$(<VERSION)
|
TAG=$(<VERSION)
|
||||||
# image name
|
|
||||||
IMAGENAME=$(<NAME)
|
|
||||||
|
|
||||||
if [[ -f BASEIMAGE ]]; then
|
if [[ -f BASEIMAGE ]]; then
|
||||||
BASEIMAGE=$(getBaseImage ${arch})
|
BASEIMAGE=$(getBaseImage ${arch})
|
||||||
@ -84,12 +82,8 @@ build() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
docker build --pull -t ${REGISTRY}/${IMAGENAME}-${arch}:${TAG} .
|
docker build --pull -t ${REGISTRY}/${IMAGE}-${arch}:${TAG} .
|
||||||
|
|
||||||
# Image without any arch postfix will point to amd64 by default.
|
|
||||||
if [[ "${arch}" == "amd64" ]]; then
|
|
||||||
docker tag ${REGISTRY}/${IMAGENAME}-${arch}:${TAG} ${REGISTRY}/${IMAGENAME}:${TAG}
|
|
||||||
fi
|
|
||||||
popd
|
popd
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@ -102,12 +96,8 @@ push() {
|
|||||||
archs=${!QEMUARCHS[@]}
|
archs=${!QEMUARCHS[@]}
|
||||||
fi
|
fi
|
||||||
for arch in ${archs}; do
|
for arch in ${archs}; do
|
||||||
IMAGENAME=$(<${IMAGE}/NAME)
|
|
||||||
TAG=$(<${IMAGE}/VERSION)
|
TAG=$(<${IMAGE}/VERSION)
|
||||||
gcloud docker -- push ${REGISTRY}/${IMAGENAME}-${arch}:${TAG}
|
gcloud docker -- push ${REGISTRY}/${IMAGE}-${arch}:${TAG}
|
||||||
if [[ "${arch}" == "amd64" ]]; then
|
|
||||||
gcloud docker -- push ${REGISTRY}/${IMAGENAME}:${TAG}
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
iperf
|
|
||||||
@ -1 +1 @@
|
|||||||
0.1
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
jessie-dnsutils
|
|
||||||
@ -1 +1 @@
|
|||||||
0.1
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
logs-generator
|
|
||||||
@ -1 +1 @@
|
|||||||
v0.1.2
|
1.0
|
||||||
|
|||||||
@ -1,5 +0,0 @@
|
|||||||
amd64=gcr.io/google_containers/mounttest-amd64:0.9
|
|
||||||
arm=gcr.io/google_containers/mounttest-arm:0.9
|
|
||||||
arm64=gcr.io/google_containers/mounttest-arm64:0.9
|
|
||||||
ppc64le=gcr.io/google_containers/mounttest-ppc64le:0.9
|
|
||||||
s390x=gcr.io/google_containers/mounttest-s390x:0.9
|
|
||||||
@ -1 +0,0 @@
|
|||||||
mounttest-user
|
|
||||||
@ -1 +0,0 @@
|
|||||||
0.6
|
|
||||||
@ -1 +0,0 @@
|
|||||||
mounttest
|
|
||||||
@ -1 +0,0 @@
|
|||||||
0.9
|
|
||||||
5
test/images/mounttest-user/BASEIMAGE
Normal file
5
test/images/mounttest-user/BASEIMAGE
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
amd64=gcr.io/kubernetes-e2e-test-images/mounttest-amd64:1.0
|
||||||
|
arm=gcr.io/kubernetes-e2e-test-images/mounttest-arm:1.0
|
||||||
|
arm64=gcr.io/kubernetes-e2e-test-images/mounttest-arm64:1.0
|
||||||
|
ppc64le=gcr.io/kubernetes-e2e-test-images/mounttest-ppc64le:1.0
|
||||||
|
s390x=gcr.io/kubernetes-e2e-test-images/mounttest-s390x:1.0
|
||||||
1
test/images/mounttest-user/VERSION
Normal file
1
test/images/mounttest-user/VERSION
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.0
|
||||||
@ -8,12 +8,6 @@ load(
|
|||||||
"go_library",
|
"go_library",
|
||||||
)
|
)
|
||||||
|
|
||||||
go_binary(
|
|
||||||
name = "mount-tester",
|
|
||||||
library = ":go_default_library",
|
|
||||||
tags = ["automanaged"],
|
|
||||||
)
|
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "go_default_library",
|
name = "go_default_library",
|
||||||
srcs = ["mt.go"],
|
srcs = ["mt.go"],
|
||||||
@ -32,3 +26,9 @@ filegroup(
|
|||||||
srcs = [":package-srcs"],
|
srcs = [":package-srcs"],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
go_binary(
|
||||||
|
name = "mounttest",
|
||||||
|
library = ":go_default_library",
|
||||||
|
tags = ["automanaged"],
|
||||||
|
)
|
||||||
1
test/images/mounttest/VERSION
Normal file
1
test/images/mounttest/VERSION
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.0
|
||||||
@ -1 +0,0 @@
|
|||||||
n-way-http
|
|
||||||
@ -1 +1 @@
|
|||||||
1.1
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
e2e-net
|
|
||||||
@ -1 +1 @@
|
|||||||
1.1
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
netexec
|
|
||||||
@ -1 +1 @@
|
|||||||
1.8
|
1.0
|
||||||
|
|||||||
@ -8,12 +8,6 @@ load(
|
|||||||
"go_library",
|
"go_library",
|
||||||
)
|
)
|
||||||
|
|
||||||
go_binary(
|
|
||||||
name = "network-tester",
|
|
||||||
library = ":go_default_library",
|
|
||||||
tags = ["automanaged"],
|
|
||||||
)
|
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "go_default_library",
|
name = "go_default_library",
|
||||||
srcs = ["nettest.go"],
|
srcs = ["nettest.go"],
|
||||||
@ -38,3 +32,9 @@ filegroup(
|
|||||||
srcs = [":package-srcs"],
|
srcs = [":package-srcs"],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
go_binary(
|
||||||
|
name = "nettest",
|
||||||
|
library = ":go_default_library",
|
||||||
|
tags = ["automanaged"],
|
||||||
|
)
|
||||||
1
test/images/nettest/VERSION
Normal file
1
test/images/nettest/VERSION
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.0
|
||||||
@ -1 +0,0 @@
|
|||||||
nettest
|
|
||||||
@ -1 +0,0 @@
|
|||||||
2.0
|
|
||||||
@ -1 +0,0 @@
|
|||||||
no-snat-test-proxy
|
|
||||||
@ -1 +1 @@
|
|||||||
1.0.2
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
no-snat-test
|
|
||||||
@ -1 +1 @@
|
|||||||
1.0.2
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
cuda-vector-add
|
|
||||||
@ -1 +0,0 @@
|
|||||||
v0.2
|
|
||||||
@ -1 +0,0 @@
|
|||||||
portforwardtester
|
|
||||||
@ -1 +1 @@
|
|||||||
1.3
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
porter
|
|
||||||
@ -1 +1 @@
|
|||||||
0.1
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
redis
|
|
||||||
@ -1 +1 @@
|
|||||||
0.1
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
resource_consumer
|
|
||||||
@ -1 +1 @@
|
|||||||
0.1
|
1.0
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
resource_consumer/controller
|
|
||||||
@ -1 +1 @@
|
|||||||
0.1
|
1.0
|
||||||
|
|||||||
@ -8,12 +8,6 @@ load(
|
|||||||
"go_library",
|
"go_library",
|
||||||
)
|
)
|
||||||
|
|
||||||
go_binary(
|
|
||||||
name = "serve_hostname",
|
|
||||||
library = ":go_default_library",
|
|
||||||
tags = ["automanaged"],
|
|
||||||
)
|
|
||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "go_default_library",
|
name = "go_default_library",
|
||||||
srcs = ["serve_hostname.go"],
|
srcs = ["serve_hostname.go"],
|
||||||
@ -32,3 +26,9 @@ filegroup(
|
|||||||
srcs = [":package-srcs"],
|
srcs = [":package-srcs"],
|
||||||
tags = ["automanaged"],
|
tags = ["automanaged"],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
go_binary(
|
||||||
|
name = "serve-hostname",
|
||||||
|
library = ":go_default_library",
|
||||||
|
tags = ["automanaged"],
|
||||||
|
)
|
||||||
1
test/images/serve-hostname/VERSION
Normal file
1
test/images/serve-hostname/VERSION
Normal file
@ -0,0 +1 @@
|
|||||||
|
1.0
|
||||||
@ -1 +0,0 @@
|
|||||||
serve_hostname
|
|
||||||
@ -1 +0,0 @@
|
|||||||
v1.7
|
|
||||||
Loading…
Reference in New Issue
Block a user