tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add support for custom cluster name

Browse Source
This commit is contained in:
Aleksey 2024-06-20 11:03:50 +04:00
parent c0cf6e6fdc
commit fbb54993bf
Signed by: tea
GPG Key ID: D9C68D34A3CAE37A
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/btrixcloud/k8sapi.py
View File

@ -29,6 +29,7 @@ class K8sAPI:
def __init__(self): def __init__(self):
super().__init__() super().__init__()
self.namespace = os.environ.get("CRAWLER_NAMESPACE") or "crawlers" 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.custom_resources = {}
self.templates = Jinja2Templates( self.templates = Jinja2Templates(
@ -63,7 +64,7 @@ class K8sAPI:
def get_redis_url(self, crawl_id): def get_redis_url(self, crawl_id):
"""get redis url for crawl id""" """get redis url for crawl id"""
redis_url = ( 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 return redis_url

2
chart/admin/logging/templates/fluentd.yaml
View File

@ -122,7 +122,7 @@ spec:
fieldPath: spec.nodeName fieldPath: spec.nodeName
{{ if not .Values.logging.fileMode }} {{ if not .Values.logging.fileMode }}
- name: FLUENT_ELASTICSEARCH_HOST - 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 - name: FLUENT_ELASTICSEARCH_PORT
value: "9200" value: "9200"
- name: FLUENT_ELASTICSEARCH_SCHEME - name: FLUENT_ELASTICSEARCH_SCHEME

2
chart/templates/configmap.yaml
View File

@ -14,7 +14,7 @@ data:
FRONTEND_ORIGIN: {{ .Values.frontend_alias | default "http://browsertrix-cloud-frontend" }} 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 }}" DEFAULT_ORG: "{{ .Values.default_org }}"

2
chart/templates/frontend.yaml
View File

@ -41,7 +41,7 @@ spec:
value: {{ .Values.name }}-backend value: {{ .Values.name }}-backend
- name: CRAWLER_FQDN_SUFFIX - 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 - name: NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE
value: "1" value: "1"