Merge pull request #7837 from knabben/remove-disable-no-echo

⚠️ Removing deprecated (--disable-no-echo) flag and renaming docs

Author: k8s-ci-robot

cmd/clusterctl/cmd/describe_cluster.go

@@ -62,7 +62,6 @@ type describeClusterOptions struct {
 	showClusterResourceSets bool
 	showTemplates           bool
 	echo                    bool
-	disableNoEcho           bool
 	grouping                bool
 	disableGrouping         bool
 	color                   bool
@@ -92,9 +91,9 @@ var describeClusterClusterCmd = &cobra.Command{
 		# e.g. un-group all the machines with Ready=true instead of showing a single group node.
 		clusterctl describe cluster test-1 --grouping=false
 
-		# Describe the cluster named test-1 disabling automatic echo suppression
-        # e.g. show the infrastructure machine objects, no matter if the current state is already reported by the machine's Ready condition.
-		clusterctl describe cluster test-1 --disable-no-echo`),
+		# Describe the cluster named test-1 showing the MachineInfrastructure and BootstrapConfig objects
+		# also when their status is the same as the status of the corresponding machine object.
+		clusterctl describe cluster test-1 --echo`),
 
 	Args: func(cmd *cobra.Command, args []string) error {
 		if len(args) != 1 {
@@ -126,10 +125,6 @@ func init() {
 
 	describeClusterClusterCmd.Flags().BoolVar(&dc.echo, "echo", false, ""+
 		"Show MachineInfrastructure and BootstrapConfig when ready condition is true or it has the Status, Severity and Reason of the machine's object.")
-	describeClusterClusterCmd.Flags().BoolVar(&dc.disableNoEcho, "disable-no-echo", false, ""+
-		"Disable hiding of a MachineInfrastructure and BootstrapConfig when ready condition is true or it has the Status, Severity and Reason of the machine's object.")
-	_ = describeClusterClusterCmd.Flags().MarkDeprecated("disable-no-echo",
-		"use --echo instead.")
 	describeClusterClusterCmd.Flags().BoolVar(&dc.grouping, "grouping", true,
 		"Groups machines when ready condition has the same Status, Severity and Reason.")
 	describeClusterClusterCmd.Flags().BoolVar(&dc.disableGrouping, "disable-grouping", false,
@@ -165,7 +160,7 @@ func runDescribeCluster(cmd *cobra.Command, name string) error {
 		ShowTemplates:           dc.showTemplates,
 		ShowMachineSets:         dc.showMachineSets,
 		AddTemplateVirtualNode:  true,
-		Echo:                    dc.echo || dc.disableNoEcho,
+		Echo:                    dc.echo,
 		Grouping:                dc.grouping && !dc.disableGrouping,
 	})
 	if err != nil {

docs/book/src/clusterctl/commands/describe-cluster.md

@@ -23,18 +23,18 @@ bootstrap object linked to a machine, unless their state differs from the machin
 
 ## Customizing the visualization
 
-By default the visualization generated by `clusterctl describe cluster` hides details for the sake
+By default, the visualization generated by `clusterctl describe cluster` hides details for the sake
 of simplicity and shortness. However, if required, the user can ask for showing all the detail:
 
 By using the `--disable-grouping` flag, the user can force the visualization to show all the machines
 on separated lines, no matter if they have the same state or not:
 
 ![](../../images/describe-cluster-disable-grouping.png)
 
-By using the `--disable-no-echo` flag, the user can force the visualization to show infrastructure machines and
+By using the `--echo` flag, the user can force the visualization to show infrastructure machines and
 bootstrap objects linked to machines, no matter if they have the same state or not:
 
-![](../../images/describe-cluster-disable-no-echo.png)
+![](../../images/describe-cluster-echo.png)
 
 It is also possible to force the visualization to show all the conditions for an object (instead of showing
 only the ready condition). e.g. with `--show-conditions KubeadmControlPlane` you get:

docs/book/src/developer/providers/v1.3-to-v1.4.md

@@ -25,6 +25,7 @@ maintainers of providers and consumers of our Go API.
 - `CloneTemplate` and `CloneTemplateInput` has been removed.
 - The option `--list-images` from `init` subcommand has been removed.
 - `exp/runtime/server.NewServer` has been removed.
+- `--disable-no-echo` option from `clusterctl describe cluster` subcommand has been removed
 
 ### API Changes