This commit is contained in:
parent
150373a819
commit
65de2adc47
1 changed files with 19 additions and 18 deletions
37
main.go
37
main.go
|
@ -188,9 +188,6 @@ func main() {
|
||||||
|
|
||||||
key := svc.Metadata.Namespace + "/" + svc.Metadata.Name
|
key := svc.Metadata.Namespace + "/" + svc.Metadata.Name
|
||||||
ep, found := endpointMap[key]
|
ep, found := endpointMap[key]
|
||||||
if !found || len(ep.Subsets) == 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
b := Backend{
|
b := Backend{
|
||||||
Name: "SRV_" + strings.ReplaceAll(svc.Metadata.Name, " ", "-"),
|
Name: "SRV_" + strings.ReplaceAll(svc.Metadata.Name, " ", "-"),
|
||||||
|
@ -210,8 +207,6 @@ func main() {
|
||||||
}
|
}
|
||||||
if val, ok := ann["haproxy/health-check"]; ok && val != "" {
|
if val, ok := ann["haproxy/health-check"]; ok && val != "" {
|
||||||
b.HealthCheck = val
|
b.HealthCheck = val
|
||||||
} else {
|
|
||||||
b.HealthCheck = ""
|
|
||||||
}
|
}
|
||||||
if val, ok := ann["haproxy/server-options"]; ok && val != "" {
|
if val, ok := ann["haproxy/server-options"]; ok && val != "" {
|
||||||
b.ServerOptions = val
|
b.ServerOptions = val
|
||||||
|
@ -225,30 +220,36 @@ func main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
servers := []BackendServer{}
|
servers := []BackendServer{}
|
||||||
for _, subset := range ep.Subsets {
|
|
||||||
for _, addr := range subset.Addresses {
|
if found && len(ep.Subsets) > 0 {
|
||||||
for _, port := range subset.Ports {
|
for _, subset := range ep.Subsets {
|
||||||
if targetPort != 0 && port.Port != targetPort {
|
for _, addr := range subset.Addresses {
|
||||||
continue
|
for _, port := range subset.Ports {
|
||||||
|
if targetPort != 0 && port.Port != targetPort {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
cookie := hashString(fmt.Sprintf("%s-%s-%d", svc.Metadata.Name, addr.IP, port.Port))
|
||||||
|
serverName := fmt.Sprintf("%s_%d", svc.Metadata.Name, cookie)
|
||||||
|
servers = append(servers, BackendServer{
|
||||||
|
Name: serverName,
|
||||||
|
Address: addr.IP,
|
||||||
|
Port: port.Port,
|
||||||
|
Cookie: cookie,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
cookie := hashString(fmt.Sprintf("%s-%s-%d", svc.Metadata.Name, addr.IP, port.Port))
|
|
||||||
serverName := fmt.Sprintf("%s_%d", svc.Metadata.Name, cookie)
|
|
||||||
servers = append(servers, BackendServer{
|
|
||||||
Name: serverName,
|
|
||||||
Address: addr.IP,
|
|
||||||
Port: port.Port,
|
|
||||||
Cookie: cookie,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
b.Servers = servers
|
b.Servers = servers
|
||||||
backends = append(backends, b)
|
backends = append(backends, b)
|
||||||
}
|
}
|
||||||
|
|
||||||
tmplAbsPath, err := filepath.Abs(templatePath)
|
tmplAbsPath, err := filepath.Abs(templatePath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Failed to get absolute path: %v", err)
|
log.Fatalf("Failed to get absolute path: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpl, err := getTemplate(tmplAbsPath)
|
tmpl, err := getTemplate(tmplAbsPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("Failed to parse template: %v", err)
|
log.Fatalf("Failed to parse template: %v", err)
|
||||||
|
|
Loading…
Add table
Reference in a new issue