From bc355b4faf15d96f2ca6cd64bb38b2cbacbadbb4 Mon Sep 17 00:00:00 2001 From: safouenebg Date: Thu, 16 May 2024 18:52:11 +0000 Subject: [PATCH 01/14] haproxy_update --- group_vars/safouene | 15 ++++++++++++++- host_vars/haproxy.yml | 6 ++++++ host_vars/lb1.yml | 10 ++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 host_vars/haproxy.yml create mode 100644 host_vars/lb1.yml diff --git a/group_vars/safouene b/group_vars/safouene index c16e1bc..faabd0b 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -10,7 +10,20 @@ users: haproxy_local_config_path: "reverse-proxy/haproxy.cfg.j2" haproxy_list_tls: - wildcard.felcloud.io -lb_local_config_path: "reverse-proxy/lb.cfg.j2" +haproxy_nbproc: 1 +haproxy_first_tls: "/etc/haproxy/tls/wildcard.felcloud.io.pem" + +haproxy: + frontends: + - mode: tcp + backends: + - name: "{{ k8s_backend_name }}" + frontend: "{{ k8s_frontend_name }}" + mode: tcp + servers: + - "server {{ groups[group][0] }} {{ hostvars[groups[group][0]].ansible_host }}:80 check" + - "server {{ groups[group][1] }} {{ hostvars[groups[group][1]].ansible_host }}:80 check" + - "server {{ groups[group][2] }} {{ hostvars[groups[group][2]].ansible_host }}:80 check" #vars diff --git a/host_vars/haproxy.yml b/host_vars/haproxy.yml new file mode 100644 index 0000000..d12edd6 --- /dev/null +++ b/host_vars/haproxy.yml @@ -0,0 +1,6 @@ +--- +k8s_backend_name: k8s_master_lb +k8s_frontend_name: k8s_master_lb +backend_servers: "{{ k8s_master_groupname }}" +group: "{{ k8s_master_groupname }}" + diff --git a/host_vars/lb1.yml b/host_vars/lb1.yml new file mode 100644 index 0000000..2c78bfd --- /dev/null +++ b/host_vars/lb1.yml @@ -0,0 +1,10 @@ +--- +k8s_backend_name: k8s_worker_lb +k8s_frontend_name: k8s_worker_lb +backend_servers: "{{ k8s_worker_groupname }}" +group: "{{ k8s_worker_groupname }}" + +# BEGIN ANSIBLE MANAGED BLOCK +public_vip_address: + - 38.108.68.241 +# END ANSIBLE MANAGED BLOCK From acf6eef8c14d29bb5c06f6600d278e26d5d8edb2 Mon Sep 17 00:00:00 2001 From: safouenebg Date: Mon, 20 May 2024 15:18:31 +0000 Subject: [PATCH 02/14] haproxy_vars_updated --- group_vars/safouene | 1 - host_vars/lb1.yml | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index faabd0b..a00a53a 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -29,4 +29,3 @@ haproxy: #vars k8s_master_groupname: master k8s_worker_groupname: worker - diff --git a/host_vars/lb1.yml b/host_vars/lb1.yml index 2c78bfd..2282bf8 100644 --- a/host_vars/lb1.yml +++ b/host_vars/lb1.yml @@ -4,7 +4,5 @@ k8s_frontend_name: k8s_worker_lb backend_servers: "{{ k8s_worker_groupname }}" group: "{{ k8s_worker_groupname }}" -# BEGIN ANSIBLE MANAGED BLOCK -public_vip_address: - - 38.108.68.241 -# END ANSIBLE MANAGED BLOCK +public_vip_address: + - "{{ public_vip_address }}" From 170e6ffa73f0262f637c0657e338fe2fd84f488d Mon Sep 17 00:00:00 2001 From: safouenebg Date: Thu, 23 May 2024 09:46:07 +0000 Subject: [PATCH 03/14] ingress_vars_update --- group_vars/safouene | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index a00a53a..da31cbc 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -21,11 +21,12 @@ haproxy: frontend: "{{ k8s_frontend_name }}" mode: tcp servers: - - "server {{ groups[group][0] }} {{ hostvars[groups[group][0]].ansible_host }}:80 check" - - "server {{ groups[group][1] }} {{ hostvars[groups[group][1]].ansible_host }}:80 check" - - "server {{ groups[group][2] }} {{ hostvars[groups[group][2]].ansible_host }}:80 check" + - "server {{ groups[group][0] }} {{ hostvars[groups[group][0]].ansible_host }}:{{ NodePort }} check" + - "server {{ groups[group][1] }} {{ hostvars[groups[group][1]].ansible_host }}:{{ NodePort }} check" + - "server {{ groups[group][2] }} {{ hostvars[groups[group][2]].ansible_host }}:{{ NodePort }} check" #vars k8s_master_groupname: master k8s_worker_groupname: worker +NodePort: 31000 From 04590e3fbe3b114bbf86acf7aaf6446caedc6053 Mon Sep 17 00:00:00 2001 From: safouenebg Date: Fri, 24 May 2024 09:03:58 +0000 Subject: [PATCH 04/14] ip_var_added --- group_vars/safouene | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/safouene b/group_vars/safouene index da31cbc..db4e44f 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -12,6 +12,7 @@ haproxy_list_tls: - wildcard.felcloud.io haproxy_nbproc: 1 haproxy_first_tls: "/etc/haproxy/tls/wildcard.felcloud.io.pem" +private_ip: "{{ hostvars[inventory_hostname].ansible_host }}" haproxy: frontends: From d6389d9c72f201c9a6749d6448efe2fc50837ff9 Mon Sep 17 00:00:00 2001 From: safouenebg Date: Thu, 30 May 2024 08:57:45 +0000 Subject: [PATCH 05/14] haproxy_vars_updated --- group_vars/safouene | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/group_vars/safouene b/group_vars/safouene index db4e44f..8e129e5 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -12,7 +12,8 @@ haproxy_list_tls: - wildcard.felcloud.io haproxy_nbproc: 1 haproxy_first_tls: "/etc/haproxy/tls/wildcard.felcloud.io.pem" -private_ip: "{{ hostvars[inventory_hostname].ansible_host }}" +private_ips: + - "{{ hostvars[inventory_hostname].ansible_host }}" haproxy: frontends: From 70a77e4e9aeb8146341c317dc711f70c51ec422b Mon Sep 17 00:00:00 2001 From: safouenebg Date: Thu, 30 May 2024 11:34:07 +0000 Subject: [PATCH 06/14] haproxy_vars_update --- group_vars/safouene | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/safouene b/group_vars/safouene index 8e129e5..89548b3 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -14,6 +14,7 @@ haproxy_nbproc: 1 haproxy_first_tls: "/etc/haproxy/tls/wildcard.felcloud.io.pem" private_ips: - "{{ hostvars[inventory_hostname].ansible_host }}" +port: 80 haproxy: frontends: From 82c539da03c755f90b2f726fb80da02dc682ccd4 Mon Sep 17 00:00:00 2001 From: safouenebg Date: Thu, 30 May 2024 14:54:34 +0000 Subject: [PATCH 07/14] haproxy_vars_updated --- group_vars/safouene | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index 89548b3..689a202 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -10,11 +10,6 @@ users: haproxy_local_config_path: "reverse-proxy/haproxy.cfg.j2" haproxy_list_tls: - wildcard.felcloud.io -haproxy_nbproc: 1 -haproxy_first_tls: "/etc/haproxy/tls/wildcard.felcloud.io.pem" -private_ips: - - "{{ hostvars[inventory_hostname].ansible_host }}" -port: 80 haproxy: frontends: @@ -27,6 +22,12 @@ haproxy: - "server {{ groups[group][0] }} {{ hostvars[groups[group][0]].ansible_host }}:{{ NodePort }} check" - "server {{ groups[group][1] }} {{ hostvars[groups[group][1]].ansible_host }}:{{ NodePort }} check" - "server {{ groups[group][2] }} {{ hostvars[groups[group][2]].ansible_host }}:{{ NodePort }} check" + private_ips: + - "{{ hostvars[inventory_hostname].ansible_host }}" + port: 80 + haproxy_nbproc: 1 + haproxy_first_tls: "/etc/haproxy/tls/wildcard.felcloud.io.pem" + #vars From 7061f20a8c12e364bf437973fb150fd76b6ab42e Mon Sep 17 00:00:00 2001 From: safouenebg Date: Fri, 31 May 2024 15:40:22 +0000 Subject: [PATCH 08/14] haproxy_vars_changed --- group_vars/safouene | 20 +++++++++++--------- host_vars/lb1.yml | 2 -- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index 689a202..f6bf703 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -10,27 +10,29 @@ users: haproxy_local_config_path: "reverse-proxy/haproxy.cfg.j2" haproxy_list_tls: - wildcard.felcloud.io +haproxy_nbproc: 1 +haproxy_first_tls: "/etc/haproxy/tls/wildcard.felcloud.io.pem" + haproxy: frontends: - - mode: tcp + - name: "{{ k8s_frontend_name }}" + mode: tcp + port: 80 + ips: + - "{{ hostvars[inventory_hostname].ansible_host }}" + backends: - name: "{{ k8s_backend_name }}" - frontend: "{{ k8s_frontend_name }}" mode: tcp servers: - "server {{ groups[group][0] }} {{ hostvars[groups[group][0]].ansible_host }}:{{ NodePort }} check" - "server {{ groups[group][1] }} {{ hostvars[groups[group][1]].ansible_host }}:{{ NodePort }} check" - "server {{ groups[group][2] }} {{ hostvars[groups[group][2]].ansible_host }}:{{ NodePort }} check" - private_ips: - - "{{ hostvars[inventory_hostname].ansible_host }}" - port: 80 - haproxy_nbproc: 1 - haproxy_first_tls: "/etc/haproxy/tls/wildcard.felcloud.io.pem" - - + #vars k8s_master_groupname: master k8s_worker_groupname: worker NodePort: 31000 + diff --git a/host_vars/lb1.yml b/host_vars/lb1.yml index 2282bf8..7817cc4 100644 --- a/host_vars/lb1.yml +++ b/host_vars/lb1.yml @@ -4,5 +4,3 @@ k8s_frontend_name: k8s_worker_lb backend_servers: "{{ k8s_worker_groupname }}" group: "{{ k8s_worker_groupname }}" -public_vip_address: - - "{{ public_vip_address }}" From 20c9f2416967a11892aea34762ae35755dc6697f Mon Sep 17 00:00:00 2001 From: safouenebg Date: Fri, 31 May 2024 18:33:45 +0000 Subject: [PATCH 09/14] haproxy_vars_changed --- group_vars/safouene | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index f6bf703..6a2d3c6 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -18,9 +18,10 @@ haproxy: frontends: - name: "{{ k8s_frontend_name }}" mode: tcp - port: 80 - ips: + haproxy_ips: - "{{ hostvars[inventory_hostname].ansible_host }}" + port: + - "80" backends: - name: "{{ k8s_backend_name }}" From 1f1e5fa852e981b590e84c48882a812bbba60555 Mon Sep 17 00:00:00 2001 From: safouenebg Date: Sun, 2 Jun 2024 16:43:17 +0000 Subject: [PATCH 10/14] haproxy_vars_changed --- group_vars/safouene | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index 6a2d3c6..7c1cf69 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -19,9 +19,9 @@ haproxy: - name: "{{ k8s_frontend_name }}" mode: tcp haproxy_ips: - - "{{ hostvars[inventory_hostname].ansible_host }}" - port: - - "80" + - "{{ hostvars[inventory_hostname].ansible_host }}" + ports: + - "80" backends: - name: "{{ k8s_backend_name }}" From e262842ad49ddd19c58262984b46836b9686136f Mon Sep 17 00:00:00 2001 From: safouenebg Date: Mon, 3 Jun 2024 11:35:06 +0000 Subject: [PATCH 11/14] haproxy_loop_changed --- group_vars/safouene | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index 7c1cf69..040eb4e 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -19,9 +19,10 @@ haproxy: - name: "{{ k8s_frontend_name }}" mode: tcp haproxy_ips: - - "{{ hostvars[inventory_hostname].ansible_host }}" - ports: - - "80" + - ip: "{{ hostvars[inventory_hostname].ansible_host }}" + ports: + - "80" + - "443" backends: - name: "{{ k8s_backend_name }}" From 8b0e3073a86e5fa542cef37b2e7d0048e94ac5f3 Mon Sep 17 00:00:00 2001 From: safouenebg Date: Mon, 3 Jun 2024 14:06:09 +0000 Subject: [PATCH 12/14] haproxy_vars_updated --- group_vars/safouene | 1 + 1 file changed, 1 insertion(+) diff --git a/group_vars/safouene b/group_vars/safouene index 040eb4e..90ccdac 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -26,6 +26,7 @@ haproxy: backends: - name: "{{ k8s_backend_name }}" + frontend: "{{ k8s_frontend_name }}" mode: tcp servers: - "server {{ groups[group][0] }} {{ hostvars[groups[group][0]].ansible_host }}:{{ NodePort }} check" From f0095830be0c86ca23851e3aa7f010941ea23261 Mon Sep 17 00:00:00 2001 From: safouenebg Date: Mon, 3 Jun 2024 15:14:26 +0000 Subject: [PATCH 13/14] haproxy_config_file --- group_vars/safouene | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index 90ccdac..dc9804b 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -19,11 +19,10 @@ haproxy: - name: "{{ k8s_frontend_name }}" mode: tcp haproxy_ips: - - ip: "{{ hostvars[inventory_hostname].ansible_host }}" - ports: - - "80" - - "443" - + - ip: "{{ hostvars[inventory_hostname].ansible_host }}:80" + tls: "no" + - ip: "192.168.10.10:443" + tls: "yes" backends: - name: "{{ k8s_backend_name }}" frontend: "{{ k8s_frontend_name }}" From 57ecfe1c42e7092dbcc7ba005a593e6c58ace13e Mon Sep 17 00:00:00 2001 From: safouenebg Date: Tue, 4 Jun 2024 08:13:21 +0000 Subject: [PATCH 14/14] haproxy_config_vars --- group_vars/safouene | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/group_vars/safouene b/group_vars/safouene index dc9804b..8f29cc6 100644 --- a/group_vars/safouene +++ b/group_vars/safouene @@ -20,12 +20,13 @@ haproxy: mode: tcp haproxy_ips: - ip: "{{ hostvars[inventory_hostname].ansible_host }}:80" - tls: "no" - - ip: "192.168.10.10:443" - tls: "yes" + tls: no + - ip: "{{ hostvars[inventory_hostname].ansible_host }}:443" + tls: yes + backends: - name: "{{ k8s_backend_name }}" - frontend: "{{ k8s_frontend_name }}" + frontend: "safouene-felcloud.io" mode: tcp servers: - "server {{ groups[group][0] }} {{ hostvars[groups[group][0]].ansible_host }}:{{ NodePort }} check"