Merge pull request #12725 from JacobTanenbaum/BZ1403155

Merged by openshift-bot

Author: OpenShift Bot

contrib/completions/bash/oc

@@ -7651,6 +7651,8 @@ _oc_create_route_passthrough()
     local_nonpersistent_flags+=("--dry-run")
     flags+=("--hostname=")
     local_nonpersistent_flags+=("--hostname=")
+    flags+=("--insecure-policy=")
+    local_nonpersistent_flags+=("--insecure-policy=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
     flags+=("--output=")
@@ -7747,6 +7749,8 @@ _oc_create_route_reencrypt()
     local_nonpersistent_flags+=("--dry-run")
     flags+=("--hostname=")
     local_nonpersistent_flags+=("--hostname=")
+    flags+=("--insecure-policy=")
+    local_nonpersistent_flags+=("--insecure-policy=")
     flags+=("--key=")
     flags_with_completion+=("--key")
     flags_completion+=("_filedir")

contrib/completions/bash/openshift

@@ -12642,6 +12642,8 @@ _openshift_cli_create_route_passthrough()
     local_nonpersistent_flags+=("--dry-run")
     flags+=("--hostname=")
     local_nonpersistent_flags+=("--hostname=")
+    flags+=("--insecure-policy=")
+    local_nonpersistent_flags+=("--insecure-policy=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
     flags+=("--output=")
@@ -12740,6 +12742,8 @@ _openshift_cli_create_route_reencrypt()
     local_nonpersistent_flags+=("--dry-run")
     flags+=("--hostname=")
     local_nonpersistent_flags+=("--hostname=")
+    flags+=("--insecure-policy=")
+    local_nonpersistent_flags+=("--insecure-policy=")
     flags+=("--key=")
     flags_with_completion+=("--key")
     flags_completion+=("_filedir")

contrib/completions/zsh/oc

@@ -7799,6 +7799,8 @@ _oc_create_route_passthrough()
     local_nonpersistent_flags+=("--dry-run")
     flags+=("--hostname=")
     local_nonpersistent_flags+=("--hostname=")
+    flags+=("--insecure-policy=")
+    local_nonpersistent_flags+=("--insecure-policy=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
     flags+=("--output=")
@@ -7895,6 +7897,8 @@ _oc_create_route_reencrypt()
     local_nonpersistent_flags+=("--dry-run")
     flags+=("--hostname=")
     local_nonpersistent_flags+=("--hostname=")
+    flags+=("--insecure-policy=")
+    local_nonpersistent_flags+=("--insecure-policy=")
     flags+=("--key=")
     flags_with_completion+=("--key")
     flags_completion+=("_filedir")

contrib/completions/zsh/openshift

@@ -12790,6 +12790,8 @@ _openshift_cli_create_route_passthrough()
     local_nonpersistent_flags+=("--dry-run")
     flags+=("--hostname=")
     local_nonpersistent_flags+=("--hostname=")
+    flags+=("--insecure-policy=")
+    local_nonpersistent_flags+=("--insecure-policy=")
     flags+=("--no-headers")
     local_nonpersistent_flags+=("--no-headers")
     flags+=("--output=")
@@ -12888,6 +12890,8 @@ _openshift_cli_create_route_reencrypt()
     local_nonpersistent_flags+=("--dry-run")
     flags+=("--hostname=")
     local_nonpersistent_flags+=("--hostname=")
+    flags+=("--insecure-policy=")
+    local_nonpersistent_flags+=("--insecure-policy=")
     flags+=("--key=")
     flags_with_completion+=("--key")
     flags_completion+=("_filedir")

docs/man/man1/oc-create-route-passthrough.1

@@ -32,6 +32,10 @@ Specify the service (either just its name or using type/name syntax) that the ge
 \fB\-\-hostname\fP=""
     Set a hostname for the new route
 
+.PP
+\fB\-\-insecure\-policy\fP=""
+    Set an insecure policy for the new route
+
 .PP
 \fB\-\-no\-headers\fP=false
     When using the default or custom\-column output format, don't print headers.

docs/man/man1/oc-create-route-reencrypt.1

@@ -44,6 +44,10 @@ Specify the service (either just its name or using type/name syntax) that the ge
 \fB\-\-hostname\fP=""
     Set a hostname for the new route
 
+.PP
+\fB\-\-insecure\-policy\fP=""
+    Set an insecure policy for the new route
+
 .PP
 \fB\-\-key\fP=""
     Path to a key file.

docs/man/man1/openshift-cli-create-route-passthrough.1

@@ -32,6 +32,10 @@ Specify the service (either just its name or using type/name syntax) that the ge
 \fB\-\-hostname\fP=""
     Set a hostname for the new route
 
+.PP
+\fB\-\-insecure\-policy\fP=""
+    Set an insecure policy for the new route
+
 .PP
 \fB\-\-no\-headers\fP=false
     When using the default or custom\-column output format, don't print headers.

docs/man/man1/openshift-cli-create-route-reencrypt.1

@@ -44,6 +44,10 @@ Specify the service (either just its name or using type/name syntax) that the ge
 \fB\-\-hostname\fP=""
     Set a hostname for the new route
 
+.PP
+\fB\-\-insecure\-policy\fP=""
+    Set an insecure policy for the new route
+
 .PP
 \fB\-\-key\fP=""
     Path to a key file.

pkg/cmd/cli/cmd/create/route.go

@@ -204,6 +204,7 @@ func NewCmdCreatePassthroughRoute(fullName string, f *clientcmd.Factory, out io.
 	kcmdutil.AddDryRunFlag(cmd)
 	cmd.Flags().String("hostname", "", "Set a hostname for the new route")
 	cmd.Flags().String("port", "", "Name of the service port or number of the container port the route will route traffic to")
+	cmd.Flags().String("insecure-policy", "", "Set an insecure policy for the new route")
 	cmd.Flags().String("service", "", "Name of the service that the new route is exposing")
 	cmd.MarkFlagRequired("service")
 	cmd.Flags().String("wildcardpolicy", "", "Sets the WilcardPolicy for the hostname, the default is \"None\". valid values are \"None\" and \"Subdomain\"")
@@ -244,6 +245,11 @@ func CreatePassthroughRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comm
 	route.Spec.TLS = new(api.TLSConfig)
 	route.Spec.TLS.Termination = api.TLSTerminationPassthrough
 
+	insecurePolicy := kcmdutil.GetFlagString(cmd, "insecure-policy")
+	if len(insecurePolicy) > 0 {
+		route.Spec.TLS.InsecureEdgeTerminationPolicy = api.InsecureEdgeTerminationPolicyType(insecurePolicy)
+	}
+
 	dryRun := kcmdutil.GetFlagBool(cmd, "dry-run")
 	actualRoute := route
 
@@ -305,6 +311,7 @@ func NewCmdCreateReencryptRoute(fullName string, f *clientcmd.Factory, out io.Wr
 	kcmdutil.AddDryRunFlag(cmd)
 	cmd.Flags().String("hostname", "", "Set a hostname for the new route")
 	cmd.Flags().String("port", "", "Name of the service port or number of the container port the route will route traffic to")
+	cmd.Flags().String("insecure-policy", "", "Set an insecure policy for the new route")
 	cmd.Flags().String("service", "", "Name of the service that the new route is exposing")
 	cmd.MarkFlagRequired("service")
 	cmd.Flags().String("path", "", "Path that the router watches to route traffic to the service.")
@@ -377,6 +384,11 @@ func CreateReencryptRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comman
 	}
 	route.Spec.TLS.DestinationCACertificate = string(destCACert)
 
+	insecurePolicy := kcmdutil.GetFlagString(cmd, "insecure-policy")
+	if len(insecurePolicy) > 0 {
+		route.Spec.TLS.InsecureEdgeTerminationPolicy = api.InsecureEdgeTerminationPolicyType(insecurePolicy)
+	}
+
 	dryRun := kcmdutil.GetFlagBool(cmd, "dry-run")
 	actualRoute := route