Merge pull request #12238 from JacobTanenbaum/BZ1391786-wildcardpolicy

Merged by openshift-bot

Author: OpenShift Bot

contrib/completions/bash/oc

@@ -9541,6 +9541,8 @@ _oc_expose()
     local_nonpersistent_flags+=("--template=")
     flags+=("--type=")
     local_nonpersistent_flags+=("--type=")
+    flags+=("--wildcardpolicy=")
+    local_nonpersistent_flags+=("--wildcardpolicy=")
     flags+=("--as=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")

contrib/completions/bash/openshift

@@ -14216,6 +14216,8 @@ _openshift_cli_expose()
     local_nonpersistent_flags+=("--template=")
     flags+=("--type=")
     local_nonpersistent_flags+=("--type=")
+    flags+=("--wildcardpolicy=")
+    local_nonpersistent_flags+=("--wildcardpolicy=")
     flags+=("--as=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")

contrib/completions/zsh/oc

@@ -9689,6 +9689,8 @@ _oc_expose()
     local_nonpersistent_flags+=("--template=")
     flags+=("--type=")
     local_nonpersistent_flags+=("--type=")
+    flags+=("--wildcardpolicy=")
+    local_nonpersistent_flags+=("--wildcardpolicy=")
     flags+=("--as=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")

contrib/completions/zsh/openshift

@@ -14364,6 +14364,8 @@ _openshift_cli_expose()
     local_nonpersistent_flags+=("--template=")
     flags+=("--type=")
     local_nonpersistent_flags+=("--type=")
+    flags+=("--wildcardpolicy=")
+    local_nonpersistent_flags+=("--wildcardpolicy=")
     flags+=("--as=")
     flags+=("--certificate-authority=")
     flags_with_completion+=("--certificate-authority")

docs/generated/oc_by_example_content.adoc

@@ -1724,6 +1724,10 @@ Expose a replicated application as a service or route
   # Create a route and specify a hostname
   oc expose service nginx --hostname=www.example.com
   
+  # Create a route with wildcard
+  oc expose service nginx --hostname=x.example.com --wildcard=Subdomain
+  This would be equivalent to *.example.com. NOTE: only hosts are matched by the wildcard, subdomains would not be included.
+  
   # Expose a deployment configuration as a service and use the specified port
   oc expose dc ruby-hello-world --port=8080
   

docs/man/man1/oc-expose.1

@@ -144,6 +144,10 @@ There is also the ability to expose a deployment configuration, replication cont
 \fB\-\-type\fP=""
     Type for this service: ClusterIP, NodePort, or LoadBalancer. Default is 'ClusterIP'.
 
+.PP
+\fB\-\-wildcardpolicy\fP=""
+    Sets the WildcardPolicy for the hostname, the default is "None". Valid values are "None" and "Subdomain"
+
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
@@ -229,6 +233,10 @@ There is also the ability to expose a deployment configuration, replication cont
   # Create a route and specify a hostname
   oc expose service nginx \-\-hostname=www.example.com
 
+  # Create a route with wildcard
+  oc expose service nginx \-\-hostname=x.example.com \-\-wildcard=Subdomain
+  This would be equivalent to *.example.com. NOTE: only hosts are matched by the wildcard, subdomains would not be included.
+  
   # Expose a deployment configuration as a service and use the specified port
   oc expose dc ruby\-hello\-world \-\-port=8080
 

docs/man/man1/openshift-cli-expose.1

@@ -144,6 +144,10 @@ There is also the ability to expose a deployment configuration, replication cont
 \fB\-\-type\fP=""
     Type for this service: ClusterIP, NodePort, or LoadBalancer. Default is 'ClusterIP'.
 
+.PP
+\fB\-\-wildcardpolicy\fP=""
+    Sets the WildcardPolicy for the hostname, the default is "None". Valid values are "None" and "Subdomain"
+
 
 .SH OPTIONS INHERITED FROM PARENT COMMANDS
 .PP
@@ -229,6 +233,10 @@ There is also the ability to expose a deployment configuration, replication cont
   # Create a route and specify a hostname
   openshift cli expose service nginx \-\-hostname=www.example.com
 
+  # Create a route with wildcard
+  openshift cli expose service nginx \-\-hostname=x.example.com \-\-wildcard=Subdomain
+  This would be equivalent to *.example.com. NOTE: only hosts are matched by the wildcard, subdomains would not be included.
+  
   # Expose a deployment configuration as a service and use the specified port
   openshift cli expose dc ruby\-hello\-world \-\-port=8080
 

pkg/cmd/cli/cmd/expose.go

@@ -33,6 +33,10 @@ var (
 	  # Create a route and specify a hostname
 	  %[1]s expose service nginx --hostname=www.example.com
 
+	  # Create a route with wildcard
+	  %[1]s expose service nginx --hostname=x.example.com --wildcard=Subdomain
+	  This would be equivalent to *.example.com. NOTE: only hosts are matched by the wildcard, subdomains would not be included.
+
 	  # Expose a deployment configuration as a service and use the specified port
 	  %[1]s expose dc ruby-hello-world --port=8080
 
@@ -65,6 +69,7 @@ func NewCmdExpose(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.C
 	}
 	cmd.Flags().String("hostname", "", "Set a hostname for the new route")
 	cmd.Flags().String("path", "", "Set a path for the new route")
+	cmd.Flags().String("wildcardpolicy", "", "Sets the WildcardPolicy for the hostname, the default is \"None\". Valid values are \"None\" and \"Subdomain\"")
 	return cmd
 }
 
@@ -93,6 +98,12 @@ func validate(cmd *cobra.Command, f *clientcmd.Factory, args []string) error {
 	if err != nil {
 		return kcmdutil.UsageError(cmd, err.Error())
 	}
+
+	wildcardpolicy := kcmdutil.GetFlagString(cmd, "wildcardpolicy")
+	if len(wildcardpolicy) > 0 && (wildcardpolicy != "Subdomain" && wildcardpolicy != "None") {
+		return fmt.Errorf("only \"Subdomain\" or \"None\" are supported for wildcardpolicy")
+	}
+
 	if len(infos) > 1 {
 		return fmt.Errorf("multiple resources provided: %v", args)
 	}

pkg/route/generator/generate.go

@@ -27,6 +27,7 @@ func (RouteGenerator) ParamNames() []kubectl.GeneratorParam {
 		{Name: "name", Required: false},
 		{Name: "hostname", Required: false},
 		{Name: "path", Required: false},
+		{Name: "wildcardpolicy", Required: false},
 	}
 }
 
@@ -68,8 +69,9 @@ func (RouteGenerator) Generate(genericParams map[string]interface{}) (runtime.Ob
 			Labels: labels,
 		},
 		Spec: api.RouteSpec{
-			Host: params["hostname"],
-			Path: params["path"],
+			Host:           params["hostname"],
+			WildcardPolicy: api.WildcardPolicyType(params["wildcardpolicy"]),
+			Path:           params["path"],
 			To: api.RouteTargetReference{
 				Name: params["default-name"],
 			},