Compare commits

..

No commits in common. "master" and "0.0.20" have entirely different histories.

2 changed files with 21 additions and 38 deletions

View file

@ -48,7 +48,8 @@ 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=/bin/bash /etc/haproxy/haproxy-generator.sh ExecStart=/path/to/haproxy-generator > /etc/haproxy/haproxy.cfg
ExecStartPost=/bin/systemctl restart haproxy
``` ```
@ -68,24 +69,6 @@ WantedBy=timers.target
``` ```
# Reload Script for post start
Copy the script to /etc/haproxy/haproxy-generator.sh
```
#!/bin/bash
/usr/local/bin/haproxy-generator > /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
VALID=$?
if [ "$DIFF" != "" ] && [ $VALID -eq 0 ]
then
mv /etc/haproxy/haproxy.cfg.new /etc/haproxy/haproxy.cfg
/usr/sbin/service haproxy restart
fi
```
# Service Annotations # Service Annotations
| Annotation-Key | Beschreibung | Typ | Beispielwert | | Annotation-Key | Beschreibung | Typ | Beispielwert |

12
main.go
View file

@ -188,6 +188,9 @@ 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, " ", "-"),
@ -207,6 +210,8 @@ 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
@ -220,8 +225,6 @@ func main() {
} }
servers := []BackendServer{} servers := []BackendServer{}
if found && len(ep.Subsets) > 0 {
for _, subset := range ep.Subsets { for _, subset := range ep.Subsets {
for _, addr := range subset.Addresses { for _, addr := range subset.Addresses {
for _, port := range subset.Ports { for _, port := range subset.Ports {
@ -239,17 +242,14 @@ func main() {
} }
} }
} }
}
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)