Merge pull request kubernetes#88133 from julianvmodesto/dry-run-tests

Cleanup --dry-run values in tests, docs, and scripts

Author: k8s-ci-robot

cluster/gce/upgrade.sh

@@ -518,7 +518,7 @@ function update-coredns-config() {
   if test "$(printf '%s\n' ${CURRENT_COREDNS_VERSION} ${NEW_COREDNS_VERSION} | sort -V | head -n 1)" != ${NEW_COREDNS_VERSION}; then
      echo "== Upgrading the CoreDNS ConfigMap =="
      ${download_dir}/corefile-tool-${host_arch} migrate --from ${CURRENT_COREDNS_VERSION} --to ${NEW_COREDNS_VERSION} --corefile ${download_dir}/Corefile-old > ${download_dir}/Corefile
-     ${KUBE_ROOT}/cluster/kubectl.sh -n kube-system create configmap coredns --from-file ${download_dir}/Corefile -o yaml --dry-run | ${KUBE_ROOT}/cluster/kubectl.sh apply -f -
+     ${KUBE_ROOT}/cluster/kubectl.sh -n kube-system create configmap coredns --from-file ${download_dir}/Corefile -o yaml --dry-run=client | ${KUBE_ROOT}/cluster/kubectl.sh apply -f -
   else
      # In case of a downgrade, a custom CoreDNS Corefile will be overwritten by a default Corefile. In that case,
      # the user will need to manually modify the resulting (default) Corefile after the downgrade is complete.

pkg/kubectl/cmd/auth/reconcile.go

@@ -104,9 +104,9 @@ func NewCmdReconcile(f cmdutil.Factory, streams genericclioptions.IOStreams) *co
 	o.PrintFlags.AddFlags(cmd)
 
 	cmdutil.AddFilenameOptionFlags(cmd, o.FilenameOptions, "identifying the resource to reconcile.")
-	cmd.Flags().BoolVar(&o.DryRun, "dry-run", o.DryRun, "If true, display results but do not submit changes")
 	cmd.Flags().BoolVar(&o.RemoveExtraPermissions, "remove-extra-permissions", o.RemoveExtraPermissions, "If true, removes extra permissions added to roles")
 	cmd.Flags().BoolVar(&o.RemoveExtraSubjects, "remove-extra-subjects", o.RemoveExtraSubjects, "If true, removes extra subjects added to rolebindings")
+	cmdutil.AddDryRunFlag(cmd)
 
 	return cmd
 }
@@ -121,6 +121,8 @@ func (o *ReconcileOptions) Complete(cmd *cobra.Command, f cmdutil.Factory, args
 		return errors.New("no arguments are allowed")
 	}
 
+	o.DryRun = getClientSideDryRun(cmd)
+
 	namespace, enforceNamespace, err := f.ToRawKubeConfigLoader().Namespace()
 	if err != nil {
 		return err
@@ -328,3 +330,14 @@ func (o *ReconcileOptions) printResults(object runtime.Object,
 		}
 	}
 }
+
+func getClientSideDryRun(cmd *cobra.Command) bool {
+	dryRunStrategy, err := cmdutil.GetDryRunStrategy(cmd)
+	if err != nil {
+		klog.Fatalf("error accessing --dry-run flag for command %s: %v", cmd.Name(), err)
+	}
+	if dryRunStrategy == cmdutil.DryRunServer {
+		klog.Fatalf("--dry-run=server for command %s is not supported yet", cmd.Name())
+	}
+	return dryRunStrategy == cmdutil.DryRunClient
+}

staging/src/k8s.io/kubectl/docs/book/pages/imperative_porcelain/creating_resources.md

@@ -83,8 +83,8 @@ kubectl create secret generic my-secret --from-file=path/to/bar
 {% endmethod %}
 
 {% panel style="success", title="Bootstrapping Config" %}
-Imperative commands can be used to bootstrap config by using `--dry-run -o yaml`.
-`kubectl create secret generic my-secret --from-file=path/to/bar --dry-run -o yaml`
+Imperative commands can be used to bootstrap config by using `--dry-run=client -o yaml`.
+`kubectl create secret generic my-secret --from-file=path/to/bar --dry-run=client -o yaml`
 {% endpanel %}
 
 {% method %}

staging/src/k8s.io/kubectl/docs/book/pages/imperative_porcelain/introduction.md

