Browse Source

Update HAProxy to tolerate node down better

Change-Id: I1431e42fcca5aecf14a9b60a205a8b6b440b8e1b
Mark Burnett 1 year ago
parent
commit
a4e6fa47f9

+ 4
- 0
charts/haproxy/values.yaml View File

@@ -31,6 +31,8 @@ conf:
31 31
             backend:
32 32
               - mode tcp
33 33
               - option tcpka
34
+              - option tcp-check
35
+              - option redispatch
34 36
       kube-system:
35 37
         kubernetes-etcd:
36 38
           server_opts: "check"
@@ -42,6 +44,8 @@ conf:
42 44
             backend:
43 45
               - mode tcp
44 46
               - option tcpka
47
+              - option tcp-check
48
+              - option redispatch
45 49
 
46 50
   haproxy:
47 51
     container_config_dir: /usr/local/etc/haproxy

+ 6
- 2
examples/basic/armada-resources.yaml View File

@@ -580,7 +580,7 @@ data:
580 580
         services:
581 581
           default:
582 582
             kubernetes:
583
-              server_opts: "check"
583
+              server_opts: "check port 6443"
584 584
               conf_parts:
585 585
                 frontend:
586 586
                   - mode tcp
@@ -589,9 +589,11 @@ data:
589 589
                 backend:
590 590
                   - mode tcp
591 591
                   - option tcpka
592
+                  - option tcp-check
593
+                  - option redispatch
592 594
           kube-system:
593 595
             kubernetes-etcd:
594
-              server_opts: "check"
596
+              server_opts: "check port 2379"
595 597
               conf_parts:
596 598
                 frontend:
597 599
                   - mode tcp
@@ -600,6 +602,8 @@ data:
600 602
                 backend:
601 603
                   - mode tcp
602 604
                   - option tcpka
605
+                  - option tcp-check
606
+                  - option redispatch
603 607
 
604 608
     images:
605 609
       tags:

+ 4
- 0
examples/complete/armada-resources.yaml View File

@@ -629,6 +629,8 @@ data:
629 629
                 backend:
630 630
                   - mode tcp
631 631
                   - option tcpka
632
+                  - option tcp-check
633
+                  - option redispatch
632 634
           kube-system:
633 635
             kubernetes-etcd:
634 636
               server_opts: "check"
@@ -640,6 +642,8 @@ data:
640 642
                 backend:
641 643
                   - mode tcp
642 644
                   - option tcpka
645
+                  - option tcp-check
646
+                  - option redispatch
643 647
 
644 648
     images:
645 649
       tags:

+ 4
- 0
tools/gate/config-templates/bootstrap-armada-config.yaml View File

@@ -566,6 +566,8 @@ data:
566 566
                 backend:
567 567
                   - mode tcp
568 568
                   - option tcpka
569
+                  - option tcp-check
570
+                  - option redispatch
569 571
           kube-system:
570 572
             kubernetes-etcd:
571 573
               server_opts: "check"
@@ -577,6 +579,8 @@ data:
577 579
                 backend:
578 580
                   - mode tcp
579 581
                   - option tcpka
582
+                  - option tcp-check
583
+                  - option redispatch
580 584
 
581 585
     images:
582 586
       tags:

Loading…
Cancel
Save