Skip to content

Commit 26d12ab

Browse files
camilamacedo86camilamacedo86
authored
Merge pull request #2764 from camilamacedo86/rename-dir
🌱 : rename kustomize v2 dir/pakage to v2-alpha to make clear its level of maturity
2 parents 4fad85e + d19bedc commit 26d12ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+26
-26
lines changed

‎cmd/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2828
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
2929
kustomizecommonv1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v1"
30-
kustomizecommonv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2"
30+
kustomizecommonv2alpha "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha"
3131
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang"
3232
declarativev1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/declarative/v1"
3333
golangv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v2"
@@ -58,7 +58,7 @@ func main() {
5858
golangv3.Plugin{},
5959
gov3Bundle,
6060
&kustomizecommonv1.Plugin{},
61-
&kustomizecommonv2.Plugin{},
61+
&kustomizecommonv2alpha.Plugin{},
6262
&declarativev1.Plugin{},
6363
),
6464
cli.WithPlugins(externalPlugins...),

‎docs/book/src/plugins/kustomize-v2-alpha.md

+2-2

‎pkg/plugins/common/kustomize/v2/api.go ‎pkg/plugins/common/kustomize/v2-alpha/api.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v2
17+
package v2_alpha
1818

1919
import (
2020
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2121
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
22-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds"
22+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds"
2323
)
2424

2525
var _ plugin.CreateAPISubcommand = &createAPISubcommand{}

‎pkg/plugins/common/kustomize/v2/create.go ‎pkg/plugins/common/kustomize/v2-alpha/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v2
17+
package v2_alpha
1818

1919
import (
2020
"strconv"

‎pkg/plugins/common/kustomize/v2/init.go ‎pkg/plugins/common/kustomize/v2-alpha/init.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v2
17+
package v2_alpha
1818

1919
import (
2020
"fmt"
@@ -28,7 +28,7 @@ import (
2828
"sigs.k8s.io/kubebuilder/v3/pkg/internal/validation"
2929
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
3030
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
31-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds"
31+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds"
3232
)
3333

3434
var _ plugin.InitSubcommand = &initSubcommand{}

‎pkg/plugins/common/kustomize/v2/plugin.go ‎pkg/plugins/common/kustomize/v2-alpha/plugin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v2
17+
package v2_alpha
1818

1919
import (
2020
"sigs.k8s.io/kubebuilder/v3/pkg/config"

‎pkg/plugins/common/kustomize/v2/scaffolds/api.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/api.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2424
"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
2525
"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
26-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd"
27-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches"
28-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac"
29-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples"
26+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/crd"
27+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/crd/patches"
28+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac"
29+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/samples"
3030
)
3131

3232
var _ plugins.Scaffolder = &apiScaffolder{}

‎pkg/plugins/common/kustomize/v2/scaffolds/init.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/init.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"sigs.k8s.io/kubebuilder/v3/pkg/config"
2323
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2424
"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
25-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault"
26-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager"
27-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus"
28-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac"
25+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault"
26+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/manager"
27+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/prometheus"
28+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac"
2929
)
3030

3131
const (

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/certificate.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/certmanager/certificate.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomization.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/certmanager/kustomization.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/certmanager/kustomizeconfig.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomization.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/crd/kustomization.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomizeconfig.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/crd/kustomizeconfig.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/crd/patches/enablecainjection_patch.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/crd/patches/enablewebhook_patch.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault/enablecainection_patch.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/kustomization.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault/kustomization.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/manager_auth_proxy_patch.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault/manager_auth_proxy_patch.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/manager_config_patch.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault/manager_config_patch.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault/webhook_manager_patch.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/config.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/manager/config.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/controller_manager_config.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/manager/controller_manager_config.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/manager/kustomization.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/manager/kustomization.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/kustomization.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/prometheus/kustomization.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/prometheus/monitor.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/prometheus/monitor.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/auth_proxy_client_role.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/auth_proxy_client_role.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/auth_proxy_role.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/auth_proxy_role.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/auth_proxy_role_binding.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/auth_proxy_role_binding.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/auth_proxy_service.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/auth_proxy_service.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_editor_role.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/crd_editor_role.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/crd_viewer_role.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/crd_viewer_role.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/kustomization.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/kustomization.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/leader_election_role.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/leader_election_role_binding.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/leader_election_role_binding.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/role_binding.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/role_binding.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/rbac/service_account.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/rbac/service_account.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/samples/crd_sample.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/samples/crd_sample.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomization.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/webhook/kustomization.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomizeconfig.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/webhook/kustomizeconfig.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/service.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/webhook/service.go

File renamed without changes.

‎pkg/plugins/common/kustomize/v2/scaffolds/webhook.go ‎pkg/plugins/common/kustomize/v2-alpha/scaffolds/webhook.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import (
2323
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2424
"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
2525
"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
26-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/certmanager"
27-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/kdefault"
28-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook"
26+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/certmanager"
27+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/kdefault"
28+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds/internal/templates/config/webhook"
2929
)
3030

3131
var _ plugins.Scaffolder = &webhookScaffolder{}

‎pkg/plugins/common/kustomize/v2/webhook.go ‎pkg/plugins/common/kustomize/v2-alpha/webhook.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v2
17+
package v2_alpha
1818

1919
import (
2020
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2121
"sigs.k8s.io/kubebuilder/v3/pkg/plugin"
22-
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2/scaffolds"
22+
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha/scaffolds"
2323
)
2424

2525
var _ plugin.CreateWebhookSubcommand = &createWebhookSubcommand{}

‎pkg/plugins/golang/v3/scaffolds/init.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2828
"sigs.k8s.io/kubebuilder/v3/pkg/plugins"
2929
kustomizecommonv1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v1"
30-
kustomizecommonv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2"
30+
kustomizecommonv2alpha "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2-alpha"
3131
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates"
3232
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v3/scaffolds/internal/templates/hack"
3333
)
@@ -115,12 +115,12 @@ func (s *initScaffolder) Scaffold() error {
115115
// we need to ensure that we use its supported Kustomize Version
116116
// in order to support it
117117
kustomizeVersion = kustomizecommonv1.KustomizeVersion
118-
kustomizev2 := kustomizecommonv2.Plugin{}
118+
kustomizev2 := kustomizecommonv2alpha.Plugin{}
119119
pluginKeyForKustomizeV2 := plugin.KeyFor(kustomizev2)
120120

121121
for _, pluginKey := range s.config.GetPluginChain() {
122122
if pluginKey == pluginKeyForKustomizeV2 {
123-
kustomizeVersion = kustomizecommonv2.KustomizeVersion
123+
kustomizeVersion = kustomizecommonv2alpha.KustomizeVersion
124124
break
125125
}
126126
}

0 commit comments

Comments
 (0)