Skip to content

Commit

Permalink
Update thirdparty to 1.10
Browse files Browse the repository at this point in the history
  • Loading branch information
pwittrock committed Apr 26, 2018
1 parent 37df59b commit b8ae5fd
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions build/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ 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"
args: ["bash", "build/build_vendor.sh"]
- 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
Expand Down
6 changes: 3 additions & 3 deletions build/cloudbuild_local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@
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"
args: ["bash", "build/build_vendor.sh"]
- 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'
6 changes: 3 additions & 3 deletions build/cloudbuild_snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@
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"
args: ["bash", "build/build_vendor.sh"]
- 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'
Expand Down
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.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}'
Expand Down
6 changes: 3 additions & 3 deletions build/thirdparty/darwin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
# - 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
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 - :(
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build/thirdparty/linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
# - *-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
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
Expand All @@ -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
Expand Down

0 comments on commit b8ae5fd

Please sign in to comment.