diff --git a/cmd/main.go b/cmd/main.go index 6cb55af7014..7311a7e7881 100644 --- a/cmd/main.go +++ b/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" ) diff --git a/pkg/plugins/domain.go b/pkg/plugins/domain.go index 3df0f742d10..8e3f06d2d12 100644 --- a/pkg/plugins/domain.go +++ b/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" diff --git a/pkg/plugins/declarative/v1/api.go b/pkg/plugins/golang/declarative/v1/api.go similarity index 98% rename from pkg/plugins/declarative/v1/api.go rename to pkg/plugins/golang/declarative/v1/api.go index 48e9727ae74..5421c4398ab 100644 --- a/pkg/plugins/declarative/v1/api.go +++ b/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" ) diff --git a/pkg/plugins/declarative/v1/internal/templates/channel.go b/pkg/plugins/golang/declarative/v1/internal/templates/channel.go similarity index 100% rename from pkg/plugins/declarative/v1/internal/templates/channel.go rename to pkg/plugins/golang/declarative/v1/internal/templates/channel.go diff --git a/pkg/plugins/declarative/v1/internal/templates/controller.go b/pkg/plugins/golang/declarative/v1/internal/templates/controller.go similarity index 100% rename from pkg/plugins/declarative/v1/internal/templates/controller.go rename to pkg/plugins/golang/declarative/v1/internal/templates/controller.go diff --git a/pkg/plugins/declarative/v1/internal/templates/manifest.go b/pkg/plugins/golang/declarative/v1/internal/templates/manifest.go similarity index 100% rename from pkg/plugins/declarative/v1/internal/templates/manifest.go rename to pkg/plugins/golang/declarative/v1/internal/templates/manifest.go diff --git a/pkg/plugins/declarative/v1/internal/templates/types.go b/pkg/plugins/golang/declarative/v1/internal/templates/types.go similarity index 100% rename from pkg/plugins/declarative/v1/internal/templates/types.go rename to pkg/plugins/golang/declarative/v1/internal/templates/types.go diff --git a/pkg/plugins/declarative/v1/plugin.go b/pkg/plugins/golang/declarative/v1/plugin.go similarity index 94% rename from pkg/plugins/declarative/v1/plugin.go rename to pkg/plugins/golang/declarative/v1/plugin.go index fdd291aca80..c4d0d327c79 100644 --- a/pkg/plugins/declarative/v1/plugin.go +++ b/pkg/plugins/golang/declarative/v1/plugin.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} diff --git a/pkg/plugins/golang/domain.go b/pkg/plugins/golang/domain.go new file mode 100644 index 00000000000..fd4075465c2 --- /dev/null +++ b/pkg/plugins/golang/domain.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 diff --git a/pkg/plugins/golang/v2/plugin.go b/pkg/plugins/golang/v2/plugin.go index dd38b95ddda..fd1d7779416 100644 --- a/pkg/plugins/golang/v2/plugin.go +++ b/pkg/plugins/golang/v2/plugin.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} diff --git a/pkg/plugins/golang/v3/plugin.go b/pkg/plugins/golang/v3/plugin.go index 1d6a2c381cb..e54b3841473 100644 --- a/pkg/plugins/golang/v3/plugin.go +++ b/pkg/plugins/golang/v3/plugin.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/kubebuilder/v3/pkg/plugins" ) -const pluginName = "go" + plugins.DefaultNameQualifier +const pluginName = "go." + plugins.DefaultNameQualifier var ( pluginVersion = plugin.Version{Number: 3} diff --git a/testdata/project-v2-addon/PROJECT b/testdata/project-v2-addon/PROJECT index c8b327dcca8..6db875d62c8 100644 --- a/testdata/project-v2-addon/PROJECT +++ b/testdata/project-v2-addon/PROJECT @@ -1,9 +1,9 @@ domain: testproject.org layout: - go.kubebuilder.io/v2 -- declarative.kubebuilder.io/v1 +- declarative.go.kubebuilder.io/v1 plugins: - declarative.kubebuilder.io/v1: + declarative.go.kubebuilder.io/v1: resources: - domain: testproject.org group: crew diff --git a/testdata/project-v3-addon/PROJECT b/testdata/project-v3-addon/PROJECT index 8dc17cbd77c..ed2c6fab956 100644 --- a/testdata/project-v3-addon/PROJECT +++ b/testdata/project-v3-addon/PROJECT @@ -1,9 +1,9 @@ domain: testproject.org layout: - go.kubebuilder.io/v3 -- declarative.kubebuilder.io/v1 +- declarative.go.kubebuilder.io/v1 plugins: - declarative.kubebuilder.io/v1: + declarative.go.kubebuilder.io/v1: resources: - domain: testproject.org group: crew diff --git a/testdata/project-v3-config/PROJECT b/testdata/project-v3-config/PROJECT index a16b39f303d..c9729112b31 100644 --- a/testdata/project-v3-config/PROJECT +++ b/testdata/project-v3-config/PROJECT @@ -3,7 +3,7 @@ domain: testproject.org layout: - go.kubebuilder.io/v3 plugins: - declarative.kubebuilder.io/v1: + declarative.go.kubebuilder.io/v1: resources: - domain: testproject.org group: crew diff --git a/testdata/project-v3/PROJECT b/testdata/project-v3/PROJECT index 5767a104d67..b0d353872f7 100644 --- a/testdata/project-v3/PROJECT +++ b/testdata/project-v3/PROJECT @@ -2,7 +2,7 @@ domain: testproject.org layout: - go.kubebuilder.io/v3 plugins: - declarative.kubebuilder.io/v1: + declarative.go.kubebuilder.io/v1: resources: - domain: testproject.org group: crew