Merge pull request #500 from wireapp/release_2021_08_27

Release_2021_08_27

CHANGELOG.md

@@ -13,6 +13,18 @@
 -->
 
 
+# 2021-08-27
+
+## Fixes
+
+* [Documentation] Fix offline deploy redis installation instructions, and SFT node tagging.
+* [Wire-Server-Metrics] Fix spacing.
+
+## Features
+
+* [Operations] Add a custom terraform rule to the base Makefile, to improve deployment flexibility with terraform.
+
+
 # 2021-06-16
 
 ## Fixes

Makefile

@@ -24,6 +24,15 @@ endif
 export TF_DATA_DIR = $(ENV_DIR)/.terraform
 TERRAFORM_WORKING_DIR = $(MKFILE_DIR)/terraform/environment
 
+# Since the variable directory and the terraform working directory are not the
+# same using a file custom.tf allows specifying additional terraform
+# instructions not (yet) covered by the terraform/environment functionality.  A
+# symlink is created before terraform init/apply/etc if such a file exists,
+# otherwise it is removed (in case it was created during a previous Makefile
+# invocation with a different ENV_DIR
+.PHONY: custom-terraform
+custom-terraform:
+	if [ -f $(ENV_DIR)/custom.tf ]; then ln -sf $(ENV_DIR)/custom.tf $(TERRAFORM_WORKING_DIR)/custom.tf; else rm -f $(TERRAFORM_WORKING_DIR)/custom.tf; fi
 
 # NOTE: leverage make's ability to noop if target already exists, but
 #       this also means that re-init must be triggered explicitly
@@ -32,11 +41,11 @@ $(TF_DATA_DIR):
 	&& terraform init -backend-config=$(ENV_DIR)/backend.tfvars
 
 .PHONY: re-init
-re-init: check-inputs-terraform
+re-init: check-inputs-terraform custom-terraform
 	make --always-make $(TF_DATA_DIR)
 
 .PHONY: apply plan console destroy
-apply plan console destroy: check-inputs-terraform $(TF_DATA_DIR)
+apply plan console destroy: check-inputs-terraform custom-terraform $(TF_DATA_DIR)
 	cd $(TERRAFORM_WORKING_DIR) \
 	&& source $(ENV_DIR)/hcloud-token.dec \
 	&& terraform $(@) -var-file=$(ENV_DIR)/terraform.tfvars

ansible/inventory/offline/99-static

@@ -72,6 +72,9 @@
 # Uncomment and set to the true public IP if you are behind 1:1 NAT
 # restund_peer_udp_advertise_addr = a.b.c.d
 
+# Explicitely specify the restund user id to be "root" to override the default of "997"
+restund_uid = root
+
 # For the following groups, add all nodes defined above to the sections below.
 # Define any additional variables that should be set for these nodes.
 

offline/ci.sh

@@ -96,7 +96,7 @@ helm repo add wire https://s3-eu-west-1.amazonaws.com/public.wire.com/charts
 helm repo update
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
-wire_version="2.106.0"
+wire_version="2.113.0"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

offline/docs.md

@@ -60,6 +60,8 @@ ansible 2.9.12
 
 ```
 
+## Artifacts provided in the deployment tarball.
+
 The following artifacts are provided:
 
  - `containers-adminhost/wire-server-deploy-*.tar`
@@ -245,11 +247,17 @@ d helm install elasticsearch-external ./charts/elasticsearch-external --values .
 d helm install minio-external ./charts/minio-external --values ./values/minio-external/values.yaml
 ```
 
+Also copy the values file for `databases-ephemeral` as it is required for the next step:
+
+```
+cp values/databases-ephemeral/prod-values.example.yaml values/databases-ephemeral/values.yaml'
+```
+
 Next, we have 4 services that need to be deployed but need no additional configuration:
 ```
 d helm install fake-aws ./charts/fake-aws --values ./values/fake-aws/prod-values.example.yaml
 d helm install demo-smtp ./charts/demo-smtp --values ./values/demo-smtp/prod-values.example.yaml
-d helm install redis-ephemeral ./charts/redis-ephemeral
+d helm install databases-ephemeral ./charts/databases-ephemeral/ --values ./values/databases-ephemeral/values.yaml
 d helm install reaper ./charts/reaper
 ```
 

values/wire-server-metrics/demo-values.example.yaml

@@ -4,10 +4,11 @@
 #   grafana:
 #     persistence:
 #       enabled: false
-# prometheusSpec:
-#   storageSpec: null
-# alertmanager:
-#   alertmanagerSpec:
+#   prometheus:
+#     prometheusSpec:
+#       storageSpec: null
+#   alertmanager:
+#     alertmanagerSpec:
 #       storage: null
 
 
@@ -17,14 +18,15 @@
 #   grafana:
 #     persistence:
 #       storageClassName: "<my-storage-class>"
-# prometheusSpec:
-#   storageSpec: 
-#     volumeClaimTemplate:
-#       spec:
-#         storageClassName: "<my-storage-class>"
-# alertmanager:
-#   alertmanagerSpec:
-#     storage:
-#       volumeClaimTemplate:
-#         spec:
-#           storageClassName: "<my-storage-class>"
+#   prometheus:
+#     prometheusSpec:
+#       storageSpec: 
+#         volumeClaimTemplate:
+#           spec:
+#             storageClassName: "<my-storage-class>"
+#   alertmanager:
+#     alertmanagerSpec:
+#       storage:
+#         volumeClaimTemplate:
+#           spec:
+#             storageClassName: "<my-storage-class>"