Merge branch 'master' into rename-all-files-to-yml

Author: thejsj

ansible/delta-hosts/hosts

@@ -2,7 +2,7 @@
 delta-bastion
 
 [navi-port-router]
-delta-userland
+delta-navi-port-router
 
 [navi-proxy]
 localhost

ansible/delta-hosts/variables

@@ -41,7 +41,7 @@ big_poppa_mongo_database=delta
 big_poppa_mongo_replset_name=delta-rs0
 big_poppa_new_relic_app_name=delta-big-poppa
 big_poppa_pg_host=delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:{{ pg_port }}
-big_poppa_pg_pass=189a4a90-60d9-11e6-92c9-7b1a5b7c8417
+big_poppa_pg_pass=27eed36a27a54ffd
 big_poppa_pg_user=cwallace
 big_poppa_worker_rollbar_token=98cabb8440024e3a8242cf3220b802c9:5432
 

ansible/dock.yml

@@ -9,7 +9,7 @@
       name={{ dock }}
       groups=dock
 
-- include: image-builder.yml git_branch="v4.4.0"
+- include: image-builder.yml git_branch="v4.5.0"
 
 - hosts: "{{ dock }}"
   tasks:
@@ -25,6 +25,6 @@
   - { role: install-ssm }
   - { role: dock-images }
 
-- include: charon.yml git_branch="v5.0.1"
-- include: dock-init.yml git_branch="v10.1.2"
+- include: charon.yml git_branch="v5.0.3"
+- include: dock-init.yml git_branch="v10.1.4"
 - include: krain.yml git_branch="v0.3.1"

ansible/gamma-hosts/hosts

@@ -138,6 +138,9 @@ localhost
 [kartographer]
 localhost
 
+[user-local]
+localhost
+
 [navi-port-router]
 gamma-userland
 

ansible/group_vars/alpha-api-base.yml

@@ -119,4 +119,4 @@ api_base_container_envs:
   - name: INTERCOM_API_KEY
     value: "{{ api_intercom_api_key | default('ansible_undefined') }}"
   - name: USER_VAULT_ENDPOINT
-    value: "http://{{ user_vault_host_address }}:{{ user_vault_port }}"
+    value: "http://{{ user_vault_load_balancer }}:{{ user_vault_port }}"

ansible/k8/delta/big-poppa-http/deployments/big-poppa-http

@@ -45,15 +45,15 @@ spec:
             - name: PGUSER
               value: "cwallace"
             - name: PGPASSWORD
-              value: "189a4a90-60d9-11e6-92c9-7b1a5b7c8417"
+              value: "27eed36a27a54ffd"
             - name: PGHOST
               value: "delta-infradb.cnksgdqarobf.us-west-2.rds.amazonaws.com"
             - name: PGPORT
               value: "5432"
             - name: PGDATABASE
               value: "big_poppa"
             - name: POSTGRES_CONNECT_STRING
-              value: "postgres://cwallace:189a4a90-60d9-11e6-92c9-7b1a5b7c8417@delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:5432/big_poppa"
+              value: "postgres://cwallace:27eed36a27a54ffd@delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:5432/big_poppa"
             - name: RABBITMQ_HOSTNAME
               value: "10.8.4.195"
             - name: RABBITMQ_PASSWORD

ansible/k8/delta/big-poppa-worker/deployments/big-poppa-worker

@@ -45,15 +45,15 @@ spec:
             - name: PGUSER
               value: "cwallace"
             - name: PGPASSWORD
-              value: "189a4a90-60d9-11e6-92c9-7b1a5b7c8417"
+              value: "27eed36a27a54ffd"
             - name: PGHOST
               value: "delta-infradb.cnksgdqarobf.us-west-2.rds.amazonaws.com"
             - name: PGPORT
               value: "5432"
             - name: PGDATABASE
               value: "big_poppa"
             - name: POSTGRES_CONNECT_STRING
-              value: "postgres://cwallace:189a4a90-60d9-11e6-92c9-7b1a5b7c8417@delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:5432/big_poppa"
+              value: "postgres://cwallace:27eed36a27a54ffd@delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:5432/big_poppa"
             - name: RABBITMQ_HOSTNAME
               value: "10.8.4.195"
             - name: RABBITMQ_PASSWORD

ansible/k8/delta/palantiri/deployments/palantiri

@@ -13,7 +13,7 @@ spec:
         - name: runnable-kubernetes-pull-secret
       hostname: palantiri
       containers:
-        - image: quay.io/runnable/palantiri:v2.4.6
+        - image: quay.io/runnable/palantiri:v2.4.8
           imagePullPolicy: Always
           name: palantiri
           resources:

ansible/k8/delta/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter

@@ -4,6 +4,7 @@ metadata:
   name: swarm-cloudwatch-reporter
 spec:
   schedule: "*/5 * * * *"
+  concurrencyPolicy: Replace
   jobTemplate:
     spec:
       template:

ansible/k8/gamma/swarm-cloudwatch-reporter/crons/swarm-cloudwatch-reporter

@@ -4,6 +4,7 @@ metadata:
   name: swarm-cloudwatch-reporter
 spec:
   schedule: "*/5 * * * *"
+  concurrencyPolicy: Replace
   jobTemplate:
     spec:
       template: