Skip to content

Commit d574d75

Browse files
committed
Merge branch 'fix-envoy-config' into 'main'
Add typed_config to http_filters (envoy); Increase connect_timeout; update certbot See merge request postgres-ai/dle-se-ansible!56
2 parents c9a3180 + 7df23b2 commit d574d75

File tree

10 files changed

+26
-6
lines changed

10 files changed

+26
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The HowTo guide can be found here: [How to install DBLab Engine using the Postgr
99
- You will need the `Org key` and `Project name` from the [Postgres.ai platform](https://console.postgres.ai). These are provided by the platform upon registration. You can find more details [here](https://postgres.ai/docs/how-to-guides/administration/install-dle-from-postgres-ai).
1010
- Keep in mind that without specifying these values in the `platform_org_key` and `platform_project_name` variables, the Ansible Playbook will not be executed.
1111
- For deployment on an existing server:
12-
- Debian 11, 12, or Ubuntu 22.04, 24.04
12+
- Ubuntu 22.04
1313
- Root privileges or sudo access
1414
- Data storage disk (which is larger than the size of the database)
1515
- For deployment in one of the supported clouds:

molecule/default/prepare.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
- name: "Install netaddr dependency on controlling host"
2424
ansible.builtin.pip:
2525
name: netaddr
26+
environment:
27+
PIP_BREAK_SYSTEM_PACKAGES: "1"
2628
become: false
2729

2830
...

roles/cloud-resources/tasks/aws.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
ansible.builtin.pip:
1919
name: boto3
2020
extra_args: --user
21+
environment:
22+
PIP_BREAK_SYSTEM_PACKAGES: "1"
2123
delegate_to: 127.0.0.1
2224
become: false
2325
vars:

roles/cloud-resources/tasks/azure.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
executable: pip3
4040
extra_args: "--trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org"
4141
umask: "0022"
42+
environment:
43+
PIP_BREAK_SYSTEM_PACKAGES: "1"
4244
delegate_to: 127.0.0.1
4345
become: false
4446
run_once: true

roles/cloud-resources/tasks/digitalocean.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
ansible.builtin.pip:
1919
name: dopy
2020
extra_args: --user
21+
environment:
22+
PIP_BREAK_SYSTEM_PACKAGES: "1"
2123
delegate_to: 127.0.0.1
2224
become: false
2325
vars:

roles/cloud-resources/tasks/gcp.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
ansible.builtin.pip:
1919
name: google-auth
2020
extra_args: --user
21+
environment:
22+
PIP_BREAK_SYSTEM_PACKAGES: "1"
2123
delegate_to: 127.0.0.1
2224
become: false
2325
vars:

roles/cloud-resources/tasks/hetzner.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
ansible.builtin.pip:
1919
name: hcloud
2020
extra_args: --user
21+
environment:
22+
PIP_BREAK_SYSTEM_PACKAGES: "1"
2123
delegate_to: 127.0.0.1
2224
become: false
2325
vars:

roles/packages/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
executable: pip3
4444
extra_args: "--trusted-host=pypi.python.org --trusted-host=pypi.org --trusted-host=files.pythonhosted.org"
4545
umask: "0022"
46+
environment:
47+
PIP_BREAK_SYSTEM_PACKAGES: "1"
4648

4749
- name: Set certbot_script variable
4850
ansible.builtin.set_fact:

roles/proxy/templates/envoy.yaml.j2

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ static_resources:
1111
clusters:
1212
{% for i in range(dblab_engine_clone_port_pool.from, dblab_engine_clone_port_pool.to + 1) %}
1313
- name: dblab_clone_{{ i }}
14-
connect_timeout: 1s
14+
connect_timeout: 5s
1515
type: STRICT_DNS
1616
load_assignment:
1717
cluster_name: dblab_clone_{{ i }}
@@ -25,7 +25,7 @@ static_resources:
2525
{% endfor %}
2626
- name: dblab-engine-ui-http
2727
type: STRICT_DNS
28-
connect_timeout: 1s
28+
connect_timeout: 5s
2929
load_assignment:
3030
cluster_name: dblab-engine-ui-http
3131
endpoints:
@@ -37,7 +37,7 @@ static_resources:
3737
port_value: {{ dblab_engine_ui_port }}
3838
- name: joe-api-http
3939
type: STRICT_DNS
40-
connect_timeout: 1s
40+
connect_timeout: 5s
4141
load_assignment:
4242
cluster_name: joe-api-http
4343
endpoints:
@@ -49,7 +49,7 @@ static_resources:
4949
port_value: {{ joe_port }}
5050
- name: ciobserver-api-http
5151
type: STRICT_DNS
52-
connect_timeout: 1s
52+
connect_timeout: 5s
5353
load_assignment:
5454
cluster_name: ciobserver-api-http
5555
endpoints:
@@ -116,6 +116,8 @@ static_resources:
116116
cluster: dblab-engine-ui-http
117117
http_filters:
118118
- name: envoy.filters.http.router
119+
typed_config:
120+
"@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
119121
transport_socket:
120122
name: envoy.transport_sockets.tls
121123
typed_config:
@@ -150,6 +152,8 @@ static_resources:
150152
cluster: joe-api-http
151153
http_filters:
152154
- name: envoy.filters.http.router
155+
typed_config:
156+
"@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
153157
transport_socket:
154158
name: envoy.transport_sockets.tls
155159
typed_config:
@@ -185,6 +189,8 @@ static_resources:
185189
timeout: "0s"
186190
http_filters:
187191
- name: envoy.filters.http.router
192+
typed_config:
193+
"@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
188194
transport_socket:
189195
name: envoy.transport_sockets.tls
190196
typed_config:

vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ proxy_install: false # Set "true" to install Envoy proxy and issue Let's Encrypt
9090
proxy_dblab_engine_public_port: 443
9191
proxy_joe_public_port: 444
9292
certbot_install_method: pip
93-
certbot_install_version: 2.6.0
93+
certbot_install_version: 3.0.1
9494
certbot_create_if_missing: true
9595
certbot_create_method: standalone
9696
certbot_auto_renew: true

0 commit comments

Comments
 (0)