From 91b4eaabbf8bc9f979e345a2d51b858d25043266 Mon Sep 17 00:00:00 2001
From: Julia Longtin <julia.longtin@wire.com>
Date: Mon, 31 Jan 2022 14:45:54 +0000
Subject: [PATCH 01/30] try creating an offline deploy from develop.

---
 offline/ci.sh | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 39bb6a88f..a6501d74d 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -30,7 +30,6 @@ install -m755 "$(nix-build --no-out-link -A pkgs.wire-binaries)/"* binaries/
 tar cf binaries.tar binaries
 rm -r binaries
 
-
 function list-system-containers() {
 # These are manually updated with values from
 # https://github.com/kubernetes-sigs/kubespray/blob/release-2.15/roles/download/defaults/main.yml
@@ -63,24 +62,23 @@ echo "quay.io/wire/restund:v0.4.16b1.0.53" | create-container-dump containers-ot
 tar cf containers-other.tar containers-other
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-other
 
-
 charts=(
   # backoffice
   # commented out for now, points to a 2.90.0 container image which doesn't
   # seem to exist on quay.io
-  wire/nginx-ingress-controller
-  wire/nginx-ingress-services
-  wire/reaper
-  wire/cassandra-external
-  wire/databases-ephemeral
-  wire/demo-smtp
-  wire/elasticsearch-external
-  wire/fake-aws
-  wire/minio-external
-  wire/wire-server
+  wire-develop/nginx-ingress-controller
+  wire-develop/nginx-ingress-services
+  wire-develop/reaper
+  wire-develop/cassandra-external
+  wire-develop/databases-ephemeral
+  wire-develop/demo-smtp
+  wire-develop/elasticsearch-external
+  wire-develop/fake-aws
+  wire-develop/minio-external
+  wire-develop/wire-server
   # local-path-provisioner
   # TODO: uncomment once its dependencies are pinned!
-  wire/sftd
+  wire-develop/sftd
   # Has a weird dependency on curl:latest. out of scope
   # wire-server-metrics
   # fluent-bit
@@ -95,6 +93,7 @@ export HELM_HOME
 
 helm repo add wire https://s3-eu-west-1.amazonaws.com/public.wire.com/charts
 helm repo update
+helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-develop
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
 wire_version="4.26.0"
@@ -123,7 +122,6 @@ tar cf containers-helm.tar containers-helm
 
 echo "docker_ubuntu_repo_repokey: '${fingerprint}'" > ansible/inventory/offline/group_vars/all/key.yml
 
-
 tar czf assets.tgz debs.tar binaries.tar containers-adminhost containers-helm.tar containers-other.tar containers-system.tar ansible charts values bin
 
 echo "Done"

From e34c148932fcec9152ae9bfcf493d2fdd0ad267e Mon Sep 17 00:00:00 2001
From: Julia Longtin <julia.longtin@wire.com>
Date: Tue, 8 Feb 2022 19:49:42 +0000
Subject: [PATCH 02/30] bump the wire calling version.

---
 offline/ci.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index a6501d74d..39df985be 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -58,7 +58,7 @@ tar cf containers-system.tar containers-system
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-system
 
 # Used for ansible-restund role
-echo "quay.io/wire/restund:v0.4.16b1.0.53" | create-container-dump containers-other
+echo "quay.io/wire/restund:0." | create-container-dump containers-other
 tar cf containers-other.tar containers-other
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-other
 
@@ -76,9 +76,8 @@ charts=(
   wire-develop/fake-aws
   wire-develop/minio-external
   wire-develop/wire-server
-  # local-path-provisioner
   # TODO: uncomment once its dependencies are pinned!
-  wire-develop/sftd
+  # local-path-provisioner
   # Has a weird dependency on curl:latest. out of scope
   # wire-server-metrics
   # fluent-bit
@@ -86,6 +85,11 @@ charts=(
   # wire/federator
 )
 
+calling_charts=(
+  wire-develop/sftd
+  wire-develop/restund
+)
+
 # TODO: Awaiting some fixes in wire-server regarding tagless images
 
 HELM_HOME=$(mktemp -d)
@@ -98,6 +102,8 @@ helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/ch
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
 wire_version="4.26.0"
 
+wire_calling_version="4.0.22"
+
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost
 
@@ -105,6 +111,9 @@ mkdir -p ./charts
 for chartName in "${charts[@]}"; do
   (cd ./charts; helm pull --version "$wire_version" --untar "$chartName")
 done
+for chartName in "${calling_charts[@]}"; do
+  (cd ./charts; helm pull --version "$wire_calling_version" --untar "$chartName")
+done
 
 # Patch wire-server values.yaml to include federator
 # This is needed to bundle it's image.

From 41e41a842eb9cf076267f0a99fff667d658b7747 Mon Sep 17 00:00:00 2001
From: Julia Longtin <julia.longtin@wire.com>
Date: Tue, 8 Feb 2022 19:59:18 +0000
Subject: [PATCH 03/30] add restund version in second place.

---
 offline/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 39df985be..8c588c651 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -58,7 +58,7 @@ tar cf containers-system.tar containers-system
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-system
 
 # Used for ansible-restund role
-echo "quay.io/wire/restund:0." | create-container-dump containers-other
+echo "quay.io/wire/restund:0.4.17" | create-container-dump containers-other
 tar cf containers-other.tar containers-other
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-other
 

From d16b34ce200c3a362e26c0e62b8e68b0abb54695 Mon Sep 17 00:00:00 2001
From: Julia Longtin <julia.longtin@wire.com>
Date: Tue, 8 Feb 2022 20:23:52 +0000
Subject: [PATCH 04/30] ugh.

---
 nix/scripts/list-helm-containers.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh
index df27aeaee..396780880 100644
--- a/nix/scripts/list-helm-containers.sh
+++ b/nix/scripts/list-helm-containers.sh
@@ -33,5 +33,6 @@ while IFS= read -r chart; do
   helm template "$chart" \
     $( [[ -f ./values/$(basename $chart)/prod-values.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-values.example.yaml" ) \
     $( [[ -f ./values/$(basename $chart)/prod-secrets.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-secrets.example.yaml" ) \
+    --set stringArray secrets.zrestSecret=emptyString \
     | yq -r '..|.image? | select(.)' | optionally_complain | sort -u
 done | sort -u

From 57f315dc13cf48bfd8a91d446ca588a7c95ad62b Mon Sep 17 00:00:00 2001
From: Julia Longtin <julia.longtin@wire.com>
Date: Tue, 8 Feb 2022 20:32:04 +0000
Subject: [PATCH 05/30] ugh.

---
 nix/scripts/list-helm-containers.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh
index 396780880..df3629f1c 100644
--- a/nix/scripts/list-helm-containers.sh
+++ b/nix/scripts/list-helm-containers.sh
@@ -30,9 +30,8 @@ function optionally_complain() {
 while IFS= read -r chart; do
   echo "Running helm template on chart ${chart}…" >&2
 
-  helm template "$chart" \
+  helm template "$chart" --set stringArray secrets.zrestSecret=emptyString \
     $( [[ -f ./values/$(basename $chart)/prod-values.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-values.example.yaml" ) \
     $( [[ -f ./values/$(basename $chart)/prod-secrets.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-secrets.example.yaml" ) \
-    --set stringArray secrets.zrestSecret=emptyString \
     | yq -r '..|.image? | select(.)' | optionally_complain | sort -u
 done | sort -u

From f02794521e6b72524b00eafba39f07d929f88613 Mon Sep 17 00:00:00 2001
From: Julia Longtin <julia.longtin@wire.com>
Date: Tue, 8 Feb 2022 20:33:33 +0000
Subject: [PATCH 06/30] more ugh.

---
 nix/scripts/list-helm-containers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh
index df3629f1c..6a9d03342 100644
--- a/nix/scripts/list-helm-containers.sh
+++ b/nix/scripts/list-helm-containers.sh
@@ -30,7 +30,7 @@ function optionally_complain() {
 while IFS= read -r chart; do
   echo "Running helm template on chart ${chart}…" >&2
 
-  helm template "$chart" --set stringArray secrets.zrestSecret=emptyString \
+  helm template "$chart" --set secrets.zrestSecret=emptyString \
     $( [[ -f ./values/$(basename $chart)/prod-values.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-values.example.yaml" ) \
     $( [[ -f ./values/$(basename $chart)/prod-secrets.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-secrets.example.yaml" ) \
     | yq -r '..|.image? | select(.)' | optionally_complain | sort -u

From 2f3a7bc775f976ef8bdfb25e6e989f4c65e58e8f Mon Sep 17 00:00:00 2001
From: Molly Miller <molly.miller@wire.com>
Date: Thu, 24 Mar 2022 10:17:45 +0100
Subject: [PATCH 07/30] Once more on the merry-go-round...

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 8c588c651..59384dfd9 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -58,7 +58,7 @@ tar cf containers-system.tar containers-system
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-system
 
 # Used for ansible-restund role
-echo "quay.io/wire/restund:0.4.17" | create-container-dump containers-other
+echo "quay.io/wire/restund:v0.6.0-rc.1" | create-container-dump containers-other
 tar cf containers-other.tar containers-other
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-other
 
@@ -102,7 +102,7 @@ helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/ch
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
 wire_version="4.26.0"
 
-wire_calling_version="4.0.22"
+wire_calling_version="4.7.7"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From 237192da91da4a2e1ac31a959302cf292d89c63f Mon Sep 17 00:00:00 2001
From: Molly Miller <molly.miller@wire.com>
Date: Thu, 24 Mar 2022 10:44:57 +0100
Subject: [PATCH 08/30] Hack.

---
 nix/scripts/list-helm-containers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh
index 6a9d03342..af775ad65 100644
--- a/nix/scripts/list-helm-containers.sh
+++ b/nix/scripts/list-helm-containers.sh
@@ -30,7 +30,7 @@ function optionally_complain() {
 while IFS= read -r chart; do
   echo "Running helm template on chart ${chart}…" >&2
 
-  helm template "$chart" --set secrets.zrestSecret=emptyString \
+  helm template "$chart" --set secrets.zrestSecret=emptyString --set federate.dtls.tls.issuerRef=emptyString \
     $( [[ -f ./values/$(basename $chart)/prod-values.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-values.example.yaml" ) \
     $( [[ -f ./values/$(basename $chart)/prod-secrets.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-secrets.example.yaml" ) \
     | yq -r '..|.image? | select(.)' | optionally_complain | sort -u

From b8d8ce6726dc87b274967d64a6eb101d84953072 Mon Sep 17 00:00:00 2001
From: Molly Miller <molly.miller@wire.com>
Date: Thu, 24 Mar 2022 10:57:15 +0100
Subject: [PATCH 09/30] Hack (2).

---
 nix/scripts/list-helm-containers.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh
index af775ad65..46467fe35 100644
--- a/nix/scripts/list-helm-containers.sh
+++ b/nix/scripts/list-helm-containers.sh
@@ -30,7 +30,10 @@ function optionally_complain() {
 while IFS= read -r chart; do
   echo "Running helm template on chart ${chart}…" >&2
 
-  helm template "$chart" --set secrets.zrestSecret=emptyString --set federate.dtls.tls.issuerRef=emptyString \
+  helm template "$chart" \
+    --set secrets.zrestSecret=emptyString \
+    --set federate.dtls.tls.issuerRef=emptyString \
+    --set federate.dtls.tls.certificate.labels=emptyString \
     $( [[ -f ./values/$(basename $chart)/prod-values.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-values.example.yaml" ) \
     $( [[ -f ./values/$(basename $chart)/prod-secrets.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-secrets.example.yaml" ) \
     | yq -r '..|.image? | select(.)' | optionally_complain | sort -u

From 22871043b360d86d50580e2e87d9f81ca0160484 Mon Sep 17 00:00:00 2001
From: Molly Miller <molly.miller@wire.com>
Date: Thu, 24 Mar 2022 10:59:59 +0100
Subject: [PATCH 10/30] Hack (3).

---
 nix/scripts/list-helm-containers.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh
index 46467fe35..4544c6324 100644
--- a/nix/scripts/list-helm-containers.sh
+++ b/nix/scripts/list-helm-containers.sh
@@ -34,6 +34,7 @@ while IFS= read -r chart; do
     --set secrets.zrestSecret=emptyString \
     --set federate.dtls.tls.issuerRef=emptyString \
     --set federate.dtls.tls.certificate.labels=emptyString \
+    --set federate.dtls.tls.certificate.dnsNames=emptyString \
     $( [[ -f ./values/$(basename $chart)/prod-values.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-values.example.yaml" ) \
     $( [[ -f ./values/$(basename $chart)/prod-secrets.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-secrets.example.yaml" ) \
     | yq -r '..|.image? | select(.)' | optionally_complain | sort -u

From 0c14f625b3c109fd9551ea09a8c44a6b886bd48f Mon Sep 17 00:00:00 2001
From: Molly Miller <molly.miller@wire.com>
Date: Thu, 24 Mar 2022 12:20:05 +0100
Subject: [PATCH 11/30] Hack (4).

This one is tested locally so might even work better.
---
 nix/scripts/list-helm-containers.sh | 7 +++----
 offline/ci.sh                       | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nix/scripts/list-helm-containers.sh b/nix/scripts/list-helm-containers.sh
index 4544c6324..789c3c4fe 100644
--- a/nix/scripts/list-helm-containers.sh
+++ b/nix/scripts/list-helm-containers.sh
@@ -30,11 +30,10 @@ function optionally_complain() {
 while IFS= read -r chart; do
   echo "Running helm template on chart ${chart}…" >&2
 
-  helm template "$chart" \
+  helm template --debug "$chart" \
     --set secrets.zrestSecret=emptyString \
-    --set federate.dtls.tls.issuerRef=emptyString \
-    --set federate.dtls.tls.certificate.labels=emptyString \
-    --set federate.dtls.tls.certificate.dnsNames=emptyString \
+    --set federate.dtls.tls.key=emptyString \
+    --set federate.dtls.tls.crt=emptyString \
     $( [[ -f ./values/$(basename $chart)/prod-values.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-values.example.yaml" ) \
     $( [[ -f ./values/$(basename $chart)/prod-secrets.example.yaml ]] && echo "-f ./values/$(basename $chart)/prod-secrets.example.yaml" ) \
     | yq -r '..|.image? | select(.)' | optionally_complain | sort -u
diff --git a/offline/ci.sh b/offline/ci.sh
index 59384dfd9..5b48a7614 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -96,8 +96,8 @@ HELM_HOME=$(mktemp -d)
 export HELM_HOME
 
 helm repo add wire https://s3-eu-west-1.amazonaws.com/public.wire.com/charts
-helm repo update
 helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-develop
+helm repo update
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
 wire_version="4.26.0"

From 776c3bec79288999c233cd326bdf35f3f7996187 Mon Sep 17 00:00:00 2001
From: Molly Miller <molly.miller@wire.com>
Date: Wed, 20 Apr 2022 10:46:23 +0200
Subject: [PATCH 12/30] Look, another merry-go-round!

This adjusts the versions of the calling components in the Helm charts using
sed from the build script this time, instead of temporarily committing version
changes into wire-server.
---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 5b48a7614..eab67c8e8 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -58,7 +58,7 @@ tar cf containers-system.tar containers-system
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-system
 
 # Used for ansible-restund role
-echo "quay.io/wire/restund:v0.6.0-rc.1" | create-container-dump containers-other
+echo "quay.io/wire/restund:v0.6.0-rc.2" | create-container-dump containers-other
 tar cf containers-other.tar containers-other
 [[ "$INCREMENTAL" -eq 0 ]] && rm -r containers-other
 
@@ -102,7 +102,7 @@ helm repo update
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
 wire_version="4.26.0"
 
-wire_calling_version="4.7.7"
+wire_calling_version="4.9.37"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From 2713f57c810d01a3c362eba41c485d26fddb7339 Mon Sep 17 00:00:00 2001
From: Molly Miller <molly.miller@wire.com>
Date: Wed, 20 Apr 2022 10:56:26 +0200
Subject: [PATCH 13/30] Fix typo in version numbers.

4.9.37 isn't a published Helm chart version at the time of writing, but 4.9.36
is.
---
 offline/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index eab67c8e8..2faf5c29f 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -102,7 +102,7 @@ helm repo update
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
 wire_version="4.26.0"
 
-wire_calling_version="4.9.37"
+wire_calling_version="4.9.36"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From 5ce5ba8df04f6e5b25502f181f7aba59595670cb Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Mon, 4 Jul 2022 17:17:04 +0200
Subject: [PATCH 14/30] Upgrade to M3.4 (AKA 4.9.36-hotfix.11)

---
 offline/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 2faf5c29f..839e25d99 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -102,7 +102,7 @@ helm repo update
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
 wire_version="4.26.0"
 
-wire_calling_version="4.9.36"
+wire_calling_version="4.9.36-hotfix.11"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From 94c88b586af9c1755b43932b2a2d7c9ccc7e9a52 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Mon, 4 Jul 2022 17:31:24 +0200
Subject: [PATCH 15/30] All charts should be released on `wire` repository

---
 offline/ci.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 839e25d99..1577a3cd8 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -66,16 +66,16 @@ charts=(
   # backoffice
   # commented out for now, points to a 2.90.0 container image which doesn't
   # seem to exist on quay.io
-  wire-develop/nginx-ingress-controller
-  wire-develop/nginx-ingress-services
-  wire-develop/reaper
-  wire-develop/cassandra-external
-  wire-develop/databases-ephemeral
-  wire-develop/demo-smtp
-  wire-develop/elasticsearch-external
-  wire-develop/fake-aws
-  wire-develop/minio-external
-  wire-develop/wire-server
+  wire/nginx-ingress-controller
+  wire/nginx-ingress-services
+  wire/reaper
+  wire/cassandra-external
+  wire/databases-ephemeral
+  wire/demo-smtp
+  wire/elasticsearch-external
+  wire/fake-aws
+  wire/minio-external
+  wire/wire-server
   # TODO: uncomment once its dependencies are pinned!
   # local-path-provisioner
   # Has a weird dependency on curl:latest. out of scope
@@ -86,8 +86,8 @@ charts=(
 )
 
 calling_charts=(
-  wire-develop/sftd
-  wire-develop/restund
+  wire/sftd
+  wire/restund
 )
 
 # TODO: Awaiting some fixes in wire-server regarding tagless images

From 7d6090faea4d54d5c003b3dcceaeb11f9b29d1cf Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Thu, 25 Aug 2022 12:53:29 +0200
Subject: [PATCH 16/30] Upgrade to M3.5 (4.9.36-hotfix.15)

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 1577a3cd8..2030a2d0d 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -100,9 +100,9 @@ helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/ch
 helm repo update
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
-wire_version="4.26.0"
+wire_version="4.9.36-hotfix.15"
 
-wire_calling_version="4.9.36-hotfix.11"
+wire_calling_version="4.9.36-hotfix.15"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From a238e54664a4e199608669bf8d4c598fcc771c65 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Thu, 25 Aug 2022 13:58:08 +0200
Subject: [PATCH 17/30] Try fetching nginx charts from wire-develop

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 2030a2d0d..645429a50 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -66,8 +66,8 @@ charts=(
   # backoffice
   # commented out for now, points to a 2.90.0 container image which doesn't
   # seem to exist on quay.io
-  wire/nginx-ingress-controller
-  wire/nginx-ingress-services
+  wire-develop/nginx-ingress-controller
+  wire-develop/nginx-ingress-services
   wire/reaper
   wire/cassandra-external
   wire/databases-ephemeral

From c256cc6c8f3a9b736f4f78e7f1a70ff74902b585 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Thu, 25 Aug 2022 14:04:00 +0200
Subject: [PATCH 18/30] Pull more from wire-develop

---
 offline/ci.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 645429a50..1af42bd15 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -68,21 +68,21 @@ charts=(
   # seem to exist on quay.io
   wire-develop/nginx-ingress-controller
   wire-develop/nginx-ingress-services
-  wire/reaper
-  wire/cassandra-external
-  wire/databases-ephemeral
-  wire/demo-smtp
-  wire/elasticsearch-external
-  wire/fake-aws
-  wire/minio-external
-  wire/wire-server
+  wire-develop/reaper
+  wire-develop/cassandra-external
+  wire-develop/databases-ephemeral
+  wire-develop/demo-smtp
+  wire-develop/elasticsearch-external
+  wire-develop/fake-aws
+  wire-develop/minio-external
+  wire-develop/wire-server
   # TODO: uncomment once its dependencies are pinned!
   # local-path-provisioner
   # Has a weird dependency on curl:latest. out of scope
   # wire-server-metrics
   # fluent-bit
   # kibana
-  # wire/federator
+  wire-develop/federator
 )
 
 calling_charts=(

From 5c8182fe4678974aae9f447b25967531a9e3d1a1 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Thu, 25 Aug 2022 14:14:28 +0200
Subject: [PATCH 19/30] Ignore federator chart / image for now

---
 offline/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 1af42bd15..7d101cd2b 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -82,7 +82,7 @@ charts=(
   # wire-server-metrics
   # fluent-bit
   # kibana
-  wire-develop/federator
+  # wire-develop/federator
 )
 
 calling_charts=(

From 04dcc796cd713b7a36c014b841573e81cf06663d Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Thu, 25 Aug 2022 14:23:02 +0200
Subject: [PATCH 20/30] Same game for sftd and restund

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 7d101cd2b..9556aac9a 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -86,8 +86,8 @@ charts=(
 )
 
 calling_charts=(
-  wire/sftd
-  wire/restund
+  wire-develop/sftd
+  wire-develop/restund
 )
 
 # TODO: Awaiting some fixes in wire-server regarding tagless images

From 4cda6fd09784b1d993767a772623e8bb7ca5257a Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Thu, 25 Aug 2022 16:02:55 +0200
Subject: [PATCH 21/30] More duct tape

---
 offline/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/offline/ci.sh b/offline/ci.sh
index 9556aac9a..a5ab11a4a 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -119,6 +119,8 @@ done
 # This is needed to bundle it's image.
 sed -i -Ee 's/federator: false/federator: true/' "$(pwd)"/values/wire-server/prod-values.example.yaml
 
+cat  "$(pwd)"/charts/wire-server/values.yaml
+
 for chartPath in "$(pwd)"/charts/*; do
   echo "$chartPath"
 done | list-helm-containers | create-container-dump containers-helm

From ffff3f10775e8be012f7c07a65a8d0fb2fbcf41d Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Mon, 26 Sep 2022 17:09:09 +0200
Subject: [PATCH 22/30] Bundle 4.9.36-hotfix.17

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index a5ab11a4a..e20a16dc3 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -100,9 +100,9 @@ helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/ch
 helm repo update
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
-wire_version="4.9.36-hotfix.15"
+wire_version="4.9.36-hotfix.17"
 
-wire_calling_version="4.9.36-hotfix.15"
+wire_calling_version="4.9.36-hotfix.17"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From ed58366f2b88bd4b068734e65c8ddab9d4b77b26 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Tue, 27 Sep 2022 10:16:49 +0200
Subject: [PATCH 23/30] Make helm install wire-server verbose

---
 bin/offline-helm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/offline-helm.sh b/bin/offline-helm.sh
index 116086d76..35e915dac 100755
--- a/bin/offline-helm.sh
+++ b/bin/offline-helm.sh
@@ -9,7 +9,7 @@ helm upgrade --install --wait fake-aws ./charts/fake-aws --values ./values/fake-
 helm upgrade --install --wait demo-smtp ./charts/demo-smtp --values ./values/demo-smtp/prod-values.example.yaml
 helm upgrade --install --wait databases-ephemeral ./charts/databases-ephemeral --values ./values/databases-ephemeral/prod-values.example.yaml
 helm upgrade --install --wait reaper ./charts/reaper
-helm upgrade --install --wait wire-server ./charts/wire-server --values ./values/wire-server/prod-values.example.yaml --values ./values/wire-server/secrets.yaml
+helm --debug upgrade --install --wait wire-server ./charts/wire-server --values ./values/wire-server/prod-values.example.yaml --values ./values/wire-server/secrets.yaml
 helm upgrade --install --wait nginx-ingress-controller ./charts/nginx-ingress-controller
 
 # TODO: Requires certs; which we do not have in CI/CD at this point. future work =) (Would need cert-manager in offline package. That'd be neat)

From 517d28dc045bab802be37676a3344fcd2d97880c Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Tue, 27 Sep 2022 16:44:45 +0200
Subject: [PATCH 24/30] Less verbose helm call

---
 bin/offline-helm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/offline-helm.sh b/bin/offline-helm.sh
index 35e915dac..116086d76 100755
--- a/bin/offline-helm.sh
+++ b/bin/offline-helm.sh
@@ -9,7 +9,7 @@ helm upgrade --install --wait fake-aws ./charts/fake-aws --values ./values/fake-
 helm upgrade --install --wait demo-smtp ./charts/demo-smtp --values ./values/demo-smtp/prod-values.example.yaml
 helm upgrade --install --wait databases-ephemeral ./charts/databases-ephemeral --values ./values/databases-ephemeral/prod-values.example.yaml
 helm upgrade --install --wait reaper ./charts/reaper
-helm --debug upgrade --install --wait wire-server ./charts/wire-server --values ./values/wire-server/prod-values.example.yaml --values ./values/wire-server/secrets.yaml
+helm upgrade --install --wait wire-server ./charts/wire-server --values ./values/wire-server/prod-values.example.yaml --values ./values/wire-server/secrets.yaml
 helm upgrade --install --wait nginx-ingress-controller ./charts/nginx-ingress-controller
 
 # TODO: Requires certs; which we do not have in CI/CD at this point. future work =) (Would need cert-manager in offline package. That'd be neat)

From 1a681eb98619511724bf7fa614c022cb07823441 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Thu, 10 Nov 2022 11:03:40 +0100
Subject: [PATCH 25/30] Bundle 4.9.36-hotfix.19 (M3.5.3)

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index e20a16dc3..1514d6917 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -100,9 +100,9 @@ helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/ch
 helm repo update
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
-wire_version="4.9.36-hotfix.17"
+wire_version="4.9.36-hotfix.19"
 
-wire_calling_version="4.9.36-hotfix.17"
+wire_calling_version="4.9.36-hotfix.19"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From 233a79c825ced1ce9acbc685c43897868e095ee2 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Thu, 10 Nov 2022 17:18:14 +0100
Subject: [PATCH 26/30] Bundle 4.9.36-hotfix.20

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 1514d6917..9fb040ffa 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -100,9 +100,9 @@ helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/ch
 helm repo update
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
-wire_version="4.9.36-hotfix.19"
+wire_version="4.9.36-hotfix.20"
 
-wire_calling_version="4.9.36-hotfix.19"
+wire_calling_version="4.9.36-hotfix.20"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From b687736c1306904a62718397d587b6b69ae0e682 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Wed, 16 Nov 2022 11:03:48 +0100
Subject: [PATCH 27/30] Use 4.9.36-hotfix.23 to fix cert-manager chart issues

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 9fb040ffa..46332fcd4 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -100,9 +100,9 @@ helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/ch
 helm repo update
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
-wire_version="4.9.36-hotfix.20"
+wire_version="4.9.36-hotfix.23"
 
-wire_calling_version="4.9.36-hotfix.20"
+wire_calling_version="4.9.36-hotfix.23"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From 20a7d3ea9ab212912c5d88cce8f2b72628103800 Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Fri, 18 Nov 2022 13:03:26 +0100
Subject: [PATCH 28/30] Fix sftd issuerRef

---
 values/sftd/prod-values.example.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/values/sftd/prod-values.example.yaml b/values/sftd/prod-values.example.yaml
index 8f6b66e10..35d9b1c53 100644
--- a/values/sftd/prod-values.example.yaml
+++ b/values/sftd/prod-values.example.yaml
@@ -2,4 +2,4 @@ allowOrigin: https://webapp.example.com
 host: sftd.example.com
 tls:
   issuerRef:
-    name: letsencrypt-prod
+    name: letsencrypt-http01

From 391996f52aedd64f3dea2f4326a96a224c96ec8c Mon Sep 17 00:00:00 2001
From: Sven Tennie <sven.tennie@wire.com>
Date: Fri, 18 Nov 2022 14:50:12 +0100
Subject: [PATCH 29/30] Another round for M3.5.3: 4.9.36-hotfix.24

---
 offline/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index 46332fcd4..d0f8fa1fe 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -100,9 +100,9 @@ helm repo add wire-develop https://s3-eu-west-1.amazonaws.com/public.wire.com/ch
 helm repo update
 
 # wire_version=$(helm show chart wire/wire-server | yq -r .version)
-wire_version="4.9.36-hotfix.23"
+wire_version="4.9.36-hotfix.24"
 
-wire_calling_version="4.9.36-hotfix.23"
+wire_calling_version="4.9.36-hotfix.24"
 
 # Download zauth; as it's needed to generate certificates
 echo "quay.io/wire/zauth:$wire_version" | create-container-dump containers-adminhost

From 4fd308746a9462b7a40d5dbbb37168441ac05bcc Mon Sep 17 00:00:00 2001
From: Julia Longtin <julia.longtin@wire.com>
Date: Wed, 31 Jan 2024 12:20:17 +0000
Subject: [PATCH 30/30] Update offline/ci.sh

---
 offline/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/offline/ci.sh b/offline/ci.sh
index e72f2414c..77f99f86d 100755
--- a/offline/ci.sh
+++ b/offline/ci.sh
@@ -154,6 +154,6 @@ tar cf containers-helm.tar containers-helm
 
 echo "docker_ubuntu_repo_repokey: '${fingerprint}'" > ansible/inventory/offline/group_vars/all/key.yml
 
-tar czf assets.tgz debs.tar binaries.tar containers-adminhost containers-helm.tar containers-oth
+tar czf assets.tgz debs.tar binaries.tar containers-adminhost containers-helm.tar containers-other.tar containers-system.tar ansible charts values bin
 
 echo "Done"