Skip to content

Commit ba22cc4

Browse files
thejsjthejsj
authored
Merge branch 'master' into fix-image-builder-push
2 parents c580845 + a44b903 commit ba22cc4

19 files changed

Lines changed: 182 additions & 37 deletions

File tree

‎ansible/delta-hosts/hosts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ localhost
7777
[link]
7878
localhost
7979

80+
[keymaker]
81+
localhost
82+
8083
[khronos]
8184
localhost
8285

‎ansible/delta-hosts/variables‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ eru_mongodb_replset=delta-rs0
8484
eru_mongodb_username=eru
8585
eru_subdomain=eru
8686

87+
[keymaker:vars]
88+
keymaker_pg_host=delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:{{ pg_port }}
89+
keymaker_pg_pass=8MsajH7RQuJ+fTCh
90+
keymaker_pg_user=keymaker
91+
keymaker_new_relic_app_name=delta-keymaker
92+
8793
[khronos:vars]
8894
khronos_intercom_api_key=14771f14efb617900724a16345e57beb55ba9beb
8995
khronos_intercom_app_id=wqzm3rju
@@ -172,6 +178,7 @@ cream_stripe_publishable_key=pk_live_5yYYZlYIwY3LwvKFaXY0jNlm
172178
datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
173179
datadog_mongodb_user=datadog
174180
datadog_tags=env:delta
181+
dock_vault_user_creation_access_token=ddf20c34-019c-5b24-9c0d-1b44e3edf29a
175182
domain=runnable.io
176183
env=delta
177184
github_domain=api.github.com
@@ -187,18 +194,18 @@ pg_pass=59a5524e-a772-11e5-bedc-1bdc0db458b3
187194
pg_port=5432
188195
rabbit_host_address=10.8.4.195
189196
rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
197+
rabbit_port=54321
190198
rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
191199
redis_host_address=10.8.4.9
200+
registry_token=4PX2AU9QIJSCDLZEXILYX6ZP2RCXY1HR10WVZKWVR0JW8DS5IIY87D96V0RACMK5
201+
registry_username=runnable+deltapush
192202
secrets_path=delta-hosts/secrets
193203
user_content_domain=runnableapp.com
204+
user_vault_load_balancer=ab5d35e6f344211e797770ac76ff2aaa-2031464484.us-west-2.elb.amazonaws.com
194205
vault_auth_token=578c9767-5af8-8490-0954-5d330f27b088
195206
vault_token_01=0d324dc7d4cbd94790fd08809d06fb1e28e21e185910081c7646e3e49924f6ed01
196207
vault_token_02=42dc8a69df174e77eb47a63b6ef4709bec57101cb1bff11a71c91b73b8bc046102
197208
vault_token_03=47f3cb74f5374fa3c51c90fd25e3d4cc851034de97584995fce5fc5382342f1f03
198-
rabbit_port=54321
199-
registry_username=runnable+deltapush
200-
registry_token=4PX2AU9QIJSCDLZEXILYX6ZP2RCXY1HR10WVZKWVR0JW8DS5IIY87D96V0RACMK5
201-
dock_vault_user_creation_access_token=ddf20c34-019c-5b24-9c0d-1b44e3edf29a
202209

203210
[web:vars]
204211
web_intercom_id=wqzm3rju

‎ansible/gamma-hosts/hosts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ localhost
7171
[charon]
7272
localhost
7373

74+
[keymaker]
75+
localhost
76+
7477
[khronos]
7578
localhost
7679

‎ansible/gamma-hosts/variables‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ eru_subdomain=eru
8383
[kartographer:vars]
8484
kartographer_hello_runnable_github_token=000cb6b65858ad0a7590bc2370b5118ff1bc95db
8585

86+
[keymaker:vars]
87+
keymaker_pg_host=gamma-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:32659
88+
keymaker_pg_pass=n4CsuCiWgbx.2BVJ
89+
keymaker_pg_user=keymaker
90+
8691
[khronos:vars]
8792
khronos_intercom_api_key=9b4ee7b4f9818b36e368985fda0befa611928876
8893
khronos_intercom_app_id=xs5g95pd
@@ -156,6 +161,7 @@ cream_stripe_publishable_key=pk_test_sHr5tQaPtgwiE2cpW6dQkzi8
156161
datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
157162
datadog_mongodb_user=datadog
158163
datadog_tags=env:gamma
164+
dock_vault_user_creation_access_token=137f441f-db71-40a2-8448-10a565323b1e
159165
domain=runnable-gamma.com
160166
env=gamma
161167
github_domain=api.github.com
@@ -171,15 +177,15 @@ pg_port=32659
171177
rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
172178
rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
173179
redis_host_address=10.4.6.45
180+
registry_token=8G0NT1HZQZHYXU7OB1QAI8HA1560V6R68DE6R6B8YJWQAED82JAFCD057ZWIDT76
181+
registry_username=runnable+gamma
174182
secrets_path=gamma-hosts/secrets
175183
user_content_domain=runnablecloud.com
184+
user_vault_load_balancer=aa8364af12f5a11e7bb9e02301ded9ea-905956029.us-west-2.elb.amazonaws.com
176185
vault_auth_token=f9a39e92-99f3-66a0-a27d-a6e07717d30d
177186
vault_token_01=2c0be2adf99931bc9ed443000e87bbcd0ef096dddc79f6add97ebe8fa7e93d2c05
178187
vault_token_02=3489b87c913058740537bbbd4503f3720d74f7cb0f4e0c30a9436e1e52a18d7003
179188
vault_token_03=ac4e1e9800cbf77283298d08172a2f0e46d0b7cbc457c47788d04768af12584a02
180-
registry_username=runnable+gamma
181-
registry_token=8G0NT1HZQZHYXU7OB1QAI8HA1560V6R68DE6R6B8YJWQAED82JAFCD057ZWIDT76
182-
dock_vault_user_creation_access_token=137f441f-db71-40a2-8448-10a565323b1e
183189

