Skip to content

Commit 3e2003f

Browse files
authored
Merge pull request #525 from mengqiy/update_release_steps
use 1.12.3 k8s tools
2 parents c2d0e13 + 0d44cfb commit 3e2003f

File tree

29 files changed

+259
-135
lines changed

29 files changed

+259
-135
lines changed

Gopkg.lock

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/cloudbuild.yaml

Lines changed: 4 additions & 4 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.11.0"
28+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.12.3"
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.11.0"
33+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.12.3"
3434
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3535
dir: "_output/darwin_amd64"
36-
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
36+
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.11:0.0.1"
3737
args: ["bash", "build/build_kubebuilder.sh"]
3838
env:
39-
- 'KUBERNETES_VERSION=1.11'
39+
- 'KUBERNETES_VERSION=1.12.3'
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: 4 additions & 4 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.11.0"
26+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.12.3"
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.11.0"
31+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.12.3"
3232
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3333
dir: "_output/darwin_amd64"
34-
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
34+
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.11:0.0.1"
3535
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
3636
env:
37-
- 'KUBERNETES_VERSION=1.10'
37+
- 'KUBERNETES_VERSION=1.12.3'

build/cloudbuild_snapshot.yaml

Lines changed: 4 additions & 4 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.11.0"
26+
- name: "gcr.io/kubebuilder/thirdparty-linux:1.12.3"
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.11.0"
31+
- name: "gcr.io/kubebuilder/thirdparty-darwin:1.12.3"
3232
args: ["tar", "-xzvf", "/kubebuilder_darwin_amd64.tar.gz"]
3333
dir: "_output/darwin_amd64"
34-
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.10:0.0.1"
34+
- name: "gcr.io/kubebuilder/goreleaser_with_go_1.11:0.0.1"
3535
args: ["bash", "build/build_kubebuilder.sh", "--snapshot"]
3636
env:
37-
- 'KUBERNETES_VERSION=1.11'
37+
- 'KUBERNETES_VERSION=1.12.3'
3838
- name: 'gcr.io/cloud-builders/gsutil'
3939
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']
4040
- name: 'gcr.io/cloud-builders/gsutil'

common.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ cd "$base_dir" || {
4141
exit 1
4242
}
4343

44-
# k8s_version=1.10.1
45-
k8s_version=1.11.0
44+
# k8s_version=1.11.0
45+
k8s_version=1.12.3
4646
goarch=amd64
4747
goos="unknown"
4848

vendor/sigs.k8s.io/controller-runtime/example/main.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/controller-runtime/pkg/envtest/server.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/controller.go

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/controller-runtime/pkg/internal/controller/metrics/metrics.go

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/http.go

Lines changed: 20 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/webhook.go

Lines changed: 21 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/sigs.k8s.io/controller-runtime/pkg/webhook/bootstrap.go

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)