From 8a6720f32b8f49bea1678e86ef2f9ca0dfc97e24 Mon Sep 17 00:00:00 2001 From: Vincent SELLIER <vincent.sellier@softwareheritage.org> Date: Fri, 16 Dec 2022 11:39:57 +0100 Subject: [PATCH 1/2] thanos: Activate thanos query for archive-staging Related to infra/sysadm-environment#4385 --- data/common/common.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/data/common/common.yaml b/data/common/common.yaml index a07326ecc..e9839f395 100644 --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -1134,6 +1134,10 @@ bind::resource_records: type: CNAME record: graphql.internal.staging.swh.network data: k8s-archive-staging.internal.staging.swh.network. + k8s-thanos-staging/CNAME: + type: CNAME + record: k8s-archive-staging-thanos.internal.staging.swh.network + data: k8s-archive-staging.internal.staging.swh.network. k8s-gitlab-production/A: # internal ingress for the gitlab production cluster record: k8s-gitlab-production.internal.softwareheritage.org data: 192.168.200.5 @@ -3415,6 +3419,7 @@ thanos::objstore::config: thanos::query::non_puppet_managed::stores: - mmca-thanos.softwareheritage.org:443 - k8s-admin-thanos.internal.admin.swh.network:443 + - k8s-archive-staging-thanos.internal.staging.swh.network:443 thanos::stores: historical: -- GitLab From 6457f00957ef3d20b925496464a1ae32384fc93e Mon Sep 17 00:00:00 2001 From: Vincent SELLIER <vincent.sellier@softwareheritage.org> Date: Fri, 16 Dec 2022 11:50:16 +0100 Subject: [PATCH 2/2] adapt according the review (Test to add commits that will be merged before landing the mr) --- data/common/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/common/common.yaml b/data/common/common.yaml index e9839f395..981bf97a5 100644 --- a/data/common/common.yaml +++ b/data/common/common.yaml @@ -1134,7 +1134,7 @@ bind::resource_records: type: CNAME record: graphql.internal.staging.swh.network data: k8s-archive-staging.internal.staging.swh.network. - k8s-thanos-staging/CNAME: + k8s-archive-staging-thanos/CNAME: type: CNAME record: k8s-archive-staging-thanos.internal.staging.swh.network data: k8s-archive-staging.internal.staging.swh.network. -- GitLab