Skip to content

Commit 64ddaf7

Browse files
authored
Merge pull request #578 from droot/running/tools_1.13.1
🏃 updating tools to k8s 1.13.1
2 parents c4a171f + d08bee1 commit 64ddaf7

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

build/cloudbuild_local.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
steps:
2424
- name: "ubuntu"
2525
args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
26-
- name: "gcr.io/kubebuilder/thirdparty-linux:1.12.3"
26+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.13.1"
2727
args: ["tar", "-xzvf", "/kubebuilder_linux_amd64.tar.gz"]
2828
dir: "_output/linux_amd64"
2929
- name: "ubuntu"
3030
args: ["mkdir", "-p", "/workspace/_output/darwin_amd64"]
31-
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.12.3"
31+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.13.1"
3232
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3333
dir: "_output/darwin_amd64"
3434
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.11:0.0.1"
3535
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
3636
env:
37-
- 'KUBERNETES_VERSION=1.12.3'
37+
- 'KUBERNETES_VERSION=1.13.1'

build/cloudbuild_tools.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
steps:
16-
- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.12.3"
16+
- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.13.1"
1717
args: ["cp", "/kubebuilder_${_GOOS}_${_GOARCH}.tar.gz", "/workspace/kubebuilder-${TAG_NAME}-${_GOOS}-${_GOARCH}.tar.gz"]
1818
env:
1919
- 'GOOS=${_GOOS}'

build/thirdparty/darwin/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN go get github.com/jteeuwen/go-bindata/go-bindata
2626
ENV CGO 0
2727
ENV DEST /usr/local/kubebuilder/bin/
2828
RUN mkdir -p $DEST || echo ""
29-
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b v1.12.3
29+
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b v1.13.1
3030
WORKDIR /go/src/k8s.io/kubernetes
3131

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

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

43-
ENV ETCD_VERSION="3.3.10"
43+
ENV ETCD_VERSION="3.3.11"
4444
ENV ETCD_DOWNLOAD_FILE="etcd-v${ETCD_VERSION}-darwin-amd64.zip"
4545
RUN curl -LO https://github.com/coreos/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-darwin-amd64.zip -o ${ETCD_DOWNLOAD_FILE}
4646
RUN unzip -o ${ETCD_DOWNLOAD_FILE}

build/thirdparty/linux/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ ENV CGO 0
2626
ENV DEST /usr/local/kubebuilder/bin/
2727
RUN mkdir -p $DEST || echo ""
2828

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

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

37-
ENV ETCD_VERSION="3.3.10"
37+
ENV ETCD_VERSION="3.3.11"
3838
ENV ETCD_DOWNLOAD_FILE="etcd-v${ETCD_VERSION}-linux-amd64.tar.gz"
3939
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}
4040
RUN tar xzf ${ETCD_DOWNLOAD_FILE}

0 commit comments

Comments
 (0)