Skip to content

Commit 702b272

Browse files
authored
Merge pull request #1123 from droot/running/bump-up-k8s-1.15.5
🏃 bump up k8s tools to 1.15.5
2 parents 45d89bd + daca585 commit 702b272

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

build/cloudbuild.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ steps:
2525
args: [fetch, --tags, --depth=100]
2626
- name: "ubuntu"
2727
args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
28-
- name: "gcr.io/kubebuilder/thirdparty-linux:1.14.1"
28+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.15.5"
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.14.1"
33+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.15.5"
3434
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3535
dir: "_output/darwin_amd64"
3636
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.12.5:0.0.1"
3737
args: ["bash", "build/build_kubebuilder.sh"]
3838
env:
39-
- 'KUBERNETES_VERSION=1.14.1'
39+
- 'KUBERNETES_VERSION=1.15.5'
4040
secretEnv: ['GITHUB_TOKEN']
4141
secrets:
4242
- 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,15 +23,15 @@
2323
steps:
2424
- name: "ubuntu"
2525
args: ["mkdir", "-p", "/workspace/_output/linux_amd64"]
26-
- name: "gcr.io/kubebuilder/thirdparty-linux:1.14.1"
26+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.15.5"
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.14.1"
31+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.15.5"
3232
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3333
dir: "_output/darwin_amd64"
3434
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.12.5:0.0.1"
3535
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
3636
env:
37-
- 'KUBERNETES_VERSION=1.14.1'
37+
- 'KUBERNETES_VERSION=1.15.5'

build/cloudbuild_snapshot.yaml

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

common.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ if [ -z $go_workspace ]; then
5353
exit 1
5454
fi
5555

56-
# k8s_version=1.11.0
57-
k8s_version=1.14.1
56+
k8s_version=1.15.5
5857
goarch=amd64
5958
goos="unknown"
6059

0 commit comments

Comments
 (0)