184190
[web:vars]
185191
web_intercom_id=xs5g95pd

‎ansible/group_vars/all.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@ github_varnish_port: 80
145145
# kartographer
146146
kartographer_rollbar_token: a7f85fda20bd4b9fb7b1197fc04d3c89
147147

148+
# keymaker
149+
keymaker_pg_database: keymaker
150+
keymaker_port: 3008
151+
keymaker_host_address: keymaker
152+
keymaker_http_rollbar_token: 4cfd134be18b4f1ca8e05925088360ff
153+
keymaker_worker_rollbar_token: b6685a5db05d4550afe1c8545c095b29
154+
148155
# khronos
149156
rollbar_khronos_token: 5a140828cce14410812d34a3ef936f25
150157

‎ansible/group_vars/alpha-keymaker-base.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
node_version: 6.10.2
2+
3+
inject_ca: false
4+
repo: "git@github.com:CodeNow/keymaker.git"
5+
6+
keymaker_base_container_envs:
7+
- name: DATADOG_HOST
8+
valueFrom: "spec.nodeName"
9+
- name: DATADOG_PORT
10+
value: "{{ datadog_port }}"
11+
- name: NODE_ENV
12+
value: "{{ node_env }}"
13+
- name: POSTGRES_CONNECT_STRING
14+
value: "postgres://{{ keymaker_pg_user }}:{{ keymaker_pg_pass }}@{{ keymaker_pg_host }}/{{ keymaker_pg_database }}"
15+
- name: RABBITMQ_HOSTNAME
16+
value: "{{ rabbit_host_address }}"
17+
- name: RABBITMQ_PASSWORD
18+
value: "{{ rabbit_password }}"
19+
- name: RABBITMQ_PORT
20+
value: "{{ rabbit_port }}"
21+
- name: RABBITMQ_USERNAME
22+
value: "{{ rabbit_username }}"
23+
- name: GITHUB_VARNISH_HOST
24+
value: "{{ github_varnish_host }}"
25+
- name: GITHUB_VARNISH_PORT
26+
value: "{{ github_varnish_port }}"
27+
- name: GITHUB_PROTOCOL
28+
value: "http"
29+
- name: NEW_RELIC_APP_NAME
30+
value: "{{ keymaker_new_relic_app_name | default('ansible_undefined') }}"
31+
- name: NEW_RELIC_LICENSE_KEY
32+
value: "{{ new_relic_license_key | default('ansible_undefined') }}"
33+
- name: NEW_RELIC_LOG_LEVEL
34+
value: "fatal"
35+
- name: NEW_RELIC_NO_CONFIG_FILE
36+
value: "true"

‎ansible/group_vars/alpha-keymaker-http.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: keymaker-http
2+
service_name: keymaker
3+
4+
hosted_ports: ["{{ keymaker_port }}"]
5+
6+
envs:
7+
- name: PORT
8+
value: "{{ keymaker_port }}"
9+
- name: ROLLBAR_KEY
10+
value: "{{ keymaker_http_rollbar_token }}"
11+
12+
container_envs: "{{ keymaker_base_container_envs + envs }}"
13+
14+
container_run_args: npm run start-http

‎ansible/group_vars/alpha-keymaker-worker.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: keymaker-worker
2+
3+
envs:
4+
- name: ROLLBAR_KEY
5+
value: "{{ big_poppa_worker_rollbar_token }}"
6+
7+
container_envs: "{{ keymaker_base_container_envs + envs }}"
8+
9+
container_run_args: npm run start-worker
10+

‎ansible/group_vars/alpha-user-vault.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ container_image: vault
44
container_tag: 0.7.0
55
hosted_ports: ["{{ user_vault_port }}"]
66

7+
service_type: "LoadBalancer"
8+
79
volume_mounts:
810
- name: "{{ name }}"
911
path: /config

‎ansible/k8/delta/api-socket-server/deployments/api-socket-server‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
- name: runnable-kubernetes-pull-secret
1414
hostname: api-socket-server
1515
containers:
16-
- image: quay.io/runnable/api:v11.39.2
16+
- image: quay.io/runnable/api:v11.41.2
1717
imagePullPolicy: Always
1818
name: api-socket-server
1919
resources:

0 commit comments

Comments
 (0)