WC name extended length (#905)

* Removed short name validation from template cluster cmd * Removed enable-long-names flag from nodepool and networkpool templates * Updated changelog * Re-introduced the enable-long-names flag & marked it as deprecated
giantswarm · Oct 6, 2022 · 6c0e4c9 · 6c0e4c9
1 parent d6f7691
commit 6c0e4c9
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 ### Changed
 
 - Add `giantswarm.io/cluster` label to the 'default-apps' bundle so that it's deleted when a `Cluster` is deleted.
+- Deprecated `--enable-long-names` flag and added support for generating and validating long resource names (up to 10 characters) by default
 
 ## [2.23.2] - 2022-10-04
 

diff --git a/cmd/template/cluster/flag.go b/cmd/template/cluster/flag.go
@@ -266,6 +266,7 @@ func (f *flag) Init(cmd *cobra.Command) {
 	cmd.Flags().IntVar(&f.BastionReplicas, flagBastionReplicas, 1, "Replica count for the bastion node")
 
 	_ = cmd.Flags().MarkHidden(flagEnableLongNames)
+	_ = cmd.Flags().MarkDeprecated(flagEnableLongNames, "Long names are supported by default, so this flag is not needed anymore and will be removed in the next major version.")
 
 	// TODO: Make this flag visible when we roll CAPA/EKS out for customers
 	_ = cmd.Flags().MarkHidden(flagAWSEKS)
@@ -300,7 +301,7 @@ func (f *flag) Validate() error {
 	}
 
 	if f.Name != "" {
-		valid, err := key.ValidateName(f.Name, f.EnableLongNames)
+		valid, err := key.ValidateName(f.Name, true)
 		if err != nil {
 			return microerror.Mask(err)
 		} else if !valid {

diff --git a/cmd/template/cluster/provider/templates/aws/cluster.go b/cmd/template/cluster/provider/templates/aws/cluster.go
@@ -54,7 +54,7 @@ func NewClusterCRs(config ClusterCRsConfig) (ClusterCRs, error) {
 	// the workload cluster name may be provided by the user.
 	{
 		if config.ClusterName == "" {
-			generatedName, err := key.GenerateName(config.EnableLongNames)
+			generatedName, err := key.GenerateName(true)
 			if err != nil {
 				return ClusterCRs{}, microerror.Mask(err)
 			}
@@ -63,7 +63,7 @@ func NewClusterCRs(config ClusterCRsConfig) (ClusterCRs, error) {
 		}
 
 		if config.ControlPlaneName == "" {
-			generatedName, err := key.GenerateName(config.EnableLongNames)
+			generatedName, err := key.GenerateName(true)
 			if err != nil {
 				return ClusterCRs{}, microerror.Mask(err)
 			}

diff --git a/cmd/template/cluster/runner.go b/cmd/template/cluster/runner.go
@@ -126,7 +126,7 @@ func (r *runner) getClusterConfig() (provider.ClusterConfig, error) {
 	}
 
 	if config.Name == "" {
-		generatedName, err := key.GenerateName(r.flag.EnableLongNames)
+		generatedName, err := key.GenerateName(true)
 		if err != nil {
 			return provider.ClusterConfig{}, microerror.Mask(err)
 		}

diff --git a/cmd/template/networkpool/flag.go b/cmd/template/networkpool/flag.go
@@ -33,6 +33,7 @@ func (f *flag) Init(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&f.Organization, flagOrganization, "", "Workload cluster organization.")
 
 	_ = cmd.Flags().MarkHidden(flagEnableLongNames)
+	_ = cmd.Flags().MarkDeprecated(flagEnableLongNames, "Long names are supported by default, so this flag is not needed anymore and will be removed in the next major version.")
 }
 
 func (f *flag) Validate() error {

diff --git a/cmd/template/networkpool/runner.go b/cmd/template/networkpool/runner.go
@@ -53,7 +53,7 @@ func (r *runner) run(ctx context.Context, cmd *cobra.Command, args []string) err
 		}
 
 		if config.NetworkPoolName == "" {
-			generatedName, err := key.GenerateName(r.flag.EnableLongNames)
+			generatedName, err := key.GenerateName(true)
 			if err != nil {
 				return microerror.Mask(err)
 			}

diff --git a/cmd/template/nodepool/flag.go b/cmd/template/nodepool/flag.go
@@ -105,6 +105,7 @@ func (f *flag) Init(cmd *cobra.Command) {
 	cmd.Flags().StringVar(&f.Release, flagRelease, "", "Workload cluster release.")
 
 	_ = cmd.Flags().MarkHidden(flagEnableLongNames)
+	_ = cmd.Flags().MarkDeprecated(flagEnableLongNames, "Long names are supported by default, so this flag is not needed anymore and will be removed in the next major version.")
 
 	// TODO: Make this flag visible when we roll CAPA/EKS out for customers
 	_ = cmd.Flags().MarkHidden(flagEKS)

diff --git a/cmd/template/nodepool/provider/templates/aws/nodepool.go b/cmd/template/nodepool/provider/templates/aws/nodepool.go
@@ -24,7 +24,6 @@ type NodePoolCRsConfig struct {
 	ClusterName                         string
 	MachineDeploymentName               string
 	Description                         string
-	EnableLongNames                     bool
 	NodesMax                            int
 	NodesMin                            int
 	OnDemandBaseCapacity                int
@@ -47,7 +46,7 @@ func NewNodePoolCRs(config NodePoolCRsConfig) (NodePoolCRs, error) {
 	// the workload cluster name may be provided by the user.
 	{
 		if config.ClusterName == "" {
-			generatedName, err := key.GenerateName(config.EnableLongNames)
+			generatedName, err := key.GenerateName(true)
 			if err != nil {
 				return NodePoolCRs{}, microerror.Mask(err)
 			}
@@ -56,7 +55,7 @@ func NewNodePoolCRs(config NodePoolCRsConfig) (NodePoolCRs, error) {
 		}
 
 		if config.MachineDeploymentName == "" {
-			generatedName, err := key.GenerateName(config.EnableLongNames)
+			generatedName, err := key.GenerateName(true)
 			if err != nil {
 				return NodePoolCRs{}, microerror.Mask(err)
 			}

diff --git a/cmd/template/nodepool/runner.go b/cmd/template/nodepool/runner.go
@@ -68,7 +68,7 @@ func (r *runner) run(ctx context.Context, cmd *cobra.Command, args []string) err
 		}
 
 		if config.NodePoolName == "" {
-			generatedName, err := key.GenerateName(r.flag.EnableLongNames)
+			generatedName, err := key.GenerateName(true)
 			if err != nil {
 				return microerror.Mask(err)
 			}