Skip to content

Commit ca66634

Browse files
author
Henry Mollman
committed
Merge remote-tracking branch 'origin/master' into 5-2-update-dock-init-and-charon
2 parents 9447bef + 1862b6c commit ca66634

384 files changed

Lines changed: 10659 additions & 3702 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ca.srl
1010
.DS_Store
1111
ansible/roles/hipache/templates/runnable*
1212
ansible/certs/*
13+
ansible/k8/**/configMaps/*cert*
1314
*.retry
1415
*.tfstate*
1516
terraform/credentials.tfvars

‎PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
We should treat our k8 files as compiled files, since we don't actually (http://blog.andrewray.me/dealing-with-compiled-files-in-git/). We should probably wait some time until we actually have more confidence in our compilation.
2+
13
[//]: # (Let's get your best description here about what's happend! Here's a list as well, if you like:)
24

35
* I removed this function

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ It is the custom at Runnable to play a song to the entire team when deploying. F
143143
| sauron | [Sauron theme song from LOTR](https://www.youtube.com/watch?v=V_rk9VBrXMY) |
144144
| Security Groups | [Out of the Woods - Tayor Swift](https://www.youtube.com/watch?v=JLf9q36UsBk)
145145
| shiva | [FFXIV Shiva Theme](https://www.youtube.com/watch?v=noJiH8HLZw4) |
146+
| starlord | [Blue Swede - Hooked on a Feeling](https://www.youtube.com/watch?v=NrI-UBIB8Jk) |
146147
| swarm-deamon | [Pink Floyd - Another Brick In The Wall](https://www.youtube.com/watch?v=5IpYOF4Hi6Q) |
147148
| swarm-manager | [Eric Prydz VS Pink Floyd - 'Proper Education'](https://www.youtube.com/watch?v=IttkDYE33aU) |
148149
| varnish | [Karate Kid Theme Song](https://www.youtube.com/watch?v=VIYqtkdMxQg) |

‎ansible/agreeable-egret.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
- hosts: redis
32
- hosts: agreeable-egret
43
vars_files:
54
- group_vars/alpha-agreeable-egret.yml
65
roles:
76
- role: notify
8-
tags: [ notify ]
7+
98
- role: builder
10-
tags: [ build ]
11-
- role: container_kill_start
9+
10+
- role: k8-deployment
11+
- role: k8-service

‎ansible/api-core.yml‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
11
---
2-
- hosts: mongodb
3-
- hosts: clio
4-
- hosts: navi
5-
- hosts: rabbitmq
6-
- hosts: redis
7-
- hosts: big-poppa
8-
- hosts: cream
9-
- hosts: swarm-manager
10-
- hosts: consul
11-
122
- hosts: api
133
vars_files:
144
- group_vars/alpha-api-base.yml
155
- group_vars/alpha-api.yml
166
roles:
177
- role: notify
18-
rollbar_token: "{{ api_rollbar_key }}"
19-
tags: [ notify ]
8+
rollbar_token: "{{ api_rollbar_token }}"
209

2110
- role: builder
22-
tags: [ build ]
2311

2412
- role: docker_client
25-
26-
- role: datadog
27-
tags: [ datadog ]
28-
29-
- role: container_start
30-
number_of_containers: "{{ ansible_processor_cores }}"
13+
- role: k8-deployment
14+
- role: k8-service

‎ansible/arithmancy.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
---
2-
- hosts: rabbitmq
3-
- hosts: consul
4-
52
- hosts: arithmancy
63
vars_files:
74
- group_vars/alpha-arithmancy.yml
85
roles:
96
- role: notify
107
rollbar_token: "{{ arithmancy_rollbar_token }}"
11-
tags: [ notify ]
12-
- { role: builder, tags: [build] }
13-
- { role: container_kill_start }
8+
9+
- role: builder
10+
11+
- role: k8-deployment

‎ansible/bastion.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
- hosts: consul
3-
42
- hosts: bastion
53
roles:
64
- role: notify

‎ansible/big-poppa-http.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
---
2-
- hosts: rabbitmq
3-
- hosts: consul
4-
- hosts: mongodb
5-
- hosts: github-varnish
6-
72
- hosts: big-poppa
83
vars_files:
4+
- group_vars/alpha-big-poppa-base.yml
95
- group_vars/alpha-big-poppa-http.yml
106
roles:
117
- role: notify
128
rollbar_token: "{{ big_poppa_http_rollbar_token }}"
13-
tags: [ notify ]
14-
- { role: builder, tags: [ build ] }
15-
- { role: container_kill_start }
9+
10+
- role: builder
11+
12+
- role: k8-deployment
13+
- role: k8-service

‎ansible/big-poppa-worker.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
---
2-
- hosts: rabbitmq
3-
- hosts: consul
4-
- hosts: mongodb
5-
- hosts: github-varnish
6-
72
- hosts: big-poppa
83
vars_files:
4+
- group_vars/alpha-big-poppa-base.yml
95
- group_vars/alpha-big-poppa-worker.yml
106
roles:
117
- role: notify
128
rollbar_token: "{{ big_poppa_worker_rollbar_token }}"
13-
tags: [ notify ]
14-
- { role: builder, tags: [ build ] }
15-
- { role: container_kill_start }
9+
10+
- role: builder
11+
12+
- role: k8-deployment

‎ansible/charon.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
---
2-
- hosts: redis
3-
- hosts: consul
4-
52
- hosts: "{{ dock | default('docks') }}"
63
vars_files:
74
- group_vars/alpha-charon.yml

0 commit comments

Comments
 (0)