airship/promenade
Code Issues Proposed changes

Remove etcd from haproxy cfg template

Browse Source 
Signed-off-by: Ruslan Aliev <raliev@mirantis.com>
Change-Id: Ib4efe7494be1a6cd243303be9375c25894c77eef
This commit is contained in:
Ruslan Aliev 2024-08-22 10:38:56 -05:00
parent 9425f85295
commit e4c9fdb861
5 changed files with 9 additions and 50 deletions
examples
containerd
armada-resources.yaml
gate
armada-resources.yaml
promenade/templates/roles/common/etc/promenade/haproxy
haproxy.cfg
tools/gate/config-templates
bootstrap-armada-config.yaml
zuul.d
project.yaml

12
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

12
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

11
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.

12
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}

12
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
...