Fixing haproxy extra values

Signed-off-by: Timothy Griffiths <[email protected]>
argoproj · Jun 12, 2024 · a3524b2 · a3524b2
1 parent 08ffa0f
commit a3524b2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/manifests/ha/base/redis-ha/chart/upstream.yaml b/manifests/ha/base/redis-ha/chart/upstream.yaml
@@ -626,7 +626,7 @@ data:
       timeout check 2s
 
     listen health_check_http_url
-      bind :8888
+      bind :8888  
       mode http
       monitor-uri /healthz
       option      dontlognull
@@ -673,7 +673,7 @@ data:
     # decide redis backend to use
     #master
     frontend ft_redis_master
-      bind :6379
+      bind :6379 
       use_backend bk_redis_master
     # Check all redis servers to see if they think they are master
     backend bk_redis_master
@@ -696,19 +696,15 @@ data:
       server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1
     frontend stats
       mode http
-      bind :9101
+      bind :9101 
       http-request use-service prometheus-exporter if { path /metrics }
       stats enable
       stats uri /stats
       stats refresh 10s
     # Additional configuration
-    global:
-      maxconn: 4096
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 2711f86f9 (Merged from remote master)
+    global
+      maxconn 4096
+    
   haproxy_init.sh: |
     HAPROXY_CONF=/data/haproxy.cfg
     cp /readonly/haproxy.cfg "$HAPROXY_CONF"
@@ -1076,12 +1072,12 @@ spec:
         prometheus.io/port: "9101"
         prometheus.io/scrape: "true"
         prometheus.io/path: "/metrics"
-        checksum/config: a0c34f71495cd7e199dbe954610cfa810dbaa1a753857ef2e874273419a29410
+        checksum/config: cd6508bdf9819601c454d0cc491fb77a209e3a88761d92514d105b6681829953
     spec:
       # Needed when using unmodified rbac-setup.yml
-
+      
       serviceAccountName: argocd-redis-ha-haproxy
-      securityContext:
+      securityContext: 
         fsGroup: 99
         runAsNonRoot: true
         runAsUser: 99
@@ -1107,7 +1103,7 @@ spec:
         - sh
         args:
         - /readonly/haproxy_init.sh
-        securityContext:
+        securityContext: 
           allowPrivilegeEscalation: false
           capabilities:
             drop:
@@ -1125,7 +1121,7 @@ spec:
       - name: haproxy
         image: public.ecr.aws/docker/library/haproxy:2.6.17-alpine
         imagePullPolicy: IfNotPresent
-        securityContext:
+        securityContext: 
           allowPrivilegeEscalation: false
           capabilities:
             drop:
@@ -1219,7 +1215,7 @@ spec:
                   release: argocd
                   argocd-redis-ha: replica
               topologyKey: kubernetes.io/hostname
-      securityContext:
+      securityContext: 
         fsGroup: 1000
         runAsNonRoot: true
         runAsUser: 1000
@@ -1235,15 +1231,15 @@ spec:
         - sh
         args:
         - /readonly-config/init.sh
-        securityContext:
+        securityContext: 
           allowPrivilegeEscalation: false
           capabilities:
             drop:
             - ALL
           runAsNonRoot: true
           runAsUser: 1000
           seccompProfile:
-            type: RuntimeDefault
+            type: RuntimeDefault        
         env:
         - name: SENTINEL_ID_0
           value: 3c0d9c0320bb34888c2df5757c718ce6ca992ce6
@@ -1272,7 +1268,7 @@ spec:
           - redis-server
         args:
           - /data/conf/redis.conf
-        securityContext:
+        securityContext: 
           allowPrivilegeEscalation: false
           capabilities:
             drop:
@@ -1335,7 +1331,7 @@ spec:
           - redis-sentinel
         args:
           - /data/conf/sentinel.conf
-        securityContext:
+        securityContext: 
           allowPrivilegeEscalation: false
           capabilities:
             drop:
@@ -1392,15 +1388,15 @@ spec:
           - sh
         args:
           - /readonly-config/fix-split-brain.sh
-        securityContext:
+        securityContext: 
           allowPrivilegeEscalation: false
           capabilities:
             drop:
             - ALL
           runAsNonRoot: true
           runAsUser: 1000
           seccompProfile:
-            type: RuntimeDefault
+            type: RuntimeDefault        
         env:
         - name: SENTINEL_ID_0
           value: 3c0d9c0320bb34888c2df5757c718ce6ca992ce6

diff --git a/manifests/ha/base/redis-ha/chart/values.yaml b/manifests/ha/base/redis-ha/chart/values.yaml
@@ -23,8 +23,8 @@ redis-ha:
     metrics:
       enabled: true
     extraConfig: |
-      global:
-        maxconn: 4096
+      global
+        maxconn 4096
   image:
     tag: 7.0.15-alpine
   containerSecurityContext: null

diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml
@@ -21744,7 +21744,7 @@ data:
     2 }\n  server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1\nfrontend
     stats\n  mode http\n  bind :9101 \n  http-request use-service prometheus-exporter
     if { path /metrics }\n  stats enable\n  stats uri /stats\n  stats refresh 10s\n#
-    Additional configuration\nglobal:\n  maxconn: 4096\n"
+    Additional configuration\nglobal\n  maxconn 4096\n"
   haproxy_init.sh: |
     HAPROXY_CONF=/data/haproxy.cfg
     cp /readonly/haproxy.cfg "$HAPROXY_CONF"
@@ -22873,7 +22873,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: a0c34f71495cd7e199dbe954610cfa810dbaa1a753857ef2e874273419a29410
+        checksum/config: cd6508bdf9819601c454d0cc491fb77a209e3a88761d92514d105b6681829953
         prometheus.io/path: /metrics
         prometheus.io/port: "9101"
         prometheus.io/scrape: "true"

diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml
@@ -821,7 +821,7 @@ data:
     2 }\n  server R2 argocd-redis-ha-announce-2:6379 check inter 3s fall 1 rise 1\nfrontend
     stats\n  mode http\n  bind :9101 \n  http-request use-service prometheus-exporter
     if { path /metrics }\n  stats enable\n  stats uri /stats\n  stats refresh 10s\n#
-    Additional configuration\nglobal:\n  maxconn: 4096\n"
+    Additional configuration\nglobal\n  maxconn 4096\n"
   haproxy_init.sh: |
     HAPROXY_CONF=/data/haproxy.cfg
     cp /readonly/haproxy.cfg "$HAPROXY_CONF"
@@ -1950,7 +1950,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: a0c34f71495cd7e199dbe954610cfa810dbaa1a753857ef2e874273419a29410
+        checksum/config: cd6508bdf9819601c454d0cc491fb77a209e3a88761d92514d105b6681829953
         prometheus.io/path: /metrics
         prometheus.io/port: "9101"
         prometheus.io/scrape: "true"