From b8ae5fd635ae260dde354f0cea359c3a24cc5d37 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Wed, 25 Apr 2018 21:17:08 -0700 Subject: [PATCH] Update thirdparty to 1.10 --- build/cloudbuild.yaml | 6 +++--- build/cloudbuild_local.yaml | 6 +++--- build/cloudbuild_snapshot.yaml | 6 +++--- build/cloudbuild_tools.yaml | 2 +- build/thirdparty/darwin/Dockerfile | 6 +++--- build/thirdparty/linux/Dockerfile | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/cloudbuild.yaml b/build/cloudbuild.yaml index 4285042334..064b3501fa 100644 --- a/build/cloudbuild.yaml +++ b/build/cloudbuild.yaml @@ -25,12 +25,12 @@ steps: args: [fetch, --depth=100] - name: "ubuntu" args: ["mkdir", "-p", "/workspace/_output/linux_amd64"] -- name: "gcr.io/kubebuilder/thirdparty-linux:1.9" +- name: "gcr.io/kubebuilder/thirdparty-linux:1.10" 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.9" +- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10" args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"] dir: "_output/darwin_amd64" - name: "ubuntu" @@ -38,7 +38,7 @@ steps: - name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1" args: ["bash", "build/build_kubebuilder.sh"] env: - - 'KUBERNETES_VERSION=1.9' + - 'KUBERNETES_VERSION=1.10' secretEnv: ['GITHUB_TOKEN'] secrets: - kmsKeyName: projects/kubebuilder/locations/global/keyRings/kubebuilder-gh-tokens/cryptoKeys/gh-release-token diff --git a/build/cloudbuild_local.yaml b/build/cloudbuild_local.yaml index 105ddd505b..85f1b2bf6d 100644 --- a/build/cloudbuild_local.yaml +++ b/build/cloudbuild_local.yaml @@ -23,12 +23,12 @@ steps: - name: "ubuntu" args: ["mkdir", "-p", "/workspace/_output/linux_amd64"] -- name: "gcr.io/kubebuilder/thirdparty-linux:1.9" +- name: "gcr.io/kubebuilder/thirdparty-linux:1.10" 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.9" +- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10" args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"] dir: "_output/darwin_amd64" - name: "ubuntu" @@ -36,4 +36,4 @@ steps: - name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1" args: ["bash", "build/build_kubebuilder.sh", "--snapshot"] env: - - 'KUBERNETES_VERSION=1.9' + - 'KUBERNETES_VERSION=1.10' diff --git a/build/cloudbuild_snapshot.yaml b/build/cloudbuild_snapshot.yaml index 7153fabf8c..fbf18d14de 100644 --- a/build/cloudbuild_snapshot.yaml +++ b/build/cloudbuild_snapshot.yaml @@ -23,12 +23,12 @@ steps: - name: "ubuntu" args: ["mkdir", "-p", "/workspace/_output/linux_amd64"] -- name: "gcr.io/kubebuilder/thirdparty-linux:1.9" +- name: "gcr.io/kubebuilder/thirdparty-linux:1.10" 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.9" +- name: "gcr.io/kubebuilder/thirdparty-darwin:1.10" args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"] dir: "_output/darwin_amd64" - name: "ubuntu" @@ -36,7 +36,7 @@ steps: - name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1" args: ["bash", "build/build_kubebuilder.sh", "--snapshot"] env: - - 'KUBERNETES_VERSION=1.9' + - 'KUBERNETES_VERSION=1.10' - name: 'gcr.io/cloud-builders/gsutil' 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'] - name: 'gcr.io/cloud-builders/gsutil' diff --git a/build/cloudbuild_tools.yaml b/build/cloudbuild_tools.yaml index b945567f08..f89abbff14 100644 --- a/build/cloudbuild_tools.yaml +++ b/build/cloudbuild_tools.yaml @@ -13,7 +13,7 @@ # limitations under the License. steps: -- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.9" +- name: "gcr.io/kubebuilder/thirdparty-${_GOOS}:1.10" args: ["cp", "/kubebuilder_${_GOOS}_${_GOARCH}.tar.gz", "/workspace/kubebuilder-${TAG_NAME}-${_GOOS}-${_GOARCH}.tar.gz"] env: - 'GOOS=${_GOOS}' diff --git a/build/thirdparty/darwin/Dockerfile b/build/thirdparty/darwin/Dockerfile index 33346ac1fa..d005c27c88 100644 --- a/build/thirdparty/darwin/Dockerfile +++ b/build/thirdparty/darwin/Dockerfile @@ -21,7 +21,7 @@ # - reference-docs # Build k8s.io/kubernetes binaries -FROM golang:1.9-stretch as kubernetes-darwin +FROM golang:1.10-stretch as kubernetes-darwin # Install tools RUN apt update RUN apt install rsync -y @@ -29,7 +29,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 release-1.9 +RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b release-1.10 WORKDIR /go/src/k8s.io/kubernetes # Build for linux first otherwise it won't work for darwin - :( @@ -68,7 +68,7 @@ ENV GOOS darwin ENV GOARCH amd64 ENV DEST /usr/local/kubebuilder/bin/ RUN mkdir -p $DEST || echo "" -RUN git clone https://github.com/kubernetes/code-generator $GOPATH/src/k8s.io/code-generator --depth=1 -b release-1.9 +RUN git clone https://github.com/kubernetes/code-generator $GOPATH/src/k8s.io/code-generator --depth=1 -b release-1.10 RUN go build -o $DEST/client-gen k8s.io/code-generator/cmd/client-gen RUN go build -o $DEST/conversion-gen k8s.io/code-generator/cmd/conversion-gen RUN go build -o $DEST/deepcopy-gen k8s.io/code-generator/cmd/deepcopy-gen diff --git a/build/thirdparty/linux/Dockerfile b/build/thirdparty/linux/Dockerfile index c1936dcb51..db7ddf7dd3 100644 --- a/build/thirdparty/linux/Dockerfile +++ b/build/thirdparty/linux/Dockerfile @@ -20,7 +20,7 @@ # - *-gen code generators # - reference-docs -FROM golang:1.9-stretch as kubernetes-linux +FROM golang:1.10-stretch as kubernetes-linux # Install tools RUN apt update RUN apt install rsync -y @@ -28,7 +28,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 release-1.9 +RUN git clone https://github.com/kubernetes/kubernetes $GOPATH/src/k8s.io/kubernetes --depth=1 -b release-1.10 WORKDIR /go/src/k8s.io/kubernetes ENV KUBE_BUILD_PLATFORMS linux/amd64 RUN make WHAT=cmd/kube-apiserver @@ -53,7 +53,7 @@ ENV GOOS linux ENV GOARCH amd64 ENV DEST /usr/local/kubebuilder/bin/ RUN mkdir -p $DEST || echo "" -RUN git clone https://github.com/kubernetes/code-generator $GOPATH/src/k8s.io/code-generator --depth=1 -b release-1.9 +RUN git clone https://github.com/kubernetes/code-generator $GOPATH/src/k8s.io/code-generator --depth=1 -b release-1.10 RUN go build -o $DEST/client-gen k8s.io/code-generator/cmd/client-gen RUN go build -o $DEST/conversion-gen k8s.io/code-generator/cmd/conversion-gen RUN go build -o $DEST/deepcopy-gen k8s.io/code-generator/cmd/deepcopy-gen