Merge branch 'cleanup-tests' into config/v3

Makefile

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 #  Copyright 2019 The Kubernetes Authors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -68,7 +67,7 @@ generate: generate-testdata ## Update/generate all mock data. You should run thi
 
 .PHONY: generate-testdata
 generate-testdata: ## Update/generate the testdata in $GOPATH/src/sigs.k8s.io/kubebuilder
-	./generate_testdata.sh
+	./test/testdata/generate.sh
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
@@ -87,26 +86,35 @@ golangci-lint:
 
 ##@ Tests
 
-.PHONY: go-test
-go-test: ## Run the unit test
-	go test -race -v ./cmd/... ./pkg/... ./plugins/...
-
 .PHONY: test
-test: ## Run the unit tests (used in the CI)
-	./test.sh
+test: test-unit test-integration test-testdata ## Run the unit and integration tests (used in the CI)
+
+.PHONY: test-unit
+test-unit: ## Run the unit tests
+	go test -race -v ./pkg/...
 
 .PHONY: test-coverage
-test-coverage:  ## Run coveralls
-	# remove all coverage files if exists
-	- rm -rf *.out
-	# run the go tests and gen the file coverage-all used to do the integration with coverrals.io
-	go test -race -failfast -tags=integration -coverprofile=coverage-all.out ./cmd/... ./pkg/... ./plugins/...
+test-coverage: ## Run unit tests creating the output to report coverage
+	- rm -rf *.out  # Remove all coverage files if exists
+	go test -race -failfast -tags=integration -coverprofile=coverage-all.out ./pkg/...
 
-.PHONY: test-e2e-local
-test-e2e-local: ## It will run the script to install kind and run e2e tests
-	## To keep the same kind cluster between test runs, use `SKIP_KIND_CLEANUP=1 make test-e2e-local`
-	./test_e2e_local.sh
+.PHONY: test-integration
+test-integration: ## Run the integration tests
+	./test/integration.sh
 
 .PHONY: check-testdata
 check-testdata: ## Run the script to ensure that the testdata is updated
-	./check_testdata.sh
+	./test/testdata/check.sh
+
+.PHONY: test-testdata
+test-testdata: ## Run the tests of the testdata directory
+	./test/testdata/test.sh
+
+.PHONY: test-e2e-local
+test-e2e-local: ## Run the end-to-end tests locally
+	## To keep the same kind cluster between test runs, use `SKIP_KIND_CLEANUP=1 make test-e2e-local`
+	./test/e2e/local.sh
+
+.PHONY: test-e2e-ci
+test-e2e-ci: ## Run the end-to-end tests (used in the CI)`
+	./test/e2e/ci.sh

pkg/plugins/golang/v2/scaffolds/internal/templates/api/types.go

@@ -87,7 +87,9 @@ type {{ .Resource.Kind }}Status struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-{{ if not .Resource.API.Namespaced }} //+kubebuilder:resource:scope=Cluster {{ end }}
+{{- if not .Resource.API.Namespaced }}
+//+kubebuilder:resource:scope=Cluster
+{{- end }}
 
 // {{ .Resource.Kind }} is the Schema for the {{ .Resource.Plural }} API
 type {{ .Resource.Kind }} struct {

plugins/addon/controller.go

@@ -56,7 +56,7 @@ var _ reconcile.Reconciler = &{{ .Resource.Kind }}Reconciler{}
 // {{ .Resource.Kind }}Reconciler reconciles a {{ .Resource.Kind }} object
 type {{ .Resource.Kind }}Reconciler struct {
 	client.Client
-	Log logr.Logger
+	Log    logr.Logger
 	Scheme *runtime.Scheme
 
 	declarative.Reconciler

plugins/addon/type.go

@@ -76,7 +76,9 @@ type {{ .Resource.Kind }}Status struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-{{ if not .Resource.API.Namespaced }} //+kubebuilder:resource:scope=Cluster {{ end }}
+{{- if not .Resource.API.Namespaced }}
+//+kubebuilder:resource:scope=Cluster
+{{- end }}
 
 // {{.Resource.Kind}} is the Schema for the {{ .Resource.Plural }} API
 type {{ .Resource.Kind }} struct {
@@ -110,7 +112,9 @@ func (o *{{ .Resource.Kind }}) SetCommonStatus(s addonv1alpha1.CommonStatus) {
 }
 
 //+kubebuilder:object:root=true
-{{ if not .Resource.API.Namespaced }} //+kubebuilder:resource:scope=Cluster {{ end }}
+{{- if not .Resource.API.Namespaced }}
+//+kubebuilder:resource:scope=Cluster
+{{- end }}
 
 // {{ .Resource.Kind }}List contains a list of {{ .Resource.Kind }}
 type {{ .Resource.Kind }}List struct {