From 95a229940523b4fb918026b94d459f19c43b4102 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 20 Jun 2024 11:03:50 +0400 Subject: [PATCH 1/3] add support for custom cluster name --- backend/btrixcloud/k8sapi.py | 3 ++- chart/admin/logging/templates/fluentd.yaml | 2 +- chart/templates/configmap.yaml | 2 +- chart/templates/frontend.yaml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/btrixcloud/k8sapi.py b/backend/btrixcloud/k8sapi.py index 3ba7f965..18b3ffe6 100644 --- a/backend/btrixcloud/k8sapi.py +++ b/backend/btrixcloud/k8sapi.py @@ -28,6 +28,7 @@ class K8sAPI: def __init__(self): super().__init__() self.namespace = os.environ.get("CRAWLER_NAMESPACE") or "crawlers" + self.browser_sufix = os.environ.get("CRAWLER_FQDN_SUFFIX") or ".crawlers.svc.k.brass.host" self.custom_resources = {} self.templates = Jinja2Templates( @@ -62,7 +63,7 @@ class K8sAPI: def get_redis_url(self, crawl_id): """get redis url for crawl id""" redis_url = ( - f"redis://redis-{crawl_id}.redis.{self.namespace}.svc.cluster.local/0" + f"redis://redis-{crawl_id}.redis.{self.namespace}{self.browser_suffix}/0" ) return redis_url diff --git a/chart/admin/logging/templates/fluentd.yaml b/chart/admin/logging/templates/fluentd.yaml index 1f48a03e..78d4fe6a 100644 --- a/chart/admin/logging/templates/fluentd.yaml +++ b/chart/admin/logging/templates/fluentd.yaml @@ -122,7 +122,7 @@ spec: fieldPath: spec.nodeName {{ if not .Values.logging.fileMode }} - name: FLUENT_ELASTICSEARCH_HOST - value: "btrixlog-es-http.{{ .Values.logging.namespace | default "btrix-admin" }}.svc.cluster.local" + value: "btrixlog-es-http.{{ .Values.logging.namespace | default "btrix-admin" }}.svc.{{.Values.cluster_domain | default "cluster.local" }}" - name: FLUENT_ELASTICSEARCH_PORT value: "9200" - name: FLUENT_ELASTICSEARCH_SCHEME diff --git a/chart/templates/configmap.yaml b/chart/templates/configmap.yaml index dfd6bd93..380f46c6 100644 --- a/chart/templates/configmap.yaml +++ b/chart/templates/configmap.yaml @@ -14,7 +14,7 @@ data: FRONTEND_ORIGIN: {{ .Values.frontend_alias | default "http://browsertrix-cloud-frontend" }} - CRAWLER_FQDN_SUFFIX: ".{{ .Values.crawler_namespace }}.svc.cluster.local" + CRAWLER_FQDN_SUFFIX: ".{{ .Values.crawler_namespace }}.svc.{{.Values.cluster_domain | default "cluster.local" }}" DEFAULT_ORG: "{{ .Values.default_org }}" diff --git a/chart/templates/frontend.yaml b/chart/templates/frontend.yaml index 45278586..40de84ad 100644 --- a/chart/templates/frontend.yaml +++ b/chart/templates/frontend.yaml @@ -41,7 +41,7 @@ spec: value: {{ .Values.name }}-backend - name: CRAWLER_FQDN_SUFFIX - value: ".{{ .Values.crawler_namespace }}.svc.cluster.local" + value: ".{{ .Values.crawler_namespace }}.svc.{{.Values.cluster_domain | default "cluster.local" }}" - name: NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE value: "1" From 7b25b0f15dfbcb9d5989d63a9bacd44de09a03f1 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 20 Jun 2024 13:23:05 +0400 Subject: [PATCH 2/3] add support for custom cluster name --- backend/btrixcloud/k8sapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/btrixcloud/k8sapi.py b/backend/btrixcloud/k8sapi.py index 18b3ffe6..76f1b3e5 100644 --- a/backend/btrixcloud/k8sapi.py +++ b/backend/btrixcloud/k8sapi.py @@ -28,7 +28,7 @@ class K8sAPI: def __init__(self): super().__init__() self.namespace = os.environ.get("CRAWLER_NAMESPACE") or "crawlers" - self.browser_sufix = os.environ.get("CRAWLER_FQDN_SUFFIX") or ".crawlers.svc.k.brass.host" + self.browser_suffix = os.environ.get("CRAWLER_FQDN_SUFFIX") or ".crawlers.svc.cluster.local" self.custom_resources = {} self.templates = Jinja2Templates( @@ -63,7 +63,7 @@ class K8sAPI: def get_redis_url(self, crawl_id): """get redis url for crawl id""" redis_url = ( - f"redis://redis-{crawl_id}.redis.{self.namespace}{self.browser_suffix}/0" + f"redis://redis-{crawl_id}.redis{self.browser_suffix}/0" ) return redis_url From 5acaf798dd642b4e5bfec661fc1b1b52ea958076 Mon Sep 17 00:00:00 2001 From: Aleksey Date: Tue, 12 Aug 2025 13:35:57 +0000 Subject: [PATCH 3/3] some rework for resolver configuration --- frontend/00-browsertrix-nginx-init.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/00-browsertrix-nginx-init.sh b/frontend/00-browsertrix-nginx-init.sh index afb5ba16..658ef89e 100755 --- a/frontend/00-browsertrix-nginx-init.sh +++ b/frontend/00-browsertrix-nginx-init.sh @@ -13,6 +13,5 @@ else fi mkdir -p /etc/nginx/resolvers/ -echo resolver $(awk 'BEGIN{ORS=" "} $1=="nameserver" {print $2}' /etc/resolv.conf) valid=10s ipv6=off";" > /etc/nginx/resolvers/resolvers.conf - +sed /etc/resolv.conf -nre '/nameserver/ {s/nameserver/resolver/;s/\b([a-f0-9:]+:[a-f0-9:]+)\b/[\1]/; s/$/valid=10s;/;p}' > /etc/nginx/resolvers/resolvers.conf cat /etc/nginx/resolvers/resolvers.conf