Skip to content

Commit de2317f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1111 from droot/running/bump-cr-ct-0.3.0-0.2.2
🏃 bumped up CR to 0.3.0 and CT to 0.2.2 version
2 parents abcfa98 + da02981 commit de2317f

File tree

9 files changed

+236
-88
lines changed

9 files changed

+236
-88
lines changed

‎docs/book/install-and-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ chmod +x /tmp/mdbook
4444
echo "grabbing the latest released controller-gen"
4545
# TODO(directxman12): remove the @v0.2.0-beta.4 once get v0.2.0 released,
4646
# so that we actually get the latest version
47-
go get sigs.k8s.io/controller-tools/cmd/[email protected].0-beta.5
47+
go get sigs.k8s.io/controller-tools/cmd/[email protected].2
4848

4949
# make sure we add the go bin directory to our path
5050
gobin=$(go env GOBIN)

‎docs/book/src/cronjob-tutorial/testdata/project/api/v1/zz_generated.deepcopy.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.

‎docs/book/src/cronjob-tutorial/testdata/project/go.mod

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,10 @@ go 1.12
44

55
require (
66
github.com/go-logr/logr v0.1.0
7-
github.com/gogo/protobuf v1.2.1 // indirect
8-
github.com/json-iterator/go v1.1.6 // indirect
9-
github.com/modern-go/reflect2 v1.0.1 // indirect
10-
github.com/onsi/ginkgo v1.8.0 // indirect
11-
github.com/onsi/gomega v1.5.0 // indirect
12-
github.com/robfig/cron v1.1.0
13-
github.com/spf13/pflag v1.0.3 // indirect
14-
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09 // indirect
15-
golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872 // indirect
16-
golang.org/x/text v0.3.2 // indirect
17-
gopkg.in/yaml.v2 v2.2.2 // indirect
18-
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
19-
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
20-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
21-
sigs.k8s.io/controller-runtime v0.2.0-rc.0
7+
github.com/robfig/cron v1.2.0
8+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
9+
k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
10+
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
11+
k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
12+
sigs.k8s.io/controller-runtime v0.3.0
2213
)

‎docs/book/src/cronjob-tutorial/testdata/project/go.sum

Lines changed: 202 additions & 60 deletions
Large diffs are not rendered by default.

‎pkg/scaffold/project.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ import (
4040

4141
const (
4242
// controller runtime version to be used in the project
43-
controllerRuntimeVersion = "v0.2.2"
43+
controllerRuntimeVersion = "v0.3.0"
4444
// ControllerTools version to be used in the project
45-
controllerToolsVersion = "v0.2.1"
45+
controllerToolsVersion = "v0.2.2"
4646
)
4747

4848
type ProjectScaffolder interface {

‎pkg/scaffold/v2/makefile.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,14 @@ docker-push:
108108
# download controller-gen if necessary
109109
controller-gen:
110110
ifeq (, $(shell which controller-gen))
111-
go get sigs.k8s.io/controller-tools/cmd/controller-gen@{{.ControllerToolsVersion}}
111+
@{ \
112+
set -e ;\
113+
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
114+
cd $$CONTROLLER_GEN_TMP_DIR ;\
115+
go mod init tmp ;\
116+
go get sigs.k8s.io/controller-tools/cmd/controller-gen@{{.ControllerToolsVersion}} ;\
117+
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
118+
}
112119
CONTROLLER_GEN=$(GOBIN)/controller-gen
113120
else
114121
CONTROLLER_GEN=$(shell which controller-gen)

‎testdata/project-v2/Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,14 @@ docker-push:
6262
# download controller-gen if necessary
6363
controller-gen:
6464
ifeq (, $(shell which controller-gen))
65-
go get sigs.k8s.io/controller-tools/cmd/[email protected]
65+
@{ \
66+
set -e ;\
67+
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
68+
cd $$CONTROLLER_GEN_TMP_DIR ;\
69+
go mod init tmp ;\
70+
go get sigs.k8s.io/controller-tools/cmd/[email protected] ;\
71+
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
72+
}
6673
CONTROLLER_GEN=$(GOBIN)/controller-gen
6774
else
6875
CONTROLLER_GEN=$(shell which controller-gen)

‎testdata/project-v2/api/v1/zz_generated.deepcopy.go

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

‎testdata/project-v2/go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ require (
66
github.com/go-logr/logr v0.1.0
77
github.com/onsi/ginkgo v1.6.0
88
github.com/onsi/gomega v1.4.2
9-
k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
10-
k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
11-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
12-
sigs.k8s.io/controller-runtime v0.2.2
9+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 // indirect
10+
k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
11+
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
12+
k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
13+
sigs.k8s.io/controller-runtime v0.3.0
1314
)

0 commit comments

Comments
 (0)