@@ -9,7 +9,7 @@ use cases, imperative porcelain commands may be helpful for development or debug
 issues.  These commands are particularly helpful for learning about Kubernetes when coming
 from an imperative system.
 
-**Note:** Some imperative commands can be run with `--dry-run -o yaml` to display the declarative
+**Note:** Some imperative commands can be run with `--dry-run=client -o yaml` to display the declarative
 form.
 
 This section describes imperative commands that will generate or patch Resource Config.

staging/src/k8s.io/kubectl/docs/book/pages/kubectl_book/getting_started.md

@@ -29,7 +29,7 @@ List the Kubernetes *Deployment* Resources that are in the kube-system namespace
 ```bash
 kubectl get deployments --namespace kube-system
 ```
- 
+
 ```bash
 NAME                     DESIRED   CURRENT   UP-TO-DATE   AVAILABLE   AGE
 event-exporter-v0.2.3    1         1         1            1           14d
@@ -51,7 +51,7 @@ Print detailed information about the kube-dns Deployment in the kube-system name
 ```bash
 kubectl describe deployment kube-dns --namespace kube-system
 ```
-   
+
 ```bash
 Name:                   kube-dns
 Namespace:              kube-system
@@ -126,7 +126,7 @@ due to the serialization process of go objects.
 
 {% sample lang="yaml" %}
 ```bash
-kubectl create deployment nginx --dry-run -o yaml --image nginx
+kubectl create deployment nginx --dry-run=client -o yaml --image nginx
 ```
 
 ```yaml

staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole.go

@@ -73,7 +73,7 @@ func NewCmdCreateClusterRole(f cmdutil.Factory, ioStreams genericclioptions.IOSt
 		AggregationRule:   map[string]string{},
 	}
 	cmd := &cobra.Command{
-		Use:                   "clusterrole NAME --verb=verb --resource=resource.group [--resource-name=resourcename] [--dry-run]",
+		Use:                   "clusterrole NAME --verb=verb --resource=resource.group [--resource-name=resourcename] [--dry-run=server|client|none]",
 		DisableFlagsInUseLine: true,
 		Short:                 clusterRoleLong,
 		Long:                  clusterRoleLong,

staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding.go

@@ -48,7 +48,7 @@ func NewCmdCreateClusterRoleBinding(f cmdutil.Factory, ioStreams genericclioptio
 	}
 
 	cmd := &cobra.Command{
-		Use:                   "clusterrolebinding NAME --clusterrole=NAME [--user=username] [--group=groupname] [--serviceaccount=namespace:serviceaccountname] [--dry-run]",
+		Use:                   "clusterrolebinding NAME --clusterrole=NAME [--user=username] [--group=groupname] [--serviceaccount=namespace:serviceaccountname] [--dry-run=server|client|none]",
 		DisableFlagsInUseLine: true,
 		Short:                 i18n.T("Create a ClusterRoleBinding for a particular ClusterRole"),
 		Long:                  clusterRoleBindingLong,

staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap.go

@@ -69,7 +69,7 @@ func NewCmdCreateConfigMap(f cmdutil.Factory, ioStreams genericclioptions.IOStre
 	}
 
 	cmd := &cobra.Command{
-		Use:                   "configmap NAME [--from-file=[key=]source] [--from-literal=key1=value1] [--dry-run]",
+		Use:                   "configmap NAME [--from-file=[key=]source] [--from-literal=key1=value1] [--dry-run=server|client|none]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"cm"},
 		Short:                 i18n.T("Create a configmap from a local file, directory or literal value"),

staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment.go

@@ -50,7 +50,7 @@ func NewCmdCreateDeployment(f cmdutil.Factory, ioStreams genericclioptions.IOStr
 	}
 
 	cmd := &cobra.Command{
-		Use:                   "deployment NAME --image=image [--dry-run]",
+		Use:                   "deployment NAME --image=image [--dry-run=server|client|none]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"deploy"},
 		Short:                 i18n.T("Create a deployment with the specified name."),

staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace.go

@@ -48,7 +48,7 @@ func NewCmdCreateNamespace(f cmdutil.Factory, ioStreams genericclioptions.IOStre
 	}
 
 	cmd := &cobra.Command{
-		Use:                   "namespace NAME [--dry-run]",
+		Use:                   "namespace NAME [--dry-run=server|client|none]",
 		DisableFlagsInUseLine: true,
 		Aliases:               []string{"ns"},
 		Short:                 i18n.T("Create a namespace with the specified name"),