Skip to content

Commit 519f4bc

Browse files
San 6253 navi k8 (#652)
* update delta navi to point to its mongo * fix datadog
1 parent 50e1644 commit 519f4bc

7 files changed

Lines changed: 12 additions & 5 deletions

File tree

ansible/delta-hosts/variables

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ github_protocol=https
173173
is_github_enterprise=false
174174
mongo_hosts=10.8.4.216:27017,10.8.10.254:27017,10.8.13.89:27017
175175
mongo_port=27017
176-
navi_mongo=mongo
176+
navi_mongo=10.8.6.41
177177
new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
178178
node_env=production-delta
179179
pg_host=delta-infradb.cnksgdqarobf.us-west-2.rds.amazonaws.com

ansible/group_vars/alpha-datadog.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ container_envs:
1111
- name: API_KEY
1212
value: "{{ datadog_api_key }}"
1313

14-
container_run_args: ''
14+
advance_arg: true
15+
container_run_args: "sed -i -e \\\"s/^# tags:.*$/tags: ${TAGS}/\\\" /etc/dd-agent/datadog.conf && supervisord -n -c /etc/dd-agent/supervisor.conf"

ansible/k8/delta/datadog/deployments/datadog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ spec:
2222
limits:
2323
cpu: "1550m"
2424
memory: 1500M
25+
args:
26+
- bash
27+
- -c
28+
- "sed -i -e \"s/^# tags:.*$/tags: ${TAGS}/\" /etc/dd-agent/datadog.conf && supervisord -n -c /etc/dd-agent/supervisor.conf"
2529
env:
2630
- name: TAGS
2731
value: "env:production-delta"

ansible/k8/delta/link/deployments/link

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
- name: HELLO_RUNNABLE_GITHUB_TOKEN
3636
value: "5d8f7029d3d6941b0fc62a7eb8c605d8e0bc7c29"
3737
- name: MONGO
38-
value: "mongodb://mongo/navi"
38+
value: "mongodb://10.8.6.41/navi"
3939
- name: NODE_ENV
4040
value: "production-delta"
4141
- name: RABBITMQ_HOSTNAME

ansible/k8/delta/navi/deployments/navi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
- name: LOG_LEVEL_STDOUT
4646
value: "trace"
4747
- name: MONGO
48-
value: "mongodb://mongo/navi"
48+
value: "mongodb://10.8.6.41/navi"
4949
- name: NODE_ENV
5050
value: "production-delta"
5151
- name: RABBITMQ_HOSTNAME

ansible/roles/builder/tasks/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
- name: login to registry
177177
delegate_to: "{{ builder }}"
178178
tags: deploy, build
179+
when: build_image
179180
become: yes
180181
command: docker login -u {{ registry_username }} -p {{ registry_token }} -e "info@runnable.com" {{ registry_host }}
181182

@@ -189,5 +190,6 @@
189190
- name: logout of registry
190191
delegate_to: "{{ builder }}"
191192
tags: deploy, build
193+
when: build_image
192194
become: yes
193195
command: docker logout

ansible/roles/k8-deployment/templates/deployment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
{% if advance_arg is defined and advance_arg == true %}
3535
- bash
3636
- -c
37-
- {{ container_run_args }}
37+
- "{{ container_run_args }}"
3838
{% else %}
3939
{% for arg in container_run_args.split(' ') %}
4040
- {{ arg }}

0 commit comments

Comments
 (0)