Merge changes Ia92c99e1,I4dca55a7,I4ed014d2,I96c3c18b,I08e70425
* changes:
cluster/kube: always enable flexdriver
cluster: k0: move ceph-waw3 to proper realm/zonegroup
cluster/nix: k0: enable rgw on osds
cluster: k0: upgrade to ceph 16.2.5
cluster: k0: bump rook to 1.6
diff --git a/app/matrix/lib/matrix-ng.libsonnet b/app/matrix/lib/matrix-ng.libsonnet
index f230c4a..97812a7 100644
--- a/app/matrix/lib/matrix-ng.libsonnet
+++ b/app/matrix/lib/matrix-ng.libsonnet
@@ -62,7 +62,7 @@
storageClassName: "waw-hdd-redundant-3",
images: {
- synapse: "matrixdotorg/synapse:v1.35.1",
+ synapse: "matrixdotorg/synapse:v1.37.1",
riot: "vectorim/riot-web:v1.7.29",
casProxy: "registry.k0.hswaw.net/q3k/oauth2-cas-proxy:0.1.4",
appserviceIRC: "matrixdotorg/matrix-appservice-irc:release-0.27.0",
diff --git a/app/matrix/lib/matrix.libsonnet b/app/matrix/lib/matrix.libsonnet
index 168844a..5d4c740 100644
--- a/app/matrix/lib/matrix.libsonnet
+++ b/app/matrix/lib/matrix.libsonnet
@@ -43,7 +43,7 @@
storageClassName: "waw-hdd-redundant-3",
images: {
- synapse: "matrixdotorg/synapse:v1.19.2",
+ synapse: "matrixdotorg/synapse:v1.37.1",
riot: "vectorim/riot-web:v1.7.16",
casProxy: "registry.k0.hswaw.net/q3k/oauth2-cas-proxy:0.1.4",
appserviceIRC: "matrixdotorg/matrix-appservice-irc:release-0.17.1",
diff --git a/shell.nix b/shell.nix
index c664ca9..e52c741 100644
--- a/shell.nix
+++ b/shell.nix
@@ -35,6 +35,8 @@
pwgen
tmate
git
+ which
+ nettools
];
multiPkgs = pkgs: [
(pkgs.runCommand "protocols" {}