Skip to content

Commit 405c7b4

Browse files
committed
Merge branch 'ci_observer_deployment_with_TF' into 'master'
Ci observer deployment with tf See merge request postgres-ai/database-lab!297
2 parents dd10262 + d7e98ed commit 405c7b4

File tree

4 files changed

+72
-3
lines changed

4 files changed

+72
-3
lines changed

packer/envoy.yaml

+48-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,18 @@ static_resources:
5555
socket_address:
5656
address: 0.0.0.0
5757
port_value: 2400
58+
- name: ciobserver-api-http
59+
type: STRICT_DNS
60+
connect_timeout: 1s
61+
load_assignment:
62+
cluster_name: ciobserver-api-http
63+
endpoints:
64+
- lb_endpoints:
65+
- endpoint:
66+
address:
67+
socket_address:
68+
address: 0.0.0.0
69+
port_value: 2500
5870
listeners:
5971
- name: dle_clone_9000_listener
6072
address:
@@ -164,7 +176,7 @@ static_resources:
164176
route_config:
165177
name: local_route
166178
virtual_hosts:
167-
- name: dle
179+
- name: joe
168180
domains:
169181
- "*"
170182
routes:
@@ -184,3 +196,38 @@ static_resources:
184196
filename: "/etc/envoy/certs/fullchain1.pem"
185197
private_key:
186198
filename: "/etc/envoy/certs/privkey1.pem"
199+
- address:
200+
socket_address:
201+
address: 0.0.0.0
202+
port_value: 445
203+
filter_chains:
204+
- filters:
205+
- name: envoy.filters.network.http_connection_manager
206+
typed_config:
207+
"@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
208+
codec_type: AUTO
209+
stat_prefix: ingress_http
210+
route_config:
211+
name: local_route
212+
virtual_hosts:
213+
- name: ci_observer
214+
domains:
215+
- "*"
216+
routes:
217+
- match:
218+
prefix: "/"
219+
route:
220+
cluster: ciobserver-api-http
221+
timeout: "0s"
222+
http_filters:
223+
- name: envoy.filters.http.router
224+
transport_socket:
225+
name: envoy.transport_sockets.tls
226+
typed_config:
227+
"@type": type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext
228+
common_tls_context:
229+
tls_certificates:
230+
certificate_chain:
231+
filename: "/etc/envoy/certs/fullchain1.pem"
232+
private_key:
233+
filename: "/etc/envoy/certs/privkey1.pem"

packer/install-prereqs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sudo apt-get update && sudo apt-get install -y \
1616
gnupg2 \
1717
zfsutils-linux
1818

19-
sudo docker pull postgresai/dblab-server:$dle_version
19+
#sudo docker pull postgresai/dblab-server:$dle_version
2020

2121
#install postgres client
2222
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -

packer/run_ci.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
app:
2+
host: ""
3+
port: 2500
4+
debug: true
5+
verificationToken: "secret_token"
6+
dle:
7+
url: "https://dblab_server"
8+
verificationToken: "dle_cerification_token"
9+
platform:
10+
url: "https://postgres.ai/api/general"
11+
accessToken: "platform_access_token"
12+
enablePersonalTokens: true
13+
source:
14+
type: "github"
15+
token: "vcs_secret_token"
16+
runner:
17+
image: "postgresai/migration-tools:sqitch"

packer/template.json.pkr.hcl

+6-1
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,14 @@ build {
5050
destination = "/home/ubuntu/joe.yml"
5151
}
5252

53+
provisioner "file"{
54+
source = "run_ci.yaml"
55+
destination = "/home/ubuntu/run_ci.yaml"
56+
}
57+
5358
provisioner "shell" {
5459
environment_vars = ["dle_version=${var.dle_version}"]
55-
scripts = ["${path.root}/install-prereqs.sh", "${path.root}/install-dblabcli.sh","${path.root}/install-envoy.sh"]
60+
scripts = ["${path.root}/install-prereqs.sh", "${path.root}/install-envoy.sh"]
5661
}
5762

5863
}

0 commit comments

Comments
 (0)