Skip to content

Commit 1b9523e

Browse files
author
OpenShift Bot
authored
Merge pull request #12774 from JacobTanenbaum/wild-card
Merged by openshift-bot
2 parents cf29bb9 + 1ea2cbb commit 1b9523e

File tree

12 files changed

+37
-37
lines changed

12 files changed

+37
-37
lines changed

‎contrib/completions/bash/oc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7595,8 +7595,8 @@ _oc_create_route_edge()
75957595
local_nonpersistent_flags+=("--template=")
75967596
flags+=("--validate")
75977597
local_nonpersistent_flags+=("--validate")
7598-
flags+=("--wildcardpolicy=")
7599-
local_nonpersistent_flags+=("--wildcardpolicy=")
7598+
flags+=("--wildcard-policy=")
7599+
local_nonpersistent_flags+=("--wildcard-policy=")
76007600
flags+=("--as=")
76017601
flags+=("--certificate-authority=")
76027602
flags_with_completion+=("--certificate-authority")
@@ -7681,8 +7681,8 @@ _oc_create_route_passthrough()
76817681
local_nonpersistent_flags+=("--template=")
76827682
flags+=("--validate")
76837683
local_nonpersistent_flags+=("--validate")
7684-
flags+=("--wildcardpolicy=")
7685-
local_nonpersistent_flags+=("--wildcardpolicy=")
7684+
flags+=("--wildcard-policy=")
7685+
local_nonpersistent_flags+=("--wildcard-policy=")
76867686
flags+=("--as=")
76877687
flags+=("--certificate-authority=")
76887688
flags_with_completion+=("--certificate-authority")
@@ -7785,8 +7785,8 @@ _oc_create_route_reencrypt()
77857785
local_nonpersistent_flags+=("--template=")
77867786
flags+=("--validate")
77877787
local_nonpersistent_flags+=("--validate")
7788-
flags+=("--wildcardpolicy=")
7789-
local_nonpersistent_flags+=("--wildcardpolicy=")
7788+
flags+=("--wildcard-policy=")
7789+
local_nonpersistent_flags+=("--wildcard-policy=")
77907790
flags+=("--as=")
77917791
flags+=("--certificate-authority=")
77927792
flags_with_completion+=("--certificate-authority")

‎contrib/completions/bash/openshift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12584,8 +12584,8 @@ _openshift_cli_create_route_edge()
1258412584
local_nonpersistent_flags+=("--template=")
1258512585
flags+=("--validate")
1258612586
local_nonpersistent_flags+=("--validate")
12587-
flags+=("--wildcardpolicy=")
12588-
local_nonpersistent_flags+=("--wildcardpolicy=")
12587+
flags+=("--wildcard-policy=")
12588+
local_nonpersistent_flags+=("--wildcard-policy=")
1258912589
flags+=("--as=")
1259012590
flags+=("--azure-container-registry-config=")
1259112591
flags+=("--certificate-authority=")
@@ -12672,8 +12672,8 @@ _openshift_cli_create_route_passthrough()
1267212672
local_nonpersistent_flags+=("--template=")
1267312673
flags+=("--validate")
1267412674
local_nonpersistent_flags+=("--validate")
12675-
flags+=("--wildcardpolicy=")
12676-
local_nonpersistent_flags+=("--wildcardpolicy=")
12675+
flags+=("--wildcard-policy=")
12676+
local_nonpersistent_flags+=("--wildcard-policy=")
1267712677
flags+=("--as=")
1267812678
flags+=("--azure-container-registry-config=")
1267912679
flags+=("--certificate-authority=")
@@ -12778,8 +12778,8 @@ _openshift_cli_create_route_reencrypt()
1277812778
local_nonpersistent_flags+=("--template=")
1277912779
flags+=("--validate")
1278012780
local_nonpersistent_flags+=("--validate")
12781-
flags+=("--wildcardpolicy=")
12782-
local_nonpersistent_flags+=("--wildcardpolicy=")
12781+
flags+=("--wildcard-policy=")
12782+
local_nonpersistent_flags+=("--wildcard-policy=")
1278312783
flags+=("--as=")
1278412784
flags+=("--azure-container-registry-config=")
1278512785
flags+=("--certificate-authority=")

