diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet index df539209..c2309132 100644 --- a/cluster/kube/k0.libsonnet +++ b/cluster/kube/k0.libsonnet @@ -16,7 +16,7 @@ local rook = import "lib/rook.libsonnet"; local k0 = self, cluster: cluster.Cluster("k0", "hswaw.net") { cfg+: { - storageClassNameParanoid: k0.ceph.waw2Pools.blockParanoid.name, + storageClassNameParanoid: k0.ceph.waw3Pools.blockRedundant.name, }, metallb+: { cfg+: { @@ -52,7 +52,7 @@ local rook = import "lib/rook.libsonnet"; cfg+: { domain: "registry.%s" % [k0.cluster.fqdn], storageClassName: k0.cluster.cfg.storageClassNameParanoid, - objectStorageName: "waw-hdd-redundant-2-object", + objectStorageName: "waw-hdd-redundant-3-object", }, }, diff --git a/cluster/kube/lib/registry.libsonnet b/cluster/kube/lib/registry.libsonnet index d9094032..cb2f3f70 100644 --- a/cluster/kube/lib/registry.libsonnet +++ b/cluster/kube/lib/registry.libsonnet @@ -73,9 +73,9 @@ local kube = import "../../../kube/kube.libsonnet"; blobdescriptor: "inmemory", }, s3: { - regionendpoint: "https://object.ceph-waw2.hswaw.net", + regionendpoint: "https://object.ceph-waw3.hswaw.net", bucket: "registry", - region: "waw-hdd-redunant-2-object:default-placement", + region: "waw-hdd-redunant-3-object:default-placement", }, }, http: { @@ -110,8 +110,8 @@ local kube = import "../../../kube/kube.libsonnet"; }, }, - authVolumeClaim: kube.PersistentVolumeClaim("auth-token-storage") { - metadata+: env.metadata("auth-token-storage"), + authVolumeClaim: kube.PersistentVolumeClaim("auth-token-storage-3") { + metadata+: env.metadata("auth-token-storage-3"), spec+: { storageClassName: cfg.storageClassName, accessModes: [ "ReadWriteOnce" ], @@ -314,7 +314,7 @@ local kube = import "../../../kube/kube.libsonnet"; registryStorageUser: kube.CephObjectStoreUser("registry") { metadata+: { - namespace: "ceph-waw2", + namespace: "ceph-waw3", }, spec: { store: cfg.objectStorageName,