diff --git a/test/images/sample-apiserver/Dockerfile b/test/images/sample-apiserver/Dockerfile index 2c1ca2d1add..6866a210526 100644 --- a/test/images/sample-apiserver/Dockerfile +++ b/test/images/sample-apiserver/Dockerfile @@ -12,25 +12,27 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM k8s.gcr.io/kube-cross:v1.10.4-1 as build_k8s_1_10_sample_apiserver +FROM k8s.gcr.io/kube-cross:v1.13.4-1 as build_k8s_1_17_sample_apiserver ENV GOPATH /go RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin ENV PATH $GOPATH/bin:$PATH -# The e2e aggregator test was originally added in #50347 and is designed to test ability to run a 1.7 -# sample-apiserver in newer releases. please see e2e test named "Should be able to support the 1.7 Sample -# API Server using the current Aggregator" -RUN go get -d k8s.io/sample-apiserver \ - && cd ${GOPATH}/src/k8s.io/sample-apiserver \ - && git checkout --track origin/release-1.10 \ - && CGO_ENABLED=0 GOOS=linux GOARCH=BASEARCH go install . + +# The e2e aggregator test is designed to test ability to run sample-apiserver as an aggregated server. +# see e2e test named "Should be able to support the 1.17 Sample API Server using the current Aggregator" + +# Build v1.17.0 to ensure the current release supports a prior version of the sample apiserver +# Get without building to populate module cache +RUN GO111MODULE=on go get -d k8s.io/sample-apiserver@v0.17.0 +# Get with OS/ARCH-specific env to build +RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux GOARCH=BASEARCH go get k8s.io/sample-apiserver@v0.17.0 # for arm, go install uses go/bin/linux_arm, so just find the file and copy it to the root so # we can copy it out from this throw away container image from a standard location RUN find /go/bin -name sample-apiserver -exec cp {} / \; FROM BASEIMAGE -COPY --from=build_k8s_1_10_sample_apiserver /sample-apiserver /sample-apiserver +COPY --from=build_k8s_1_17_sample_apiserver /sample-apiserver /sample-apiserver ENTRYPOINT ["/sample-apiserver"] diff --git a/test/images/sample-apiserver/VERSION b/test/images/sample-apiserver/VERSION index c044b1a3269..b48f3226098 100644 --- a/test/images/sample-apiserver/VERSION +++ b/test/images/sample-apiserver/VERSION @@ -1 +1 @@ -1.10 +1.17