Merge pull request #9890 from kargakis/add-insecure-policy-flag

Merged by openshift-bot

Author: OpenShift Bot

contrib/completions/bash/oc

@@ -8250,6 +8250,7 @@ _oc_create_route_edge()
     flags_with_completion+=("--cert")
     flags_completion+=("_filedir")
     flags+=("--hostname=")
+    flags+=("--insecure-policy=")
     flags+=("--key=")
     flags_with_completion+=("--key")
     flags_completion+=("_filedir")

contrib/completions/bash/openshift

@@ -12539,6 +12539,7 @@ _openshift_cli_create_route_edge()
     flags_with_completion+=("--cert")
     flags_completion+=("_filedir")
     flags+=("--hostname=")
+    flags+=("--insecure-policy=")
     flags+=("--key=")
     flags_with_completion+=("--key")
     flags_completion+=("_filedir")

contrib/completions/zsh/oc

@@ -8411,6 +8411,7 @@ _oc_create_route_edge()
     flags_with_completion+=("--cert")
     flags_completion+=("_filedir")
     flags+=("--hostname=")
+    flags+=("--insecure-policy=")
     flags+=("--key=")
     flags_with_completion+=("--key")
     flags_completion+=("_filedir")

contrib/completions/zsh/openshift

@@ -12700,6 +12700,7 @@ _openshift_cli_create_route_edge()
     flags_with_completion+=("--cert")
     flags_completion+=("_filedir")
     flags+=("--hostname=")
+    flags+=("--insecure-policy=")
     flags+=("--key=")
     flags_with_completion+=("--key")
     flags_completion+=("_filedir")

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

@@ -33,6 +33,10 @@ generated route should expose via the \-\-service flag.
 \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-edge.1

@@ -33,6 +33,10 @@ generated route should expose via the \-\-service flag.
 \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

@@ -73,6 +73,7 @@ func NewCmdCreateEdgeRoute(fullName string, f *clientcmd.Factory, out io.Writer)
 	kcmdutil.AddOutputFlagsForMutation(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.")
@@ -130,6 +131,11 @@ func CreateEdgeRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, ar
 	}
 	route.Spec.TLS.CACertificate = string(caCert)
 
+	insecurePolicy := kcmdutil.GetFlagString(cmd, "insecure-policy")
+	if len(insecurePolicy) > 0 {
+		route.Spec.TLS.InsecureEdgeTerminationPolicy = api.InsecureEdgeTerminationPolicyType(insecurePolicy)
+	}
+
 	route, err = oc.Routes(ns).Create(route)
 	if err != nil {
 		return err

test/cmd/basicresources.sh

@@ -164,6 +164,9 @@ os::cmd::expect_success 'oc create route edge test-route --service=frontend'
 os::cmd::expect_success 'oc delete routes test-route'
 os::cmd::expect_failure 'oc create route edge new-route'
 os::cmd::expect_success 'oc delete services frontend'
+os::cmd::expect_success 'oc create route edge --insecure-policy=Allow --service=foo --port=80'
+os::cmd::expect_success_and_text 'oc get route foo -o jsonpath="{.spec.tls.insecureEdgeTerminationPolicy}"' 'Allow'
+os::cmd::expect_success 'oc delete routes foo'
 echo "routes: ok"
 os::test::junit::declare_suite_end