Merge branch 'testing'

nimbix · Jul 12, 2024 · 61ac52b · 61ac52b
2 parents 20b055c + 289e4ec
commit 61ac52b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/templates/jarvice-bird.yaml b/templates/jarvice-bird.yaml
@@ -196,9 +196,9 @@ spec:
         env:
           - name: JARVICE_SERVER_PROXY
 {{- if empty .Values.jarvice.JARVICE_SYSTEM_NAMESPACE }}
-            value: "http://jarvice-bird-server.{{ .Release.Namespace }}.svc.cluster.local:9090/"
+            value: "http://jarvice-bird-server.{{ .Release.Namespace }}.svc.{{ .Values.jarvice.JARVICE_K8S_CLUSTER_DOMAIN }}:9090/"
 {{- else }}
-            value: "http://jarvice-bird-server.{{ .Values.jarvice.JARVICE_SYSTEM_NAMESPACE }}.svc.cluster.local:9090/"
+            value: "http://jarvice-bird-server.{{ .Values.jarvice.JARVICE_SYSTEM_NAMESPACE }}.svc.{{ .Values.jarvice.JARVICE_K8S_CLUSTER_DOMAIN }}:9090/"
 {{- end }}
           - name: KEYCLOAK_URL
 {{- if (not (empty .Values.jarvice_bird.env.KEYCLOAK_URL)) }}

diff --git a/terraform/modules/common/locals.tf b/terraform/modules/common/locals.tf
@@ -66,9 +66,12 @@ locals {
 }
 
 locals {
+    dns_domain = lookup(var.cluster.helm.jarvice, "dns_domain", null) != null ? lookup(var.cluster.helm.jarvice, "dns_domain", null) : lookup(var.global.helm.jarvice, "dns_domain", "cluster.local")
     cluster_values_yaml = <<EOF
 # common cluster override values
 jarvice:
+  JARVICE_K8S_CLUSTER_DOMAIN: ${local.dns_domain}
+
   tolerations: '[{"key": "node-role.jarvice.io/jarvice-system", "effect": "NoSchedule", "operator": "Exists"}]'
   nodeAffinity: '{"requiredDuringSchedulingIgnoredDuringExecution": {"nodeSelectorTerms": [{"matchExpressions": [{"key": "node-role.jarvice.io/jarvice-system", "operator": "Exists"}]}, {"matchExpressions": [{"key": "node-role.kubernetes.io/jarvice-system", "operator": "Exists"}]}] }}'
 

diff --git a/values.yaml b/values.yaml
@@ -99,7 +99,7 @@ jarvice:
   JARVICE_HTTP_PROXY:          # "http://proxy.my-domain.com:8080"
   JARVICE_HTTPS_PROXY:         # "https://proxy.my-domain.com:8080"
   JARVICE_NO_PROXY:            # "my-other-domain.com,192.168.1.10,domain.com:8080"
-  JARVICE_K8S_CLUSTER_DOMAIN:  # "cluster.local"
+  JARVICE_K8S_CLUSTER_DOMAIN:  "cluster.local"
 
   JARVICE_MAIL_SERVER: jarvice-smtpd:25
   JARVICE_MAIL_USERNAME: # "mail-username"