Merge branch 'brass-host' of ssh://git.brass.host:999/tea/browsertrix into brass-host

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_suffix = os.environ.get("CRAWLER_FQDN_SUFFIX") or ".crawlers.svc.cluster.local"
         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.browser_suffix}/0"
         )
         return redis_url
 

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

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 }}"
 

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"

frontend/00-browsertrix-nginx-init.sh

@@ -24,6 +24,5 @@ else
 fi
 
 mkdir -p /etc/nginx/resolvers/
-echo resolver $(grep -oP '(?<=nameserver\s)[^\s]+' /etc/resolv.conf | awk '{ if ($1 ~ /:/) { printf "[" $1 "] "; } else { printf $1 " "; } }') 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