github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-22 10:06:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69239 from fedebongio/aggregator-update

Browse Source 
upgrading sample-apiserver to 1.10
This commit is contained in:
k8s-ci-robot 2018-10-12 20:41:59 -07:00 committed by GitHub
commit d918327926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/images/sample-apiserver/BASEIMAGE
View File

@ -2,3 +2,4 @@ amd64=alpine:3.8
arm=arm32v6/alpine:3.8
arm64=arm64v8/alpine:3.8
ppc64le=ppc64le/alpine:3.8
s390x=s390x/alpine:3.8

6
test/images/sample-apiserver/Dockerfile
View File

@ -12,7 +12,7 @@
# 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_7_sample_apiserver
FROM k8s.gcr.io/kube-cross:v1.10.4-1 as build_k8s_1_10_sample_apiserver
ENV GOPATH /go
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
@ -23,7 +23,7 @@ ENV PATH $GOPATH/bin:$PATH
# 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.7 \
&& git checkout --track origin/release-1.10 \
&& CGO_ENABLED=0 GOOS=linux GOARCH=BASEARCH go install .
# for arm, go install uses go/bin/linux_arm, so just find the file and copy it to the root so
@ -31,6 +31,6 @@ RUN go get -d k8s.io/sample-apiserver \
RUN find /go/bin -name sample-apiserver -exec cp {} / \;
FROM BASEIMAGE
COPY --from=build_k8s_1_7_sample_apiserver /sample-apiserver /sample-apiserver
COPY --from=build_k8s_1_10_sample_apiserver /sample-apiserver /sample-apiserver
ENTRYPOINT ["/sample-apiserver"]

2
test/images/sample-apiserver/VERSION
View File

@ -1 +1 @@
1.0
1.10