Skip to content

Commit ed6b8e8

Browse files
authored
Merge branch 'main' into reformat_drawio
2 parents daac7de + 13053ae commit ed6b8e8

26 files changed

+947
-795
lines changed

CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @wireapp/backend @wireapp/platform-engineering @wireapp/customerops

build/Pipfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ mike = "2.1.3"
1313
mkdocs-get-deps = "0.2.0"
1414
mkdocs-macros-plugin = "1.3.7"
1515
mkdocs-material-extensions = "1.3.1"
16+
mkdocs-mermaid2-plugin = "1.2.1"
1617

1718
[requires]
1819
python_version = "3.11"

build/Pipfile.lock

Lines changed: 213 additions & 246 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mkdocs.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ nav:
1313
- How to plan an installation: how-to/install/planning.md
1414
- Version requirements: how-to/install/version-requirements.md
1515
- Dependencies on operator’s machine: how-to/install/dependencies.md
16-
- How to install kubernetes (Demo): how-to/install/kubernetes.md
17-
- How to install wire-server using Helm (Demo): how-to/install/helm.md
16+
- How to install Wire in a box (Demo): how-to/install/demo-wiab.md
1817
- Introduction: how-to/install/prod-intro.md
1918
- How to install kubernetes and databases: how-to/install/ansible-VMs.md
2019
- How to configure AWS services: how-to/install/aws-prod.md
@@ -144,6 +143,7 @@ theme:
144143

145144
plugins:
146145
- search
146+
- mermaid2
147147
- minify:
148148
minify_html: true
149149
minify_js: true
@@ -179,8 +179,12 @@ markdown_extensions:
179179
- pymdownx.snippets
180180
- pymdownx.tasklist:
181181
custom_checkbox: true
182-
- pymdownx.superfences
183182
- pymdownx.tabbed
183+
- pymdownx.superfences:
184+
custom_fences:
185+
- name: mermaid
186+
class: mermaid
187+
format: !!python/name:pymdownx.superfences.fence_code_format
184188

185189
extra:
186190
version:

