Compare commits
3 commits
Author | SHA1 | Date | |
---|---|---|---|
65de2adc47 | |||
150373a819 | |||
91fbebd25e |
2 changed files with 22 additions and 22 deletions
|
@ -48,8 +48,7 @@ Environment=KUBERNETES_HOST=https://10.0.20.7:6443
|
||||||
Environment=KUBERNETES_TOKEN=eyJhbGciOi...
|
Environment=KUBERNETES_TOKEN=eyJhbGciOi...
|
||||||
Environment=KUBERNETES_VERIFYSSL=false
|
Environment=KUBERNETES_VERIFYSSL=false
|
||||||
Environment=HAPROXY_TEMPLATE=/etc/haproxy/haproxy.tmpl
|
Environment=HAPROXY_TEMPLATE=/etc/haproxy/haproxy.tmpl
|
||||||
ExecStart=/path/to/haproxy-generator > /etc/haproxy/haproxy.cfg.new
|
ExecStart=/bin/bash /etc/haproxy/haproxy-generator.sh
|
||||||
ExecStartPost=/bin/bash /etc/haproxy/haproxy-generator-post.sh
|
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -71,10 +70,11 @@ WantedBy=timers.target
|
||||||
|
|
||||||
# Reload Script for post start
|
# Reload Script for post start
|
||||||
|
|
||||||
Copy the script to /etc/haproxy/haproxy-generator-post.sh
|
Copy the script to /etc/haproxy/haproxy-generator.sh
|
||||||
```
|
```
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
/usr/local/bin/haproxy-generator > /etc/haproxy/haproxy.cfg.new
|
||||||
DIFF=$(diff /etc/haproxy/haproxy.cfg /etc/haproxy/haproxy.cfg.new)
|
DIFF=$(diff /etc/haproxy/haproxy.cfg /etc/haproxy/haproxy.cfg.new)
|
||||||
/sbin/haproxy -f /etc/haproxy/haproxy.cfg.new -c
|
/sbin/haproxy -f /etc/haproxy/haproxy.cfg.new -c
|
||||||
VALID=$?
|
VALID=$?
|
||||||
|
|
38
main.go
38
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,31 +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
|
||||||
log.Printf("Backend %s: ServerOptions = %q", b.Name, b.ServerOptions)
|
|
||||||
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