Skip to content

Commit 26d12ab

Browse files
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions

pkg/plugins/common/kustomize/v2/api.go renamed to pkg/plugins/common/kustomize/v2-alpha/api.go

Lines changed: 2 additions & 2 deletions
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 renamed to pkg/plugins/common/kustomize/v2-alpha/create.go

Lines changed: 1 addition & 1 deletion
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 renamed to pkg/plugins/common/kustomize/v2-alpha/init.go

Lines changed: 2 additions & 2 deletions
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 renamed to pkg/plugins/common/kustomize/v2-alpha/plugin.go

Lines changed: 1 addition & 1 deletion
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 renamed to pkg/plugins/common/kustomize/v2-alpha/scaffolds/api.go

Lines changed: 4 additions & 4 deletions
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 renamed to pkg/plugins/common/kustomize/v2-alpha/scaffolds/init.go

Lines changed: 4 additions & 4 deletions
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 (

0 commit comments

Comments
 (0)