Merge pull request #18546 from deads2k/up-07-routerregistry

Automatic merge from submit-queue (batch tested with PRs 18437, 18546, 18550, 18579).

make oadm router and registry resiliant to missing client

`oc adm router --dry-run -o yaml` (and registry) shouldn't require an apiserver connection.  This makes it tolerant for cluster up

Author: openshift-merge-robot

contrib/completions/bash/oc

@@ -119,6 +119,7 @@ type RegistryConfig struct {
 
 	ClusterIP string
 
+	Local bool
 	// TODO: accept environment values.
 }
 
@@ -191,6 +192,7 @@ func NewCmdRegistry(f *clientcmd.Factory, parentName, name string, out, errout i
 	cmd.Flags().StringVar(&cfg.FSGroup, "fs-group", "", "Specify fsGroup which is an ID that grants group access to registry block storage")
 	cmd.Flags().BoolVar(&cfg.DaemonSet, "daemonset", cfg.DaemonSet, "If true, use a daemonset instead of a deployment config.")
 	cmd.Flags().BoolVar(&cfg.EnforceQuota, "enforce-quota", cfg.EnforceQuota, "If true, the registry will refuse to write blobs if they exceed quota limits")
+	cmd.Flags().BoolVar(&cfg.Local, "local", cfg.Local, "If true, do not contact the apiserver")
 
 	cfg.Action.BindForOutput(cmd.Flags())
 	cmd.Flags().String("output-version", "", "The preferred API versions of the output objects")
@@ -259,11 +261,17 @@ func (opts *RegistryOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command,
 		return fmt.Errorf("error getting namespace: %v", nsErr)
 	}
 
-	kClient, kClientErr := f.ClientSet()
-	if kClientErr != nil {
-		return fmt.Errorf("error getting client: %v", kClientErr)
+	if !opts.Config.Local {
+		kClient, kClientErr := f.ClientSet()
+		if kClientErr != nil {
+			return fmt.Errorf("error getting client: %v", kClientErr)
+		}
+		opts.serviceClient = kClient.Core()
+	}
+
+	if opts.Config.Local && !opts.Config.Action.DryRun {
+		return fmt.Errorf("--local cannot be specified without --dry-run")
 	}
-	opts.serviceClient = kClient.Core()
 
 	opts.Config.Action.Bulk.Mapper = clientcmd.ResourceMapper(f)
 	opts.Config.Action.Out, opts.Config.Action.ErrOut = out, errout
@@ -283,19 +291,21 @@ func (opts *RegistryOptions) RunCmdRegistry() error {
 
 	output := opts.Config.Action.ShouldPrint()
 	generate := output
-	service, err := opts.serviceClient.Services(opts.namespace).Get(name, metav1.GetOptions{})
-	if err != nil {
-		if !generate {
-			if !errors.IsNotFound(err) {
-				return fmt.Errorf("can't check for existing docker-registry %q: %v", name, err)
-			}
-			if opts.Config.Action.DryRun {
-				return fmt.Errorf("Docker registry %q service does not exist", name)
+	if !opts.Config.Local {
+		service, err := opts.serviceClient.Services(opts.namespace).Get(name, metav1.GetOptions{})
+		if err != nil {
+			if !generate {
+				if !errors.IsNotFound(err) {
+					return fmt.Errorf("can't check for existing docker-registry %q: %v", name, err)
+				}
+				if opts.Config.Action.DryRun {
+					return fmt.Errorf("Docker registry %q service does not exist", name)
+				}
+				generate = true
 			}
-			generate = true
+		} else {
+			clusterIP = service.Spec.ClusterIP
 		}
-	} else {
-		clusterIP = service.Spec.ClusterIP
 	}
 
 	if !generate {

contrib/completions/zsh/oc

@@ -233,6 +233,8 @@ type RouterConfig struct {
 
 	// Strict SNI (do not use default cert)
 	StrictSNI bool
+
+	Local bool
 }
 
 const (
@@ -314,6 +316,7 @@ func NewCmdRouter(f *clientcmd.Factory, parentName, name string, out, errout io.
 	cmd.Flags().StringVar(&cfg.MaxConnections, "max-connections", cfg.MaxConnections, "Specifies the maximum number of concurrent connections. Not supported for F5.")
 	cmd.Flags().StringVar(&cfg.Ciphers, "ciphers", cfg.Ciphers, "Specifies the cipher suites to use. You can choose a predefined cipher set ('modern', 'intermediate', or 'old') or specify exact cipher suites by passing a : separated list. Not supported for F5.")
 	cmd.Flags().BoolVar(&cfg.StrictSNI, "strict-sni", cfg.StrictSNI, "Use strict-sni bind processing (do not use default cert). Not supported for F5.")
+	cmd.Flags().BoolVar(&cfg.Local, "local", cfg.Local, "If true, do not contact the apiserver")
 
 	cfg.Action.BindForOutput(cmd.Flags())
 	cmd.Flags().String("output-version", "", "The preferred API versions of the output objects")
@@ -498,6 +501,10 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out, errout io.Write
 	default:
 		return kcmdutil.UsageErrorf(cmd, "You may pass zero or one arguments to provide a name for the router")
 	}
+	if cfg.Local && !cfg.Action.DryRun {
+		return fmt.Errorf("--local cannot be specified without --dry-run")
+	}
+
 	name := cfg.Name
 
 	var defaultOutputErr error
@@ -573,10 +580,6 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out, errout io.Write
 	if err != nil {
 		return fmt.Errorf("error getting client: %v", err)
 	}
-	kClient, err := f.ClientSet()
-	if err != nil {
-		return fmt.Errorf("error getting client: %v", err)
-	}
 
 	cfg.Action.Bulk.Mapper = clientcmd.ResourceMapper(f)
 	cfg.Action.Out, cfg.Action.ErrOut = out, errout
@@ -586,19 +589,25 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out, errout io.Write
 
 	output := cfg.Action.ShouldPrint()
 	generate := output
-	service, err := kClient.Core().Services(namespace).Get(name, metav1.GetOptions{})
-	if err != nil {
-		if !generate {
-			if !errors.IsNotFound(err) {
-				return fmt.Errorf("can't check for existing router %q: %v", name, err)
-			}
-			if !output && cfg.Action.DryRun {
-				return fmt.Errorf("Router %q service does not exist", name)
+	if !cfg.Local {
+		kClient, err := f.ClientSet()
+		if err != nil {
+			return fmt.Errorf("error getting client: %v", err)
+		}
+		service, err := kClient.Core().Services(namespace).Get(name, metav1.GetOptions{})
+		if err != nil {
+			if !generate {
+				if !errors.IsNotFound(err) {
+					return fmt.Errorf("can't check for existing router %q: %v", name, err)
+				}
+				if !output && cfg.Action.DryRun {
+					return fmt.Errorf("Router %q service does not exist", name)
+				}
+				generate = true
 			}
-			generate = true
+		} else {
+			clusterIP = service.Spec.ClusterIP
 		}
-	} else {
-		clusterIP = service.Spec.ClusterIP
 	}
 
 	if !generate {
@@ -610,17 +619,19 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out, errout io.Write
 		return fmt.Errorf("you must specify a service account for the router with --service-account")
 	}
 
-	securityClient, err := f.OpenshiftInternalSecurityClient()
-	if err != nil {
-		return err
-	}
-	if err := validateServiceAccount(securityClient, namespace, cfg.ServiceAccount, cfg.HostNetwork, cfg.HostPorts); err != nil {
-		err = fmt.Errorf("router could not be created; %v", err)
-		if !cfg.Action.ShouldPrint() {
+	if !cfg.Local {
+		securityClient, err := f.OpenshiftInternalSecurityClient()
+		if err != nil {
 			return err
 		}
-		fmt.Fprintf(errout, "error: %v\n", err)
-		defaultOutputErr = kcmdutil.ErrExit
+		if err := validateServiceAccount(securityClient, namespace, cfg.ServiceAccount, cfg.HostNetwork, cfg.HostPorts); err != nil {
+			err = fmt.Errorf("router could not be created; %v", err)
+			if !cfg.Action.ShouldPrint() {
+				return err
+			}
+			fmt.Fprintf(errout, "error: %v\n", err)
+			defaultOutputErr = kcmdutil.ErrExit
+		}
 	}
 
 	// create new router