Skip to content

Commit 8c1d384

Browse files
authored
Merge pull request #94 from pwittrock/thirdparty
Update thirdparty binaries to 1.10
2 parents 37df59b + b8ae5fd commit 8c1d384

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

build/cloudbuild.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ steps:
2525
args: [fetch, --depth=100]
2626
- name: "ubuntu"
2727
args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
28-
- name: "gcr.io/kubebuilder/thirdparty-linux:1.9"
28+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.10"
2929
args: ["tar", "-xzvf", "/kubebuilder_linux_amd64.tar.gz"]
3030
dir: "_output/linux_amd64"
3131
- name: "ubuntu"
3232
args: ["mkdir", "-p", "/workspace/_output/darwin_amd64"]
33-
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.9"
33+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10"
3434
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3535
dir: "_output/darwin_amd64"
3636
- name: "ubuntu"
3737
args: ["bash", "build/build_vendor.sh"]
3838
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
3939
args: ["bash", "build/build_kubebuilder.sh"]
4040
env:
41-
- 'KUBERNETES_VERSION=1.9'
41+
- 'KUBERNETES_VERSION=1.10'
4242
secretEnv: ['GITHUB_TOKEN']
4343
secrets:
4444
- kmsKeyName: projects/kubebuilder/locations/global/keyRings/kubebuilder-gh-tokens/cryptoKeys/gh-release-token

build/cloudbuild_local.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
steps:
2424
- name: "ubuntu"
2525
args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
26-
- name: "gcr.io/kubebuilder/thirdparty-linux:1.9"
26+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.10"
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.9"
31+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10"
3232
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3333
dir: "_output/darwin_amd64"
3434
- name: "ubuntu"
3535
args: ["bash", "build/build_vendor.sh"]
3636
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
3737
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
3838
env:
39-
- 'KUBERNETES_VERSION=1.9'
39+
- 'KUBERNETES_VERSION=1.10'

build/cloudbuild_snapshot.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
steps:
2424
- name: "ubuntu"
2525
args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
26-
- name: "gcr.io/kubebuilder/thirdparty-linux:1.9"
26+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.10"
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.9"
31+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10"
3232
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3333
dir: "_output/darwin_amd64"
3434
- name: "ubuntu"
3535
args: ["bash", "build/build_vendor.sh"]
3636
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
3737
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
3838
env:
39-
- 'KUBERNETES_VERSION=1.9'
39+
- 'KUBERNETES_VERSION=1.10'
4040
- name: 'gcr.io/cloud-builders/gsutil'
4141
args: ['-h', 'Content-Type:application/gzip', 'cp', '-a', 'public-read', 'dist/kubebuilder_master_linux_amd64.tar.gz', 'gs://kubebuilder-release/kubebuilder_master_linux_amd64.tar.gz']
4242
- name: 'gcr.io/cloud-builders/gsutil'

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.9"
16+
- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.10"
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
@@ -21,15 +21,15 @@
2121
# - reference-docs
2222

2323
# Build k8s.io/kubernetes binaries
24-
FROM golang:1.9-stretch as kubernetes-darwin
24+
FROM golang:1.10-stretch as kubernetes-darwin
2525
# Install tools
2626
RUN apt update
2727
RUN apt install rsync -y
2828
RUN go get github.com/jteeuwen/go-bindata/go-bindata
2929
ENV CGO 0
3030
ENV DEST /usr/local/kubebuilder/bin/
3131
RUN mkdir -p $DEST || echo ""
32-
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b release-1.9
32+
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b release-1.10
3333
WORKDIR /go/src/k8s.io/kubernetes
3434

3535
# Build for linux first otherwise it won't work for darwin - :(
@@ -68,7 +68,7 @@ ENV GOOS darwin
6868
ENV GOARCH amd64
6969
ENV DEST /usr/local/kubebuilder/bin/
7070
RUN mkdir -p $DEST || echo ""
71-
RUN git clone https://github.com/kubernetes/code-generator $GOPATH/src/k8s.io/code-generator --depth=1 -b release-1.9
71+
RUN git clone https://github.com/kubernetes/code-generator $GOPATH/src/k8s.io/code-generator --depth=1 -b release-1.10
7272
RUN go build -o $DEST/client-gen k8s.io/code-generator/cmd/client-gen
7373
RUN go build -o $DEST/conversion-gen k8s.io/code-generator/cmd/conversion-gen
7474
RUN go build -o $DEST/deepcopy-gen k8s.io/code-generator/cmd/deepcopy-gen

build/thirdparty/linux/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
# - *-gen code generators
2121
# - reference-docs
2222

23-
FROM golang:1.9-stretch as kubernetes-linux
23+
FROM golang:1.10-stretch as kubernetes-linux
2424
# Install tools
2525
RUN apt update
2626
RUN apt install rsync -y
2727
RUN go get github.com/jteeuwen/go-bindata/go-bindata
2828
ENV CGO 0
2929
ENV DEST /usr/local/kubebuilder/bin/
3030
RUN mkdir -p $DEST || echo ""
31-
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b release-1.9
31+
RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b release-1.10
3232
WORKDIR /go/src/k8s.io/kubernetes
3333
ENV KUBE_BUILD_PLATFORMS linux/amd64
3434
RUN make WHAT=cmd/kube-apiserver
@@ -53,7 +53,7 @@ ENV GOOS linux
5353
ENV GOARCH amd64
5454
ENV DEST /usr/local/kubebuilder/bin/
5555
RUN mkdir -p $DEST || echo ""
56-
RUN git clone https://github.com/kubernetes/code-generator $GOPATH/src/k8s.io/code-generator --depth=1 -b release-1.9
56+
RUN git clone https://github.com/kubernetes/code-generator $GOPATH/src/k8s.io/code-generator --depth=1 -b release-1.10
5757
RUN go build -o $DEST/client-gen k8s.io/code-generator/cmd/client-gen
5858
RUN go build -o $DEST/conversion-gen k8s.io/code-generator/cmd/conversion-gen
5959
RUN go build -o $DEST/deepcopy-gen k8s.io/code-generator/cmd/deepcopy-gen

0 commit comments

Comments
 (0)