Skip to content

K
k3s
Commit 19ca6ca9 authored by Manjunath A Kumatagi's avatar Manjunath A Kumatagi
Browse files
Options

Fix review comments - luxas, ixdy

parent 60778cda
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 87 deletions
test/images/BUILD
View file @ 19ca6ca9
...@@ -23,17 +23,17 @@ filegroup( ...@@ -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"],
) )
test/images/Makefile
View file @ 19ca6ca9
...@@ -12,7 +12,7 @@ ...@@ -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
......
test/images/image-util.sh
View file @ 19ca6ca9
...@@ -63,8 +63,6 @@ build() { ...@@ -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() { ...@@ -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() { ...@@ -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
} }
......
test/images/mount-tester-user/BASEIMAGE deleted 100644 → 0
View file @ 60778cda
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
test/images/mounttest-user/BASEIMAGE 0 → 100644
View file @ 19ca6ca9
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
test/images/mount-tester/BUILD → test/images/mounttest/BUILD
View file @ 19ca6ca9
...@@ -8,12 +8,6 @@ load( ...@@ -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( ...@@ -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"],
)
test/images/network-tester/BUILD → test/images/nettest/BUILD
View file @ 19ca6ca9
...@@ -8,12 +8,6 @@ load( ...@@ -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( ...@@ -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"],
)
test/images/serve_hostname/BUILD → test/images/serve-hostname/BUILD
View file @ 19ca6ca9
...@@ -8,12 +8,6 @@ load( ...@@ -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( ...@@ -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"],
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment