Merge pull request #281 from wireapp/release_2020_06_03

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2020-06-03
+
+## Features
+
+- Add .elasticsearch.additionalWriteIndex to brig config (#277)
+- Upgrade restund to include fix from wireapp/restund#3 (#278)
+
+## Internal Changes
+
+- TF modules: Ensure uniqueness of cargohold bucket name (#272)
+
 # 2020-05-25
 
 - Fix typo in default galley helm values: teamSearchVisibility (#271)

ansible/requirements.yml

@@ -37,7 +37,7 @@
 
 - src: git+https://github.com/wireapp/ansible-restund.git
   name: ansible-restund
-  version: v0.1.4
+  version: v0.1.5
 
 - src: git+https://github.com/wireapp/ansible-tinc.git
   name: ansible-tinc

charts/brig/templates/configmap.yaml

@@ -28,6 +28,9 @@ data:
     elasticsearch:
       url: http://{{ .elasticsearch.host }}:{{ .elasticsearch.port }}
       index: {{ .elasticsearch.index }}
+      {{- if .elasticsearch.additionalWriteIndex }}
+      additionalWriteIndex: {{ .elasticsearch.additionalWriteIndex }}
+      {{- end }}
 
     cargohold:
       host: cargohold

terraform/modules/aws-cargohold-asset-storage/resources.s3.tf

@@ -1,5 +1,18 @@
 resource "aws_s3_bucket" "asset_storage" {
-  bucket = "${var.environment}-${var.bucket_name}"
+  bucket = "${random_string.bucket.keepers.env}-${random_string.bucket.keepers.name}-cargohold-${random_string.bucket.result}"
   acl    = "private"
   region = var.region
 }
+
+resource "random_string" "bucket" {
+  length = 8
+  lower = true
+  upper = false
+  number = true
+  special = false
+
+  keepers = {
+    env = var.environment
+    name = var.bucket_name
+  }
+}