Merge pull request kubernetes-sigs#1011 from droot/running/bump-up-cr-ct

🏃 parameterize controller-runtime and tools version

Author: k8s-ci-robot

pkg/scaffold/project.go

@@ -37,6 +37,13 @@ import (
 	"sigs.k8s.io/kubebuilder/pkg/scaffold/v2/webhook"
 )
 
+const (
+	// controller runtime version to be used in the project
+	controllerRuntimeVersion = "v0.2.2"
+	// ControllerTools version to be used in the project
+	controllerToolsVersion = "v0.2.1"
+)
+
 type ProjectScaffolder interface {
 	EnsureDependencies() (bool, error)
 	Scaffold() error
@@ -147,11 +154,26 @@ func (p *V2Project) Validate() error {
 }
 
 func (p *V2Project) EnsureDependencies() (bool, error) {
-	c := exec.Command("go", "mod", "tidy") // #nosec
+	// ensure that we are pinning controller-runtime version
+	// xref: https://github.com/kubernetes-sigs/kubebuilder/issues/997
+	c := exec.Command("go", "get", "sigs.k8s.io/controller-runtime@"+controllerRuntimeVersion) // #nosec
 	c.Stderr = os.Stderr
 	c.Stdout = os.Stdout
 	fmt.Println(strings.Join(c.Args, " "))
-	return true, c.Run()
+	err := c.Run()
+	if err != nil {
+		return false, err
+	}
+
+	c = exec.Command("go", "mod", "tidy") // #nosec
+	c.Stderr = os.Stderr
+	c.Stdout = os.Stdout
+	fmt.Println(strings.Join(c.Args, " "))
+	err = c.Run()
+	if err != nil {
+		return false, err
+	}
+	return true, err
 }
 
 func (p *V2Project) buildUniverse() *model.Universe {
@@ -201,8 +223,8 @@ func (p *V2Project) Scaffold() error {
 		&project.AuthProxyRoleBinding{},
 		&managerv2.Config{Image: imgName},
 		&scaffoldv2.Main{},
-		&scaffoldv2.GoMod{},
-		&scaffoldv2.Makefile{Image: imgName},
+		&scaffoldv2.GoMod{ControllerRuntimeVersion: controllerRuntimeVersion},
+		&scaffoldv2.Makefile{Image: imgName, ControllerToolsVersion: controllerToolsVersion},
 		&scaffoldv2.Dockerfile{},
 		&scaffoldv2.Kustomize{},
 		&scaffoldv2.ManagerWebhookPatch{},

pkg/scaffold/v2/gomod.go

@@ -25,6 +25,7 @@ var _ input.File = &GoMod{}
 // GoMod writes a templatefile for go.mod
 type GoMod struct {
 	input.Input
+	ControllerRuntimeVersion string
 }
 
 // GetInput implements input.File
@@ -43,6 +44,6 @@ module {{ .Repo }}
 go 1.12
 
 require (
-	sigs.k8s.io/controller-runtime v0.2.0
+	sigs.k8s.io/controller-runtime {{ .ControllerRuntimeVersion }}
 )
 `

pkg/scaffold/v2/makefile.go

@@ -27,6 +27,8 @@ type Makefile struct {
 	input.Input
 	// Image is controller manager image name
 	Image string
+	// Controller tools version to use in the project
+	ControllerToolsVersion string
 }
 
 // GetInput implements input.File
@@ -106,7 +108,7 @@ docker-push:
 # download controller-gen if necessary
 controller-gen:
 ifeq (, $(shell which controller-gen))
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@{{.ControllerToolsVersion}}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)

testdata/project-v2/Dockerfile

@@ -19,7 +19,9 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager
 
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM gcr.io/distroless/static:latest
+FROM gcr.io/distroless/static:nonroot 
 WORKDIR /
 COPY --from=builder /workspace/manager .
+USER nonroot:nonroot
+
 ENTRYPOINT ["/manager"]

testdata/project-v2/Makefile

@@ -62,7 +62,7 @@ docker-push:
 # download controller-gen if necessary
 controller-gen:
 ifeq (, $(shell which controller-gen))
-	go get sigs.k8s.io/controller-tools/cmd/[email protected].0
+	go get sigs.k8s.io/controller-tools/cmd/[email protected].1
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)

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

@@ -9,7 +9,9 @@ spec:
   group: crew.testproject.org
   names:
     kind: Admiral
+    listKind: AdmiralList
     plural: admirals
+    singular: admiral
   scope: Cluster
   validation:
     openAPIV3Schema:
@@ -34,6 +36,7 @@ spec:
           description: AdmiralStatus defines the observed state of Admiral
           type: object
       type: object
+  version: v1
   versions:
   - name: v1
     served: true

testdata/project-v2/config/crd/bases/crew.testproject.org_admirals.yaml

@@ -9,7 +9,9 @@ spec:
   group: crew.testproject.org
   names:
     kind: Captain
+    listKind: CaptainList
     plural: captains
+    singular: captain
   scope: ""
   validation:
     openAPIV3Schema:
@@ -34,6 +36,7 @@ spec:
           description: CaptainStatus defines the observed state of Captain
           type: object
       type: object
+  version: v1
   versions:
   - name: v1
     served: true

testdata/project-v2/config/crd/bases/crew.testproject.org_captains.yaml

@@ -9,7 +9,9 @@ spec:
   group: crew.testproject.org
   names:
     kind: FirstMate
+    listKind: FirstMateList
     plural: firstmates
+    singular: firstmate
   scope: ""
   validation:
     openAPIV3Schema:
@@ -34,6 +36,7 @@ spec:
           description: FirstMateStatus defines the observed state of FirstMate
           type: object
       type: object
+  version: v1
   versions:
   - name: v1
     served: true

testdata/project-v2/config/crd/bases/crew.testproject.org_firstmates.yaml

@@ -9,5 +9,5 @@ require (
 	k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
 	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
-	sigs.k8s.io/controller-runtime v0.2.0
+	sigs.k8s.io/controller-runtime v0.2.2
 )