README_GO.md

@@ -15,23 +15,16 @@ export HAPROXY_TEMPLATE="./haproxy.tmpl"
 {{- range .backends }}
 
 backend {{ .Name }}
-  mode {{ .Mode }}
+  mode tcp
-  balance {{ .Balance }}
+  balance leastconn
-  {{- if .CookieName }}
+  cookie {{ .Name }} insert indirect nocache
-  cookie {{ .CookieName }} {{ .CookieFlags }}
-  {{- end }}
 
-  {{- if .HealthCheck }}
-  option httpchk GET {{ .HealthCheck }}
-  http-check expect status 200
-  {{- end }}
-
-  {{- $backend := . }}
   {{- range .Servers }}
-  server {{ .Name }} {{ .Address }}:{{ .Port }}{{ if $backend.HealthCheck }} check{{ end }}{{ if $backend.CookieName }} cookie {{ .Cookie }}{{ end }}{{ if $backend.ServerOptions }} {{ $backend.ServerOptions }}{{ end }}
+  server {{ .Name }} {{ .Address }}:{{ .Port }} check cookie {{ .Cookie }}
   {{- end }}
 
 {{- end }}
+
 ```
 
 
@@ -48,7 +41,8 @@ Environment=KUBERNETES_HOST=https://10.0.20.7:6443
 Environment=KUBERNETES_TOKEN=eyJhbGciOi...
 Environment=KUBERNETES_VERIFYSSL=false
 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
 
 ```
 
@@ -66,34 +60,4 @@ Persistent=true
 [Install]
 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
-
-| Annotation-Key                 | Beschreibung                                                                | Typ     | Beispielwert               |
-|--------------------------------|-----------------------------------------------------------------------------|---------|---------------------------|
-| `haproxy/enabled`              | **Aktiviert** die Aufnahme des Services in die HAProxy-Konfiguration        | `bool`  | `"true"`                   |
-| `haproxy/mode`                 | Betriebsmodus des Backends (`tcp` oder `http`)                              | `string`| `"tcp"` / `"http"`         |
-| `haproxy/cookie-name`          | Name des Cookies zur Session-Persistenz                                     | `string`| `"SRVCOOKIE"`              |
-| `haproxy/cookie-flags`         | Zusätzliche Cookie-Optionen für HAProxy                                     | `string`| `"insert indirect nocache"`|
-| `haproxy/health-check`         | Deaktiviert Health-Checks, wenn `"false"` gesetzt wird                      | `bool`  | `"false"`                  |
-| `haproxy/server-options`       | Zusätzliche Optionen für die einzelnen `server`-Zeilen in HAProxy           | `string`| `"ssl verify none"`        |
-| `haproxy/port`                 | Nutze nur **diesen Port** des Services, wenn mehrere Ports definiert sind   | `int`   |`"8080"`                   |

main.go

@@ -28,14 +28,13 @@ type BackendServer struct {
 }
 
 type Backend struct {
-	Name          string
+	Name        string
-	Balance       string
+	Balance     string
-	Mode          string
+	Mode        string
-	CookieName    string
+	CookieName  string
-	CookieFlags   string
+	CookieFlags string
-	HealthCheck   string
+	HealthCheck bool
-	ServerOptions string
+	Servers     []BackendServer
-	Servers       []BackendServer
 }
 
 func getEnv(key, fallback string) string {
@@ -101,6 +100,7 @@ func main() {
 	k8sToken := getEnv("KUBERNETES_TOKEN", "")
 	verifySSLStr := getEnv("KUBERNETES_VERIFYSSL", "false")
 	templatePath := getEnv("HAPROXY_TEMPLATE", "haproxy.tmpl")
+	annotationCheckEnabled := os.Getenv("KUBERNETES_ANNOTATION_HAPROXY") != ""
 
 	if k8sHost == "" || k8sToken == "" {
 		log.Fatal("KUBERNETES_HOST and KUBERNETES_TOKEN must be set")
@@ -137,13 +137,16 @@ func main() {
 	type EndpointSubsetAddress struct {
 		IP string `json:"ip"`
 	}
+
 	type EndpointSubsetPort struct {
 		Port int `json:"port"`
 	}
+
 	type EndpointSubset struct {
 		Addresses []EndpointSubsetAddress `json:"addresses"`
 		Ports     []EndpointSubsetPort    `json:"ports"`
 	}
+
 	type Endpoint struct {
 		Metadata struct {
 			Name      string `json:"name"`
@@ -181,19 +184,28 @@ func main() {
 	backends := []Backend{}
 
 	for _, svc := range services {
-		ann := svc.Metadata.Annotations
+		if annotationCheckEnabled {
-		if val, ok := ann["haproxy/enabled"]; !ok || val != "true" {
+			val, ok := svc.Metadata.Annotations["haproxy/enabled"]
-			continue
+			if !ok || val != "true" {
+				continue
+			}
 		}
 
 		key := svc.Metadata.Namespace + "/" + svc.Metadata.Name
 		ep, found := endpointMap[key]
+		if !found || len(ep.Subsets) == 0 {
+			continue
+		}
+
+		ann := svc.Metadata.Annotations
 
 		b := Backend{
 			Name:        "SRV_" + strings.ReplaceAll(svc.Metadata.Name, " ", "-"),
 			Balance:     "leastconn",
-			Mode:        "tcp",
+			Mode:        "tcp", // default
-			HealthCheck: "",
+			CookieName:  "",
+			CookieFlags: "",
+			HealthCheck: true,
 		}
 
 		if val, ok := ann["haproxy/mode"]; ok && val != "" {
@@ -205,42 +217,28 @@ func main() {
 		if val, ok := ann["haproxy/cookie-flags"]; ok && val != "" {
 			b.CookieFlags = val
 		}
-		if val, ok := ann["haproxy/health-check"]; ok && val != "" {
+		if val, ok := ann["haproxy/health-check"]; ok && strings.ToLower(val) == "false" {
-			b.HealthCheck = val
+			b.HealthCheck = false
-		}
-		if val, ok := ann["haproxy/server-options"]; ok && val != "" {
-			b.ServerOptions = val
-		}
-
-		targetPort := 0
-		if val, ok := ann["haproxy/port"]; ok && val != "" {
-			if p, err := strconv.Atoi(val); err == nil {
-				targetPort = p
-			}
 		}
 
 		servers := []BackendServer{}
+		serverIndex := 1
+		for _, subset := range ep.Subsets {
+			for _, addr := range subset.Addresses {
+				for _, port := range subset.Ports {
+					cookie := hashString(fmt.Sprintf("%s-%s-%d", svc.Metadata.Name, addr.IP, port.Port))
+					serverName := fmt.Sprintf("%s_%d", svc.Metadata.Name, serverIndex)
+					serverIndex++
 
-		if found && len(ep.Subsets) > 0 {
+					servers = append(servers, BackendServer{
-			for _, subset := range ep.Subsets {
+						Name:    serverName,
-				for _, addr := range subset.Addresses {
+						Address: addr.IP,
-					for _, port := range subset.Ports {
+						Port:    port.Port,
-						if targetPort != 0 && port.Port != targetPort {
+						Cookie:  cookie,
-							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,
-						})
-					}
 				}
 			}
 		}
-
 		b.Servers = servers
 		backends = append(backends, b)
 	}
@@ -249,11 +247,11 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to get absolute path: %v", err)
 	}
-	
 	tmpl, err := getTemplate(tmplAbsPath)
 	if err != nil {
 		log.Fatalf("Failed to parse template: %v", err)
 	}
+
 	err = tmpl.Execute(os.Stdout, map[string]interface{}{
 		"backends": backends,
 	})