From c50f456501615814a9bc0988bdc650a186228642 Mon Sep 17 00:00:00 2001 From: Francois Ferrand Date: Thu, 26 Sep 2024 15:01:07 +0200 Subject: [PATCH] Set federated prometheus name This is needed to avoid conflict with internal prometheus service, since we are running in the same cluster. Issue: ZENKO-4876 --- .github/scripts/end2end/patch-coredns.sh | 1 + tests/ctst/steps/pra.ts | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/end2end/patch-coredns.sh b/.github/scripts/end2end/patch-coredns.sh index b297d596d6..05731aefdd 100755 --- a/.github/scripts/end2end/patch-coredns.sh +++ b/.github/scripts/end2end/patch-coredns.sh @@ -31,6 +31,7 @@ corefile=" rewrite name exact s3.dr.zenko.local ingress-nginx-controller.ingress-nginx.svc.cluster.local rewrite name exact sts.dr.zenko.local ingress-nginx-controller.ingress-nginx.svc.cluster.local rewrite name exact iam.dr.zenko.local ingress-nginx-controller.ingress-nginx.svc.cluster.local + rewrite name exact prom.dr.zenko.local ingress-nginx-controller.ingress-nginx.svc.cluster.local rewrite name exact shell-ui.dr.zenko.local ingress-nginx-controller.ingress-nginx.svc.cluster.local kubernetes cluster.local in-addr.arpa ip6.arpa { pods insecure diff --git a/tests/ctst/steps/pra.ts b/tests/ctst/steps/pra.ts index 5fe0739a06..6f35d19425 100644 --- a/tests/ctst/steps/pra.ts +++ b/tests/ctst/steps/pra.ts @@ -71,9 +71,8 @@ async function installPRA(world: Zenko, sinkS3Endpoint = 'http://s3.zenko.local' sourceS3Endpoint: 'http://s3.zenko.local', sinkS3Endpoint, prometheusService: world.parameters.PrometheusService, - // prometheusHostname: 'prom.dr.zenko.local', // could be any name, cert will be auto-generated + prometheusHostname: 'prom.dr.zenko.local', prometheusExternalIpsDiscovery: true, - prometheusDisableTls: true, forceRotateServiceCredentials: (CacheHelper.savedAcrossTests[Zenko.PRA_INSTALL_COUNT_KEY] as number) > 0, ...kafkaExternalIpOption, timeout,