chore: update project layout go/v3 to go/v4 (cloudnative-pg#4182)

Closes cloudnative-pg#4171

Signed-off-by: Jonathan Gonzalez V <[email protected]>

.github/workflows/continuous-integration.yml

@@ -113,7 +113,6 @@ jobs:
               - 'api/**'
               - 'cmd/**'
               - 'config/**'
-              - 'controllers/**'
               - 'internal/**'
               - 'licenses/**'
               - 'pkg/**'

Makefile

@@ -101,7 +101,7 @@ test: generate fmt vet manifests envtest ## Run tests.
 	source <(${ENVTEST} use -p env --bin-dir ${ENVTEST_ASSETS_DIR} ${ENVTEST_K8S_VERSION}) ;\
 	export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT=60s ;\
 	export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT=60s ;\
-	go test -coverpkg=./... --count=1 -coverprofile=cover.out ./api/... ./cmd/... ./controllers/... ./internal/... ./pkg/... ./tests/utils ;
+	go test -coverpkg=./... --count=1 -coverprofile=cover.out ./api/... ./cmd/... ./internal/... ./pkg/... ./tests/utils ;
 
 e2e-test-kind: ## Run e2e tests locally using kind.
 	hack/e2e/run-e2e-kind.sh

PROJECT

@@ -1,7 +1,7 @@
 domain: cnpg.io
 layout:
-- go.kubebuilder.io/v3
-projectName: cloudnative-pg-kubebuilderv3
+- go.kubebuilder.io/v4
+projectName: cloudnative-pg-kubebuilderv4
 repo: github.com/cloudnative-pg/cloudnative-pg
 resources:
 - api:

cmd/main.go

@@ -0,0 +1 @@
+../internal/cmd/manager/controller/controller.go

internal/cmd/manager/controller/controller.go

@@ -35,8 +35,8 @@ import (
 
 	// +kubebuilder:scaffold:imports
 	apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
-	"github.com/cloudnative-pg/cloudnative-pg/controllers"
 	"github.com/cloudnative-pg/cloudnative-pg/internal/configuration"
+	"github.com/cloudnative-pg/cloudnative-pg/internal/controller"
 	schemeBuilder "github.com/cloudnative-pg/cloudnative-pg/internal/scheme"
 	"github.com/cloudnative-pg/cloudnative-pg/pkg/certs"
 	"github.com/cloudnative-pg/cloudnative-pg/pkg/management/log"
@@ -230,17 +230,17 @@ func RunController(
 		return err
 	}
 
-	if err = controllers.NewClusterReconciler(mgr, discoveryClient).SetupWithManager(ctx, mgr); err != nil {
+	if err = controller.NewClusterReconciler(mgr, discoveryClient).SetupWithManager(ctx, mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Cluster")
 		return err
 	}
 
-	if err = controllers.NewBackupReconciler(mgr, discoveryClient).SetupWithManager(ctx, mgr); err != nil {
+	if err = controller.NewBackupReconciler(mgr, discoveryClient).SetupWithManager(ctx, mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Backup")
 		return err
 	}
 
-	if err = (&controllers.ScheduledBackupReconciler{
+	if err = (&controller.ScheduledBackupReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("cloudnative-pg-scheduledbackup"),
@@ -249,7 +249,7 @@ func RunController(
 		return err
 	}
 
-	if err = (&controllers.PoolerReconciler{
+	if err = (&controller.PoolerReconciler{
 		Client:          mgr.GetClient(),
 		DiscoveryClient: discoveryClient,
 		Scheme:          mgr.GetScheme(),

internal/cmd/plugin/destroy/destroy.go

@@ -26,8 +26,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/cloudnative-pg/cloudnative-pg/controllers"
 	"github.com/cloudnative-pg/cloudnative-pg/internal/cmd/plugin"
+	"github.com/cloudnative-pg/cloudnative-pg/internal/controller"
 	"github.com/cloudnative-pg/cloudnative-pg/pkg/reconciler/persistentvolumeclaim"
 	"github.com/cloudnative-pg/cloudnative-pg/pkg/utils"
 )
@@ -46,7 +46,7 @@ func Destroy(ctx context.Context, clusterName, instanceName string, keepPVC bool
 	if keepPVC {
 		// we remove the ownership from the pvcs if present
 		for i := range pvcs {
-			if _, isOwned := controllers.IsOwnedByCluster(&pvcs[i]); !isOwned {
+			if _, isOwned := controller.IsOwnedByCluster(&pvcs[i]); !isOwned {
 				continue
 			}
 
@@ -71,7 +71,7 @@ func Destroy(ctx context.Context, clusterName, instanceName string, keepPVC bool
 			pvcs[i].Labels = map[string]string{}
 		}
 
-		_, isOwned := controllers.IsOwnedByCluster(&pvcs[i])
+		_, isOwned := controller.IsOwnedByCluster(&pvcs[i])
 		// if it is requested for deletion and it is owned by the cluster, we delete it. If it is not owned by the cluster
 		// but it does have the instance label and the detached annotation then we can still delete it
 		// We will only skip the iteration and not delete the pvc if it is not owned by the cluster, and it does not have
@@ -104,7 +104,7 @@ func ensurePodIsDeleted(ctx context.Context, instanceName, clusterName string) e
 		return err
 	}
 
-	if _, isOwned := controllers.IsOwnedByCluster(&pod); !isOwned {
+	if _, isOwned := controller.IsOwnedByCluster(&pod); !isOwned {
 		return fmt.Errorf("instance %s is not owned by cluster %s", pod.Name, clusterName)
 	}
 

controllers/backup_controller.go → internal/controller/backup_controller.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/backup_controller_test.go → internal/controller/backup_controller_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/backup_predicates.go → internal/controller/backup_predicates.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/backup_predicates_test.go → internal/controller/backup_predicates_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	storagesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"

controllers/cluster_cleanup.go → internal/controller/cluster_cleanup.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_cleanup_test.go → internal/controller/cluster_cleanup_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	batchv1 "k8s.io/api/batch/v1"

controllers/cluster_controller.go → internal/controller/cluster_controller.go

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package controllers contains the controller of the CRD
-package controllers
+// Package controller contains the controller of the CRD
+package controller
 
 import (
 	"context"

controllers/cluster_controller_test.go → internal/controller/cluster_controller_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_create.go → internal/controller/cluster_create.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_create_test.go → internal/controller/cluster_create_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_delete.go → internal/controller/cluster_delete.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_delete_test.go → internal/controller/cluster_delete_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_image.go → internal/controller/cluster_image.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_pki.go → internal/controller/cluster_pki.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_plugins.go → internal/controller/cluster_plugins.go

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package controllers contains the controller of the CRD
-package controllers
+// Package controller contains the controller of the CRD
+package controller
 
 import (
 	"context"

controllers/cluster_predicates.go → internal/controller/cluster_predicates.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	corev1 "k8s.io/api/core/v1"

controllers/cluster_restore.go → internal/controller/cluster_restore.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_restore_test.go → internal/controller/cluster_restore_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_scale.go → internal/controller/cluster_scale.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_scale_test.go → internal/controller/cluster_scale_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_status.go → internal/controller/cluster_status.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_status_test.go → internal/controller/cluster_status_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_upgrade.go → internal/controller/cluster_upgrade.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/cluster_upgrade_test.go → internal/controller/cluster_upgrade_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"encoding/json"

controllers/plugins.go → internal/controller/plugins.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/pooler_controller.go → internal/controller/pooler_controller.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/pooler_controller_test.go → internal/controller/pooler_controller_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/pooler_predicates.go → internal/controller/pooler_predicates.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	corev1 "k8s.io/api/core/v1"

controllers/pooler_predicates_test.go → internal/controller/pooler_predicates_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	corev1 "k8s.io/api/core/v1"

controllers/pooler_resources.go → internal/controller/pooler_resources.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/pooler_resources_test.go → internal/controller/pooler_resources_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"

controllers/pooler_status.go → internal/controller/pooler_status.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package controllers
+package controller
 
 import (
 	"context"