mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Merge pull request #3787 from satnam6502/serve_hostname
Reduce size of serve_hostname image
This commit is contained in:
commit
988d15943f
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:14.04
|
FROM scratch
|
||||||
MAINTAINER Tim Hockin <thockin@google.com>
|
MAINTAINER Tim Hockin <thockin@google.com>
|
||||||
ADD serve_hostname /serve_hostname
|
ADD serve_hostname /serve_hostname
|
||||||
ADD serve_hostname.go /serve_hostname.go
|
ADD serve_hostname.go /serve_hostname.go
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
all: serve_hostname
|
all: serve_hostname
|
||||||
|
|
||||||
TAG = 1.0
|
TAG = 1.1
|
||||||
|
|
||||||
serve_hostname: serve_hostname.go
|
serve_hostname: serve_hostname.go
|
||||||
CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./serve_hostname.go
|
CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./serve_hostname.go
|
||||||
|
@ -34,7 +34,7 @@ function teardown() {
|
|||||||
trap "teardown" EXIT
|
trap "teardown" EXIT
|
||||||
|
|
||||||
# Determine which pod image to launch (e.g. private.sh launches a different one).
|
# Determine which pod image to launch (e.g. private.sh launches a different one).
|
||||||
pod_img_srv="${POD_IMG_SRV:-kubernetes/serve_hostname}"
|
pod_img_srv="${POD_IMG_SRV:-kubernetes/serve_hostname:1.1}"
|
||||||
|
|
||||||
# Launch some pods.
|
# Launch some pods.
|
||||||
num_pods=2
|
num_pods=2
|
||||||
|
@ -32,5 +32,5 @@ if [[ "${KUBERNETES_PROVIDER}" != "gce" ]] && [[ "${KUBERNETES_PROVIDER}" != "gk
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Run the basic.sh test, but using this image.
|
# Run the basic.sh test, but using this image.
|
||||||
export POD_IMG_SRV="gcr.io/_b_k8s_test/serve_hostname:1.0"
|
export POD_IMG_SRV="gcr.io/_b_k8s_test/serve_hostname:1.1"
|
||||||
source "${KUBE_ROOT}/hack/e2e-suite/basic.sh"
|
source "${KUBE_ROOT}/hack/e2e-suite/basic.sh"
|
||||||
|
@ -187,5 +187,5 @@ func TestBasicImage(c *client.Client, test string, image string) bool {
|
|||||||
// TestBasic performs the TestBasicImage check with the
|
// TestBasic performs the TestBasicImage check with the
|
||||||
// image kubernetes/serve_hostname
|
// image kubernetes/serve_hostname
|
||||||
func TestBasic(c *client.Client) bool {
|
func TestBasic(c *client.Client) bool {
|
||||||
return TestBasicImage(c, "basic", "kubernetes/serve_hostname:1.0")
|
return TestBasicImage(c, "basic", "kubernetes/serve_hostname:1.1")
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user