Skip to content

Commit

Permalink
Merge pull request #578 from droot/running/tools_1.13.1
Browse files Browse the repository at this point in the history
🏃 updating tools to k8s 1.13.1
  • Loading branch information
k8s-ci-robot committed Jan 25, 2019
2 parents c4a171f + d08bee1 commit 64ddaf7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions build/cloudbuild_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
steps:
- name: "ubuntu"
args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
- name: "gcr.io/kubebuilder/thirdparty-linux:1.12.3"
- name: "gcr.io/kubebuilder/thirdparty-linux:1.13.1"
args: ["tar", "-xzvf", "/kubebuilder_linux_amd64.tar.gz"]
dir: "_output/linux_amd64"
- name: "ubuntu"
args: ["mkdir", "-p", "/workspace/_output/darwin_amd64"]
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.12.3"
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.13.1"
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
dir: "_output/darwin_amd64"
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.11:0.0.1"
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
env:
- 'KUBERNETES_VERSION=1.12.3'
- 'KUBERNETES_VERSION=1.13.1'
2 changes: 1 addition & 1 deletion build/cloudbuild_tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

steps:
- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.12.3"
- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.13.1"
args: ["cp", "/kubebuilder_${_GOOS}_${_GOARCH}.tar.gz", "/workspace/kubebuilder-${TAG_NAME}-${_GOOS}-${_GOARCH}.tar.gz"]
env:
- 'GOOS=${_GOOS}'
Expand Down
6 changes: 3 additions & 3 deletions build/thirdparty/darwin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN go get github.com/jteeuwen/go-bindata/go-bindata
ENV CGO 0
ENV DEST /usr/local/kubebuilder/bin/
RUN mkdir -p $DEST || echo ""
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b v1.12.3
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b v1.13.1
WORKDIR /go/src/k8s.io/kubernetes

# Build for linux first otherwise it won't work for darwin - :(
Expand All @@ -36,11 +36,11 @@ ENV KUBE_BUILD_PLATFORMS darwin/amd64
RUN make WHAT=cmd/kube-apiserver
RUN cp _output/local/bin/$KUBE_BUILD_PLATFORMS/kube-apiserver $DEST

RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.12.3/bin/darwin/amd64/kubectl
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.13.1/bin/darwin/amd64/kubectl
RUN chmod +x kubectl
RUN cp kubectl $DEST

ENV ETCD_VERSION="3.3.10"
ENV ETCD_VERSION="3.3.11"
ENV ETCD_DOWNLOAD_FILE="etcd-v${ETCD_VERSION}-darwin-amd64.zip"
RUN curl -LO https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-darwin-amd64.zip -o ${ETCD_DOWNLOAD_FILE}
RUN unzip -o ${ETCD_DOWNLOAD_FILE}
Expand Down
6 changes: 3 additions & 3 deletions build/thirdparty/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ ENV CGO 0
ENV DEST /usr/local/kubebuilder/bin/
RUN mkdir -p $DEST || echo ""

RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.12.3/bin/linux/amd64/kubectl
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.13.1/bin/linux/amd64/kubectl
RUN chmod +x kubectl
RUN cp kubectl $DEST

RUN curl -LO https://dl.k8s.io/v1.12.3/kubernetes-server-linux-amd64.tar.gz
RUN curl -LO https://dl.k8s.io/v1.13.1/kubernetes-server-linux-amd64.tar.gz
RUN tar xzf kubernetes-server-linux-amd64.tar.gz
RUN cp kubernetes/server/bin/kube-apiserver $DEST

ENV ETCD_VERSION="3.3.10"
ENV ETCD_VERSION="3.3.11"
ENV ETCD_DOWNLOAD_FILE="etcd-v${ETCD_VERSION}-linux-amd64.tar.gz"
RUN curl -LO https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz -o ${ETCD_DOWNLOAD_FILE}
RUN tar xzf ${ETCD_DOWNLOAD_FILE}
Expand Down

0 comments on commit 64ddaf7

Please sign in to comment.