Merge pull request #2114 from camilamacedo86/declarative-org

⚠️ move declarative plugin to golang domain

Author: k8s-ci-robot

cmd/main.go

@@ -22,7 +22,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/cli"
 	cfgv2 "sigs.k8s.io/kubebuilder/v3/pkg/config/v2"
 	cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3"
-	declarativev1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/declarative/v1"
+	declarativev1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/declarative/v1"
 	pluginv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v2"
 	pluginv3 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3"
 )

pkg/plugins/domain.go

@@ -17,4 +17,4 @@ limitations under the License.
 package plugins
 
 // DefaultNameQualifier is the suffix appended to all kubebuilder plugin names.
-const DefaultNameQualifier = ".kubebuilder.io"
+const DefaultNameQualifier = "kubebuilder.io"

pkg/plugins/declarative/v1/api.go renamed to pkg/plugins/golang/declarative/v1/api.go

@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/declarative/v1/internal/templates"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/declarative/v1/internal/templates"
 	goPluginV3 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3"
 )
 

pkg/plugins/declarative/v1/internal/templates/channel.go renamed to pkg/plugins/golang/declarative/v1/internal/templates/channel.go

@@ -22,10 +22,10 @@ import (
 	cfgv3 "sigs.k8s.io/kubebuilder/v3/pkg/config/v3"
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
-	"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
+	"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang"
 )
 
-const pluginName = "declarative" + plugins.DefaultNameQualifier
+const pluginName = "declarative." + golang.DefaultGoNameQualifier
 
 var (
 	pluginVersion            = plugin.Version{Number: 1}

pkg/plugins/declarative/v1/internal/templates/controller.go renamed to pkg/plugins/golang/declarative/v1/internal/templates/controller.go

@@ -0,0 +1,19 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package golang
+
+import "sigs.k8s.io/kubebuilder/v3/pkg/plugins"
+
+// DefaultGoNameQualifier is the suffix appended to all kubebuilder plugin names for Golang operators.
+const DefaultGoNameQualifier = "go." + plugins.DefaultNameQualifier

pkg/plugins/declarative/v1/internal/templates/manifest.go renamed to pkg/plugins/golang/declarative/v1/internal/templates/manifest.go

@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
 )
 
-const pluginName = "go" + plugins.DefaultNameQualifier
+const pluginName = "go." + plugins.DefaultNameQualifier
 
 var (
 	pluginVersion            = plugin.Version{Number: 2}