From e4c9fdb8619517d6e8c88e74fc3c1bdcf343a2ce Mon Sep 17 00:00:00 2001
From: Ruslan Aliev <raliev@mirantis.com>
Date: Thu, 22 Aug 2024 10:38:56 -0500
Subject: [PATCH] Remove etcd from haproxy cfg template

Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
Change-Id: Ib4efe7494be1a6cd243303be9375c25894c77eef
---
 examples/containerd/armada-resources.yaml            | 12 +-----------
 examples/gate/armada-resources.yaml                  | 12 +-----------
 .../roles/common/etc/promenade/haproxy/haproxy.cfg   | 11 -----------
 .../config-templates/bootstrap-armada-config.yaml    | 12 +-----------
 zuul.d/project.yaml                                  | 12 ++++++------
 5 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml
index 9d3a014c..ed36ff81 100644
--- a/examples/containerd/armada-resources.yaml
+++ b/examples/containerd/armada-resources.yaml
@@ -510,16 +510,6 @@ data:
                   - mode tcp
                   - option tcp-check
                   - option redispatch
-            kubernetes-etcd:
-              server_opts: "check port 2379"
-              conf_parts:
-                frontend:
-                  - mode tcp
-                  - bind *:2378
-                backend:
-                  - mode tcp
-                  - option tcp-check
-                  - option redispatch
 
     images:
       tags:
@@ -629,7 +619,7 @@ data:
           apiVersion: apiserver.config.k8s.io/v1
     apiserver:
       etcd:
-        endpoints: https://127.0.0.1:2378
+        endpoints: https://127.0.0.1:2379
     images:
       tags:
         anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml
index e4fa83e6..6ac1c1e8 100644
--- a/examples/gate/armada-resources.yaml
+++ b/examples/gate/armada-resources.yaml
@@ -516,16 +516,6 @@ data:
                   - mode tcp
                   - option tcp-check
                   - option redispatch
-            kubernetes-etcd:
-              server_opts: "check port 2379"
-              conf_parts:
-                frontend:
-                  - mode tcp
-                  - bind *:2378
-                backend:
-                  - mode tcp
-                  - option tcp-check
-                  - option redispatch
 
     images:
       tags:
@@ -635,7 +625,7 @@ data:
           apiVersion: apiserver.config.k8s.io/v1
     apiserver:
       etcd:
-        endpoints: https://127.0.0.1:2378
+        endpoints: https://127.0.0.1:2379
     images:
       tags:
         anchor: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal
diff --git a/promenade/templates/roles/common/etc/promenade/haproxy/haproxy.cfg b/promenade/templates/roles/common/etc/promenade/haproxy/haproxy.cfg
index 221cff68..072ed6a1 100644
--- a/promenade/templates/roles/common/etc/promenade/haproxy/haproxy.cfg
+++ b/promenade/templates/roles/common/etc/promenade/haproxy/haproxy.cfg
@@ -32,16 +32,5 @@ backend default-kubernetes-be
   server s{{ ip }} {{ ip }}:{{ port }} check port {{ port }}
   {%- endfor %}
 
-frontend kube-system-kubernetes-etcd-fe
-  bind *:{{ config['KubernetesNetwork:etcd.haproxy_port'] }}
-  default_backend kube-system-kubernetes-etcd-be
-
-backend kube-system-kubernetes-etcd-be
-  option tcp-check
-  {%- set port = config['KubernetesNetwork:etcd.container_port'] %}
-  {%- for ip in config.join_ips %}
-  server s{{ ip }} {{ ip }}:{{ port }} check port {{ port }}
-  {%- endfor %}
-
 # Haproxy requires config files end with a newline.
 
diff --git a/tools/gate/config-templates/bootstrap-armada-config.yaml b/tools/gate/config-templates/bootstrap-armada-config.yaml
index 82868de5..281b5c77 100644
--- a/tools/gate/config-templates/bootstrap-armada-config.yaml
+++ b/tools/gate/config-templates/bootstrap-armada-config.yaml
@@ -545,16 +545,6 @@ data:
                   - mode tcp
                   - option tcp-check
                   - option redispatch
-            kubernetes-etcd:
-              server_opts: "check"
-              conf_parts:
-                frontend:
-                  - mode tcp
-                  - bind *:2378
-                backend:
-                  - mode tcp
-                  - option tcp-check
-                  - option redispatch
 
     images:
       tags:
@@ -646,7 +636,7 @@ data:
   values:
     apiserver:
       etcd:
-        endpoints: https://127.0.0.1:2378
+        endpoints: https://127.0.0.1:2379
     images:
       tags:
         anchor: ${IMAGE_ANCHOR}
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b6d4621f..e4989d07 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -41,16 +41,16 @@
         - airship-promenade-chart-build-gate
         - airship-promenade-chart-build-latest-htk
         - airship-promenade-genesis-containerd-gate
-        - trigger-readthedocs-webhook
+        #- trigger-readthedocs-webhook
     post:
       jobs:
         - airship-promenade-docker-publish_ubuntu_focal
         - promenade-upload-git-mirror
-        - trigger-readthedocs-webhook
+        #- trigger-readthedocs-webhook
     pre-release:
-      jobs:
-        - trigger-readthedocs-webhook
+      jobs: []
+        #- trigger-readthedocs-webhook
     release:
-      jobs:
-        - trigger-readthedocs-webhook
+      jobs: []
+        #- trigger-readthedocs-webhook
 ...