‎contrib/completions/zsh/oc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7743,8 +7743,8 @@ _oc_create_route_edge()
77437743
local_nonpersistent_flags+=("--template=")
77447744
flags+=("--validate")
77457745
local_nonpersistent_flags+=("--validate")
7746-
flags+=("--wildcardpolicy=")
7747-
local_nonpersistent_flags+=("--wildcardpolicy=")
7746+
flags+=("--wildcard-policy=")
7747+
local_nonpersistent_flags+=("--wildcard-policy=")
77487748
flags+=("--as=")
77497749
flags+=("--certificate-authority=")
77507750
flags_with_completion+=("--certificate-authority")
@@ -7829,8 +7829,8 @@ _oc_create_route_passthrough()
78297829
local_nonpersistent_flags+=("--template=")
78307830
flags+=("--validate")
78317831
local_nonpersistent_flags+=("--validate")
7832-
flags+=("--wildcardpolicy=")
7833-
local_nonpersistent_flags+=("--wildcardpolicy=")
7832+
flags+=("--wildcard-policy=")
7833+
local_nonpersistent_flags+=("--wildcard-policy=")
78347834
flags+=("--as=")
78357835
flags+=("--certificate-authority=")
78367836
flags_with_completion+=("--certificate-authority")
@@ -7933,8 +7933,8 @@ _oc_create_route_reencrypt()
79337933
local_nonpersistent_flags+=("--template=")
79347934
flags+=("--validate")
79357935
local_nonpersistent_flags+=("--validate")
7936-
flags+=("--wildcardpolicy=")
7937-
local_nonpersistent_flags+=("--wildcardpolicy=")
7936+
flags+=("--wildcard-policy=")
7937+
local_nonpersistent_flags+=("--wildcard-policy=")
79387938
flags+=("--as=")
79397939
flags+=("--certificate-authority=")
79407940
flags_with_completion+=("--certificate-authority")

‎contrib/completions/zsh/openshift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12732,8 +12732,8 @@ _openshift_cli_create_route_edge()
1273212732
local_nonpersistent_flags+=("--template=")
1273312733
flags+=("--validate")
1273412734
local_nonpersistent_flags+=("--validate")
12735-
flags+=("--wildcardpolicy=")
12736-
local_nonpersistent_flags+=("--wildcardpolicy=")
12735+
flags+=("--wildcard-policy=")
12736+
local_nonpersistent_flags+=("--wildcard-policy=")
1273712737
flags+=("--as=")
1273812738
flags+=("--azure-container-registry-config=")
1273912739
flags+=("--certificate-authority=")
@@ -12820,8 +12820,8 @@ _openshift_cli_create_route_passthrough()
1282012820
local_nonpersistent_flags+=("--template=")
1282112821
flags+=("--validate")
1282212822
local_nonpersistent_flags+=("--validate")
12823-
flags+=("--wildcardpolicy=")
12824-
local_nonpersistent_flags+=("--wildcardpolicy=")
12823+
flags+=("--wildcard-policy=")
12824+
local_nonpersistent_flags+=("--wildcard-policy=")
1282512825
flags+=("--as=")
1282612826
flags+=("--azure-container-registry-config=")
1282712827
flags+=("--certificate-authority=")
@@ -12926,8 +12926,8 @@ _openshift_cli_create_route_reencrypt()
1292612926
local_nonpersistent_flags+=("--template=")
1292712927
flags+=("--validate")
1292812928
local_nonpersistent_flags+=("--validate")
12929-
flags+=("--wildcardpolicy=")
12930-
local_nonpersistent_flags+=("--wildcardpolicy=")
12929+
flags+=("--wildcard-policy=")
12930+
local_nonpersistent_flags+=("--wildcard-policy=")
1293112931
flags+=("--as=")
1293212932
flags+=("--azure-container-registry-config=")
1293312933
flags+=("--certificate-authority=")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Specify the service (either just its name or using type/name syntax) that the ge
101101
If true, use a schema to validate the input before sending it
102102

103103
.PP
104-
\fB\-\-wildcardpolicy\fP=""
104+
\fB\-\-wildcard\-policy\fP=""
105105
Sets the WilcardPolicy for the hostname, the default is "None". valid values are "None" and "Subdomain"
106106

107107

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Specify the service (either just its name or using type/name syntax) that the ge
8585
If true, use a schema to validate the input before sending it
8686

8787
.PP
88-
\fB\-\-wildcardpolicy\fP=""
88+
\fB\-\-wildcard\-policy\fP=""
8989
Sets the WilcardPolicy for the hostname, the default is "None". valid values are "None" and "Subdomain"
9090

9191

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Specify the service (either just its name or using type/name syntax) that the ge
105105
If true, use a schema to validate the input before sending it
106106

107107
.PP
108-
\fB\-\-wildcardpolicy\fP=""
108+
\fB\-\-wildcard\-policy\fP=""
109109
Sets the WildcardPolicy for the hostname, the default is "None". valid values are "None" and "Subdomain"
110110

111111

‎docs/man/man1/openshift-cli-create-route-edge.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ Specify the service (either just its name or using type/name syntax) that the ge
101101
If true, use a schema to validate the input before sending it
102102

103103
.PP
104-
\fB\-\-wildcardpolicy\fP=""
104+
\fB\-\-wildcard\-policy\fP=""
105105
Sets the WilcardPolicy for the hostname, the default is "None". valid values are "None" and "Subdomain"
106106

107107

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Specify the service (either just its name or using type/name syntax) that the ge
8585
If true, use a schema to validate the input before sending it
8686

8787
.PP
88-
\fB\-\-wildcardpolicy\fP=""
88+
\fB\-\-wildcard\-policy\fP=""
8989
Sets the WilcardPolicy for the hostname, the default is "None". valid values are "None" and "Subdomain"
9090

9191

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Specify the service (either just its name or using type/name syntax) that the ge
105105
If true, use a schema to validate the input before sending it
106106