src/how-to/administrate/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,8 @@
9898
- [Test an ingress is working from inside the cluster](manuals.md#test-an-ingress-is-working-from-inside-the-cluster)
9999
- [Load an image into containerd in an offline/airgapped environment](manuals.md#load-an-image-into-containerd-in-an-offlineairgapped-environment)
100100

101+
## 12. Migration
102+
103+
- [Migrate team features](migrate-team-features.md)
104+
101105
<!-- TODO: .. include:: administration/redis.rst -->
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Migrate to new team features
2+
3+
Release of [wire-server-5.12](https://docs.wire.com/latest/changelog/changelog.html#2025-03-06-chart-release-5120) introduces a new data storage format for team features. To migrate to the new format, we have added a [tool](https://github.com/wireapp/helm-charts/tree/main/charts/migrate-features) called `migrate-features` to our deployment bundle, which will have to be run, after upgrading to a `wire-server` release past 5.12. Migration has to be run only once.
4+
If you do not perform this migration after deploying to a release past `5.12`, your team settings will be in an inconsistent state.
5+
6+
## Configuration
7+
8+
The values of the chart `migrate-features/values.yaml` already contains the necessary configuration options.
9+
10+
```yaml
11+
job:
12+
name: migrate-features
13+
restartPolicy: Never
14+
backoffLimit: 4
15+
cassandraHost: cassandra-external # Replace with your Cassandra service name `kubectl get svc -n default`
16+
cassandraPort: 9042
17+
galleyKeyspace: galley
18+
```
19+
20+
Most configuration values can remain as they are, but ensure the `cassandraHost` value is correct by running:
21+
22+
```sh
23+
kubectl get svc -n default` # assuming the services are in the default namespace
24+
```
25+
26+
If your cassandra installation differs from the standard `wire-server-deploy` setup, a hostname or an IP address of one of the cassandra nodes can be supplied here.
27+
28+
## Run the migration job
29+
30+
When this chart is installed, it sets up a `migrate-feature` job in the `default` namespace:
31+
32+
```sh
33+
helm install default ./charts/migrate-features
34+
```
35+
36+
Before running the helm command, make sure the `migrate-features` chart is available in the charts directory, if not please [download](https://github.com/wireapp/helm-charts/tree/main/charts/migrate-features) the chart or copy it from one of our latest artifact.
37+
38+
## Troubleshoot and monitoring
39+
40+
After the helm installation check if the job is running
41+
42+
```sh
43+
kubectl get jobs -n default
44+
```
45+
46+
When the job is complete, you will see a `migrate-features` job with a `COMPLETIONS` status of `1/1`. This may take some time. If the job does not complete, check the pod logs or Kubernetes events.
47+
48+
To check the pod events run:
49+
50+
```sh
51+
kubectl describe job migrate-features -n default
52+
```
53+
54+
To check the logs run:
55+
56+
```sh
57+
kubectl logs job/migrate-features -n default
58+
```
59+
60+
While the migration tool is running, team features are going to operate in read-only mode for the team that is currently being migrated. After migration, the new storage is going to be used. No other action should be required on the part of instance operators besides running the migration tool.

src/how-to/install/README.md

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,45 +13,43 @@
1313
- [Dependencies on operator’s machine](dependencies.md)
1414
- [(Alternative) Installing dependencies using Direnv and Nix](dependencies.md#alternative-installing-dependencies-using-direnv-and-nix)
1515

16-
## 4. Installing Kubernetes (Demo)
17-
- [How to install kubernetes (Demo)](kubernetes.md)
18-
- [How to set up your hosts.ini file](kubernetes.md#how-to-set-up-your-hosts-ini-file)
19-
- [Passwordless authentication](kubernetes.md#passwordless-authentication)
20-
- [Minio setup](kubernetes.md#minio-setup)
21-
- [How to install kubernetes](kubernetes.md#how-to-install-kubernetes)
22-
23-
## 5. Installing Wire-Server using Helm (Demo)
24-
- [How to install wire-server using Helm (Demo)](helm.md)
25-
- [Introduction](helm.md#introduction)
26-
- [Prerequisites](helm.md#prerequisites)
27-
- [How to start installing charts from wire](helm.md#how-to-start-installing-charts-from-wire)
28-
- [Watching changes as they happen](helm.md#watching-changes-as-they-happen)
29-
- [How to install in-memory databases and external components](helm.md#how-to-install-in-memory-databases-and-external-components)
30-
- [How to install wire-server itself](helm.md#how-to-install-wire-server-itself)
31-
32-
## 6. Introduction
16+
## 4. How to install Wire in a box (Demo)
17+
- [Demo Wire-in-a-Box Deployment Guide](demo-wiab.md)
18+
- [Introduction](demo-wiab.md#introduction)
19+
- [What will be installed?](demo-wiab.md#what-will-be-installed)
20+
- [Wire Demo installation diagram](demo-wiab.md#diagram)
21+
- [Installation Guide](demo-wiab.md#installation-guide)
22+
- [Deployment requirements](demo-wiab.md#deployment-requirements)
23+
- [Getting Started](demo-wiab.md#getting-started)
24+
- [Deployment Flow](demo-wiab.md#deployment-flow)
25+
- [General Tips](demo-wiab.md#general-tips)
26+
- [Trying Things Out](demo-wiab.md#trying-things-out)
27+
- [Troubleshooting](demo-wiab.md#troubleshooting)
28+
- [Cleaning/Uninstalling Wire-in-a-Box](demo-wiab.md#cleaninguninstalling-wire-in-a-box)
29+
30+
## 5. Introduction
3331
- [Introduction](prod-intro.md)
3432
- [What will be installed by following these parts?](prod-intro.md#what-will-be-installed-by-following-these-parts)
3533
- [What will not be installed?](prod-intro.md#what-will-not-be-installed)
3634
- [What will not be installed by default?](prod-intro.md#what-will-not-be-installed-by-default)
3735
- [Getting support](prod-intro.md#getting-support)
3836
- [Next steps for high-available production installation](prod-intro.md#next-steps-for-high-available-production-installation)
3937

40-
## 7. Installing Kubernetes and Databases
38+
## 6. Installing Kubernetes and Databases
4139
- [How to install kubernetes and databases](ansible-VMs.md)
4240
- [Introduction](ansible-VMs.md#introduction)
4341
- [Assumptions](ansible-VMs.md#assumptions)
4442
- [Preparing to run ansible](ansible-VMs.md#preparing-to-run-ansible)
4543
- [Running ansible to install software on your machines](ansible-VMs.md#running-ansible-to-install-software-on-your-machines)
4644

47-
## 8. Configuring AWS Services
45+
## 7. Configuring AWS Services
4846
- [How to configure AWS services](aws-prod.md)
4947
- [Introduction](aws-prod.md#introduction)
5048
- [Using real AWS services for SNS](aws-prod.md#using-real-aws-services-for-sns)
5149
- [Using real AWS services for SES / SQS](aws-prod.md#using-real-aws-services-for-ses-sqs)
5250
- [Using real AWS services for S3](aws-prod.md#using-real-aws-services-for-s3)
5351

54-
## 9. Installing Wire-Server using Helm
52+
## 8. Installing Wire-Server using Helm
5553
- [How to install wire-server using Helm](helm-prod.md)
5654
- [Introduction](helm-prod.md#introduction)
5755
- [Prerequisites](helm-prod.md#prerequisites)
@@ -67,7 +65,7 @@
6765
- [How to install wire-server itself](helm-prod.md#how-to-install-wire-server-itself)
6866
- [DNS records](helm-prod.md#dns-records)
6967

70-
## 10. Infrastructure Configuration
68+
## 9. Infrastructure Configuration
7169
- [Infrastructure configuration](infrastructure-configuration.md)
7270
- [Redirect some traffic through a http(s) proxy](infrastructure-configuration.md#redirect-some-traffic-through-a-http-s-proxy)
7371
- [Enable push notifications using the public appstore / playstore mobile Wire clients](infrastructure-configuration.md#enable-push-notifications-using-the-public-appstore-playstore-mobile-wire-clients)
@@ -89,11 +87,11 @@
8987
- [S3 Addressing Style](infrastructure-configuration.md#s3-addressing-style)
9088
- [I have a team larger than 500 users](infrastructure-configuration.md#i-have-a-team-larger-than-500-users)
9189

92-
## 11. Monitoring Wire-Server
90+
## 10. Monitoring Wire-Server
9391
- [How to monitor wire-server](monitoring.md)
9492
- [Dashboards](monitoring.md#dashboards)
9593

96-
## 12. Centralized Logs for Wire-Server
94+
## 11. Centralized Logs for Wire-Server
9795
- [How to see centralized logs for wire-server](logging.md)
9896
- [Introduction](logging.md#introduction)
9997
- [Status](logging.md#status)
@@ -105,28 +103,28 @@
105103
- [Nuking it all.](logging.md#nuking-it-all)
106104
- [Debugging](logging.md#debugging)
107105

108-
## 13. Ingress-Controller (Getting Traffic In)
106+
## 12. Ingress-Controller (Getting Traffic In)
109107
- [Ingress-controller (getting traffic in)](ingress.md)
110108
- [Installing in a cloud-like environment](ingress.md#installing-in-a-cloud-like-environment)
111109
- [Installing on bare-metal without dynamic load balancer support](ingress.md#installing-on-bare-metal-without-dynamic-load-balancer-support)
112110

113-
## 14. Web App Settings
111+
## 13. Web App Settings
114112
- [Web app settings](web-app-settings.md)
115113
- [Enforce desktop application only](web-app-settings.md#enforce-desktop-application-only)
116114
- [Enforce constant bit rate](web-app-settings.md#enforce-constant-bit-rate)
117115
- [Disable media plugins](web-app-settings.md#disable-media-plugins)
118116
- [Enable extra entropy (only on Windows)](web-app-settings.md#enable-extra-entropy-only-on-windows)
119117

120-
## 15. Installing Conference Calling 2.0 (aka SFT)
118+
## 14. Installing Conference Calling 2.0 (aka SFT)
121119
- [Installing Conference Calling 2.0 (aka SFT)](sft.md)
122120
- [Background](sft.md#background)
123121

124-
## 16. Installing Restund
122+
## 15. Installing Restund
125123
- [Installing Restund](restund.md)
126124
- [Background](restund.md#background)
127125
- [Installation instructions](restund.md#installation-instructions)
128126

129-
## 17. Configure TLS Ciphers
127+
## 16. Configure TLS Ciphers
130128
- [Configure TLS ciphers](tls.md)
131129
- [Ingress Traffic (wire-server)](tls.md#ingress-traffic-wire-server)
132130
- [Egress Traffic (wire-server/federation)](tls.md#egress-traffic-wire-server-federation)
@@ -136,16 +134,16 @@
136134
- [Restund (ansible)](tls.md#restund-ansible)
137135
- [Restund (kubernetes)](tls.md#restund-kubernetes)
138136

139-
## 18. Managing Authentication with Ansible
137+
## 17. Managing Authentication with Ansible
140138
- [Managing authentication with ansible](ansible-authentication.md)
141139
- [How to use password authentication when you ssh to a machine with ansible](ansible-authentication.md#how-to-use-password-authentication-when-you-ssh-to-a-machine-with-ansible)
142140
- [Configuring SSH keys](ansible-authentication.md#configuring-ssh-keys)
143141
- [Sudo without password](ansible-authentication.md#sudo-without-password)
144142

145-
## 19. Using Tinc
143+
## 18. Using Tinc
146144
- [Using tinc](ansible-tinc.md)
147145

148-
## 20. Troubleshooting During Installation
146+
## 19. Troubleshooting During Installation
149147
- [Troubleshooting during installation](troubleshooting.md)
150148
- [Problems with CSP on the web based applications (webapp, team-settings, account-pages)](troubleshooting.md#problems-with-csp-on-the-web-based-applications-webapp-team-settings-account-pages)
151149
- [Problems with ansible and python versions](troubleshooting.md#problems-with-ansible-and-python-versions)
@@ -157,7 +155,7 @@
157155
- [Diagnosing issues with installation steps.](troubleshooting.md#diagnosing-issues-with-installation-steps)
158156
- [Verifying correct deployment of DNS / DNS troubleshooting.](troubleshooting.md#verifying-correct-deployment-of-dns-dns-troubleshooting)
159157

160-
## 21. Verifying Your Installation
158+
## 20. Verifying Your Installation
161159
- [Verifying your installation](post-install.md)
162160
- [NTP Checks](post-install.md#ntp-checks)
163161
- [Logs and Data Protection checks](post-install.md#logs-and-data-protection-checks)

0 commit comments

Comments
 (0)