Skip to content

Commit 8f678a9

Browse files
TrekkieCoderTrekkieCoder
committed
Support for ingress host-url in LB commands
1 parent c021dd2 commit 8f678a9

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

‎cmd/create/create_loadbalancer.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type CreateLoadBalancerOptions struct {
5050
SecIPs []string
5151
Select string
5252
Name string
53-
Path string
53+
Host string
5454
}
5555

5656
type CreateLoadBalancerResult struct {
@@ -132,7 +132,7 @@ func NewCreateLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command {
132132
o := CreateLoadBalancerOptions{}
133133

134134
var createLbCmd = &cobra.Command{
135-
Use: "lb IP [--select=<rr|hash|priority|persist>] [--tcp=<port>:<targetPort>] [--udp=<port>:<targetPort>] [--sctp=<port>:<targetPort>] [--icmp] [--mark=<val>] [--secips=<ip>,][--endpoints=<ip>:<weight>,] [--mode=<onearm|fullnat>] [--bgp] [--monitor] [--inatimeout=<to>] [--name=<service-name>] [--attachEP] [--detachEP] [--security=<https|none>] [--path=<url>]",
135+
Use: "lb IP [--select=<rr|hash|priority|persist>] [--tcp=<port>:<targetPort>] [--udp=<port>:<targetPort>] [--sctp=<port>:<targetPort>] [--icmp] [--mark=<val>] [--secips=<ip>,][--endpoints=<ip>:<weight>,] [--mode=<onearm|fullnat>] [--bgp] [--monitor] [--inatimeout=<to>] [--name=<service-name>] [--attachEP] [--detachEP] [--security=<https|none>] [--host=<url>]",
136136
Short: "Create a LoadBalancer",
137137
Long: `Create a LoadBalancer
138138
@@ -150,7 +150,7 @@ func NewCreateLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command {
150150
151151
ex) loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1
152152
loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 --security=https
153-
loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 --path=loxilb.io
153+
loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 --host=loxilb.io
154154
loxicmd create lb 192.168.0.200 --tcp=80:32015 --name="http-service" --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1
155155
loxicmd create lb 192.168.0.200 --udp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 --mark=10
156156
loxicmd create lb 192.168.0.200 --tcp=80:32015 --udp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1
@@ -230,7 +230,7 @@ ex) loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.2
230230
Name: o.Name,
231231
Oper: api.LbOP(oper),
232232
Security: api.LbSec(SecStringToNum(o.Security)),
233-
Path: o.Path,
233+
Host: o.Host,
234234
}
235235

236236
if o.Mode == "dsr" && targetPort != port {
@@ -290,7 +290,7 @@ ex) loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.2
290290
createLbCmd.Flags().BoolVarP(&o.Attach, "attachEP", "", false, "Attach endpoints to the load balancer rule")
291291
createLbCmd.Flags().BoolVarP(&o.Detach, "detachEP", "", false, "Detach endpoints from the load balancer rule")
292292
createLbCmd.Flags().StringVarP(&o.Security, "security", "", o.Security, "Security mode for load balancer rule")
293-
createLbCmd.Flags().StringVarP(&o.Path, "path", "", o.Path, "Ingress URL Path")
293+
createLbCmd.Flags().StringVarP(&o.Host, "host", "", o.Host, "Ingress Host URL Path")
294294

295295
return createLbCmd
296296
}

‎cmd/delete/delete_loadbalancer.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ func NewDeleteLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command {
5151
var BGP bool
5252
var Mark uint16
5353
var Name string
54-
var Path string
54+
var Host string
5555

5656
var externalIP string
5757
//var endpointList []string
5858

5959
var deleteLbCmd = &cobra.Command{
60-
Use: "lb <EXTERNAL-IP> [--tcp portNumber] [--udp portNumber] [--sctp portNumber] [--icmp portNumber] [--bgp] [--mark=<val>] [--name=<service-name>] [--path=<url>]",
60+
Use: "lb <EXTERNAL-IP> [--tcp portNumber] [--udp portNumber] [--sctp portNumber] [--icmp portNumber] [--bgp] [--mark=<val>] [--name=<service-name>] [--host=<url>]",
6161
Short: "Delete a LoadBalancer",
6262
Long: `Delete a LoadBalancer.`,
6363
PreRun: func(cmd *cobra.Command, args []string) {
@@ -113,13 +113,13 @@ func NewDeleteLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command {
113113
PortNumberList["icmp"] = []int{0}
114114
}
115115
fmt.Printf("PortNumberList: %v\n", PortNumberList)
116-
if Path == "" {
117-
Path = "any"
116+
if Host == "" {
117+
Host = "any"
118118
}
119119
for proto, portNum := range PortNumberList {
120120
for _, port := range portNum {
121121
subResources := []string{
122-
"urlpath", Path,
122+
"hosturl", Host,
123123
"externalipaddress", externalIP,
124124
"port", strconv.Itoa(port),
125125
"protocol", proto,
@@ -152,7 +152,7 @@ func NewDeleteLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command {
152152
deleteLbCmd.Flags().BoolVarP(&BGP, "bgp", "", false, "BGP enable information'")
153153
deleteLbCmd.Flags().Uint16VarP(&Mark, "mark", "", 0, "Specify the mark num to segregate a load-balancer VIP service")
154154
deleteLbCmd.Flags().StringVarP(&Name, "name", "", Name, "Name for load balancer rule")
155-
deleteLbCmd.Flags().StringVarP(&Path, "path", "", Path, "Ingress URL Path")
155+
deleteLbCmd.Flags().StringVarP(&Host, "host", "", Host, "Ingress Host URL Path")
156156

157157
return deleteLbCmd
158158
}

‎cmd/get/get_loadbalancer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ func PrintGetLbResult(resp *http.Response, o api.RESTOptions) {
177177
for i, eps := range lbrule.Endpoints {
178178
if i == 0 {
179179

180-
data = append(data, []string{lbrule.Service.ExternalIP, secIPs, lbrule.Service.Path, fmt.Sprintf("%d", lbrule.Service.Port), protocolStr, lbrule.Service.Name, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)),
180+
data = append(data, []string{lbrule.Service.ExternalIP, secIPs, lbrule.Service.Host, fmt.Sprintf("%d", lbrule.Service.Port), protocolStr, lbrule.Service.Name, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)),
181181
eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), eps.State, eps.Counter})
182182
} else {
183183
data = append(data, []string{"", "", "", "", "", "", "", "", "", eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), eps.State, eps.Counter})
@@ -186,7 +186,7 @@ func PrintGetLbResult(resp *http.Response, o api.RESTOptions) {
186186
} else {
187187
for i, eps := range lbrule.Endpoints {
188188
if i == 0 {
189-
data = append(data, []string{lbrule.Service.ExternalIP, secIPs, lbrule.Service.Path, fmt.Sprintf("%d", lbrule.Service.Port), protocolStr, lbrule.Service.Name, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)),
189+
data = append(data, []string{lbrule.Service.ExternalIP, secIPs, lbrule.Service.Host, fmt.Sprintf("%d", lbrule.Service.Port), protocolStr, lbrule.Service.Name, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)),
190190
eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), "-", eps.Counter})
191191
} else {
192192
data = append(data, []string{"", "", "", "", "", "", "", "", "", eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), "-", eps.Counter})

‎cmd/get/type.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package get
1818
var (
1919
CONNTRACK_TITLE = []string{"destIP", "srcIP", "dPort", "sPort", "proto", "state", "act", "packets", "bytes"}
2020
LOADBALANCER_TITLE = []string{"Ext IP", "Port", "Proto", "Name", "Mark", "Sel", "Mode", "# of Endpoints", "Monitor"}
21-
LOADBALANCER_WIDE_TITLE = []string{"Ext IP", "Sec IPs", "Path", "Port", "Proto", "Name", "Mark", "Sel", "Mode", "Endpoint", "EPort", "Weight", "State", "Counters"}
21+
LOADBALANCER_WIDE_TITLE = []string{"Ext IP", "Sec IPs", "Host", "Port", "Proto", "Name", "Mark", "Sel", "Mode", "Endpoint", "EPort", "Weight", "State", "Counters"}
2222
SESSION_TITLE = []string{"ident", "session IP"}
2323
SESSION_WIDE_TITLE = []string{"ident", "session IP", "access Network Tunnel", "core Network Tunnel"}
2424
PORT_WIDE_TITLE = []string{"index", "portname", "MAC", "link/state", "mtu", "isActive/bpf\nPort type", "Statistics", "L3Info", "L2Info", "Sync"}

‎pkg/api/loadBalancer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ type LoadBalancerService struct {
5454
Snat bool `json:"snat,omitempty"`
5555
Oper LbOP `json:"oper,omitempty"`
5656
Security LbSec `json:"security,omitempty" yaml:"security"`
57-
Path string `json:"path,omitempty" yaml:"path"`
57+
Host string `json:"host,omitempty" yaml:"path"`
5858
}
5959

6060
type LoadBalancerEndpoint struct {

0 commit comments

Comments
 (0)