diff --git a/backend/btrixcloud/k8sapi.py b/backend/btrixcloud/k8sapi.py index f878872c..8aa108b8 100644 --- a/backend/btrixcloud/k8sapi.py +++ b/backend/btrixcloud/k8sapi.py @@ -29,6 +29,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( @@ -63,7 +64,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 7fd35cd7..ead78190 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 }}{{ .Values.fqdn_suffix }}" + 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 8d060f6a..b679690a 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 }}{{ .Values.fqdn_suffix }}" + value: ".{{ .Values.crawler_namespace }}.svc.{{.Values.cluster_domain | default "cluster.local" }}" - name: NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE value: "1"