k0: move registry to ceph-waw3

ceph-waw2 has currently some production issues [1] which have started to
cause write failures in the registry. The registry is the only user of
ceph-waw2's affected pool, so we reduce the dumpster fire blast radious
by moving it over to ceph-waw3.

This has already been deployed and data has been migrated over (via
s3cmd sync), and the migration has been verified (by a push and pull,
and pull of an older image).

[1] - pgs stuck inactive in the object storage pool

Change-Id: I26789b52008bb7be953954ec3fd3dd727ac15347
master
q3k 2020-08-04 01:34:07 +02:00
parent 1773f32c8a
commit 3d29484ebb
2 changed files with 7 additions and 7 deletions

View File

@ -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",
},
},

View File

@ -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,