107107
.PP
108-
\fB\-\-wildcardpolicy\fP=""
108+
\fB\-\-wildcard\-policy\fP=""
109109
Sets the WildcardPolicy for the hostname, the default is "None". valid values are "None" and "Subdomain"
110110

111111

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func NewCmdCreateEdgeRoute(fullName string, f *clientcmd.Factory, out io.Writer)
8585
cmd.MarkFlagFilename("key")
8686
cmd.Flags().String("ca-cert", "", "Path to a CA certificate file.")
8787
cmd.MarkFlagFilename("ca-cert")
88-
cmd.Flags().String("wildcardpolicy", "", "Sets the WilcardPolicy for the hostname, the default is \"None\". valid values are \"None\" and \"Subdomain\"")
88+
cmd.Flags().String("wildcard-policy", "", "Sets the WilcardPolicy for the hostname, the default is \"None\". valid values are \"None\" and \"Subdomain\"")
8989

9090
return cmd
9191
}
@@ -113,7 +113,7 @@ func CreateEdgeRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, ar
113113
return err
114114
}
115115

116-
wildcardpolicy := kcmdutil.GetFlagString(cmd, "wildcardpolicy")
116+
wildcardpolicy := kcmdutil.GetFlagString(cmd, "wildcard-policy")
117117
if len(wildcardpolicy) > 0 {
118118
route.Spec.WildcardPolicy = api.WildcardPolicyType(wildcardpolicy)
119119
}
@@ -207,7 +207,7 @@ func NewCmdCreatePassthroughRoute(fullName string, f *clientcmd.Factory, out io.
207207
cmd.Flags().String("insecure-policy", "", "Set an insecure policy for the new route")
208208
cmd.Flags().String("service", "", "Name of the service that the new route is exposing")
209209
cmd.MarkFlagRequired("service")
210-
cmd.Flags().String("wildcardpolicy", "", "Sets the WilcardPolicy for the hostname, the default is \"None\". valid values are \"None\" and \"Subdomain\"")
210+
cmd.Flags().String("wildcard-policy", "", "Sets the WilcardPolicy for the hostname, the default is \"None\". valid values are \"None\" and \"Subdomain\"")
211211

212212
return cmd
213213
}
@@ -235,7 +235,7 @@ func CreatePassthroughRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comm
235235
return err
236236
}
237237

238-
wildcardpolicy := kcmdutil.GetFlagString(cmd, "wildcardpolicy")
238+
wildcardpolicy := kcmdutil.GetFlagString(cmd, "wildcard-policy")
239239
if len(wildcardpolicy) > 0 {
240240
route.Spec.WildcardPolicy = api.WildcardPolicyType(wildcardpolicy)
241241
}
@@ -324,7 +324,7 @@ func NewCmdCreateReencryptRoute(fullName string, f *clientcmd.Factory, out io.Wr
324324
cmd.Flags().String("dest-ca-cert", "", "Path to a CA certificate file, used for securing the connection from the router to the destination.")
325325
cmd.MarkFlagRequired("dest-ca-cert")
326326
cmd.MarkFlagFilename("dest-ca-cert")
327-
cmd.Flags().String("wildcardpolicy", "", "Sets the WildcardPolicy for the hostname, the default is \"None\". valid values are \"None\" and \"Subdomain\"")
327+
cmd.Flags().String("wildcard-policy", "", "Sets the WildcardPolicy for the hostname, the default is \"None\". valid values are \"None\" and \"Subdomain\"")
328328

329329
return cmd
330330
}
@@ -352,7 +352,7 @@ func CreateReencryptRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comman
352352
return err
353353
}
354354

355-
wildcardpolicy := kcmdutil.GetFlagString(cmd, "wildcardpolicy")
355+
wildcardpolicy := kcmdutil.GetFlagString(cmd, "wildcard-policy")
356356
if len(wildcardpolicy) > 0 {
357357
route.Spec.WildcardPolicy = api.WildcardPolicyType(wildcardpolicy)
358358
}

‎pkg/cmd/cli/describe/printer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var (
3636
imageStreamImageColumns = []string{"NAME", "DOCKER REF", "UPDATED", "IMAGENAME"}
3737
imageStreamColumns = []string{"NAME", "DOCKER REPO", "TAGS", "UPDATED"}
3838
projectColumns = []string{"NAME", "DISPLAY NAME", "STATUS"}
39-
routeColumns = []string{"NAME", "HOST/PORT", "PATH", "SERVICES", "PORT", "TERMINATION", "WILDCARDPOLICY"}
39+
routeColumns = []string{"NAME", "HOST/PORT", "PATH", "SERVICES", "PORT", "TERMINATION", "WILDCARD"}
4040
deploymentConfigColumns = []string{"NAME", "REVISION", "DESIRED", "CURRENT", "TRIGGERED BY"}
4141
templateColumns = []string{"NAME", "DESCRIPTION", "PARAMETERS", "OBJECTS"}
4242
policyColumns = []string{"NAME", "ROLES", "LAST MODIFIED"}

0 commit comments

Comments
 (0)