Skip to content

Commit 3147a65

Browse files
authored
Merge pull request #1939 from shysank/1201
Build kubebuilder-tools v1.20.2
2 parents a650c28 + 926e3eb commit 3147a65

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

build/cloudbuild_tools.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@
1414

1515
steps:
1616
- name: "gcr.io/cloud-builders/docker"
17-
args: ["build", "-t", "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.19.2", "./build/thirdparty/${_GOOS}"]
17+
args: ["build", "-t", "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.20.2", "./build/thirdparty/${_GOOS}"]
1818
# darwin takes forever
1919
timeout: 30m
2020

21-
- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.19.2"
22-
args: ["cp", "/kubebuilder_${_GOOS}_${_GOARCH}.tar.gz", "/workspace/kubebuilder-1.19.2-${_GOOS}-${_GOARCH}.tar.gz"]
21+
- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.20.2"
22+
args: ["cp", "/kubebuilder_${_GOOS}_${_GOARCH}.tar.gz", "/workspace/kubebuilder-1.20.2-${_GOOS}-${_GOARCH}.tar.gz"]
2323
env:
2424
- 'GOOS=${_GOOS}'
2525
- 'GOARCH=${_GOARCH}'
2626
- name: 'gcr.io/cloud-builders/gsutil'
27-
args: ['-h', 'Content-Type:application/gzip', 'cp', '/workspace/kubebuilder-1.19.2-${_GOOS}-${_GOARCH}.tar.gz', 'gs://kubebuilder-tools/kubebuilder-tools-1.19.2-${_GOOS}-${_GOARCH}.tar.gz']
27+
args: ['-h', 'Content-Type:application/gzip', 'cp', '/workspace/kubebuilder-1.20.2-${_GOOS}-${_GOARCH}.tar.gz', 'gs://kubebuilder-tools/kubebuilder-tools-1.20.2-${_GOOS}-${_GOARCH}.tar.gz']
2828
env:
2929
- 'GOOS=${_GOOS}'
3030
- 'GOARCH=${_GOARCH}'
31-
images: ["gcr.io/kubebuilder/thirdparty-${_GOOS}:1.19.2"]
31+
images: ["gcr.io/kubebuilder/thirdparty-${_GOOS}:1.20.2"]
3232
# darwin takes forever
3333
timeout: 30m

build/thirdparty/darwin/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN apt update && \
2828
go get github.com/jteeuwen/go-bindata/go-bindata && \
2929
( mkdir -p $DEST || echo "" )
3030

31-
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b v1.19.2
31+
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b v1.20.2
3232

3333
WORKDIR /go/src/k8s.io/kubernetes
3434

@@ -39,7 +39,7 @@ ENV KUBE_BUILD_PLATFORMS darwin/amd64
3939
RUN make WHAT=cmd/kube-apiserver && \
4040
cp _output/local/bin/$KUBE_BUILD_PLATFORMS/kube-apiserver $DEST
4141

42-
RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v1.19.2/bin/darwin/amd64/kubectl && \
42+
RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v1.20.2/bin/darwin/amd64/kubectl && \
4343
chmod +x kubectl && \
4444
cp kubectl $DEST
4545

build/thirdparty/linux/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ ENV DEST /usr/local/kubebuilder/bin/
2525
RUN apk add --no-cache curl && \
2626
mkdir -p $DEST || echo ""
2727

28-
RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v1.19.2/bin/linux/amd64/kubectl && \
28+
RUN curl -sLO https://storage.googleapis.com/kubernetes-release/release/v1.20.2/bin/linux/amd64/kubectl && \
2929
chmod +x kubectl && \
3030
cp kubectl $DEST
3131

32-
RUN curl -sLO https://dl.k8s.io/v1.19.2/kubernetes-server-linux-amd64.tar.gz && \
32+
RUN curl -sLO https://dl.k8s.io/v1.20.2/kubernetes-server-linux-amd64.tar.gz && \
3333
tar xzf kubernetes-server-linux-amd64.tar.gz && \
3434
cp kubernetes/server/bin/kube-apiserver $DEST
3535

0 commit comments

Comments
 (0)