ceph-waw1 -> ceph-waw2
Change-Id: I03d6244b9697a9efc06492114ef90cdb01e17601
diff --git a/cluster/kube/lib/registry.libsonnet b/cluster/kube/lib/registry.libsonnet
index 8b57dd7..1ce022d 100644
--- a/cluster/kube/lib/registry.libsonnet
+++ b/cluster/kube/lib/registry.libsonnet
@@ -15,6 +15,7 @@
namespace: "registry",
domain: error "domain must be set",
storageClassName: error "storageClassName must be set",
+ objectStoreName: error "objectStoreName must be set",
},
metadata(component):: {
@@ -72,9 +73,9 @@
blobdescriptor: "inmemory",
},
s3: {
- regionendpoint: "https://object.ceph-waw1.hswaw.net",
+ regionendpoint: "https://object.ceph-waw2.hswaw.net",
bucket: "registry",
- region: "waw-hdd-redunant-1-object:default-placement",
+ region: "waw-hdd-redunant-2-object:default-placement",
},
},
http: {
@@ -154,6 +155,8 @@
{ who: ["q3k", "inf"], what: "vms/*" },
{ who: ["q3k", "inf"], what: "app/*" },
{ who: ["q3k", "inf"], what: "go/svc/*" },
+ { who: ["q3k"], what: "bgpwtf/*" },
+ { who: ["q3k"], what: "devtools/*" },
],
acl: [
{
@@ -253,11 +256,11 @@
},
env_: {
REGISTRY_STORAGE_S3_ACCESSKEY: { secretKeyRef: {
- name: "rook-ceph-object-user-waw-hdd-redundant-1-object-registry",
+ name: "rook-ceph-object-user-%(objectStorageName)s-registry" % {objectStorageName: cfg.objectStorageName},
key: "AccessKey"
}},
REGISTRY_STORAGE_S3_SECRETKEY: { secretKeyRef: {
- name: "rook-ceph-object-user-waw-hdd-redundant-1-object-registry",
+ name: "rook-ceph-object-user-%(objectStorageName)s-registry" % {objectStorageName: cfg.objectStorageName},
key: "SecretKey",
}},
},
@@ -310,10 +313,10 @@
registryStorageUser: kube._Object("ceph.rook.io/v1", "CephObjectStoreUser", "registry") {
metadata+: {
- namespace: "ceph-waw1",
+ namespace: "ceph-waw2",
},
spec: {
- store: "waw-hdd-redundant-1-object",
+ store: cfg.objectStorageName,
displayName: "docker-registry user",
},
},