fix: dynamic broker host FQDNS

csye7125-fall2023-group05 · Dec 8, 2023 · 6f9c517 · 6f9c517
1 parent be13c3c
commit 6f9c517
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/templates/istio_virtual_service.yaml b/templates/istio_virtual_service.yaml
@@ -5,28 +5,28 @@ metadata:
   namespace: {{ .Values.istio.namespace }}
 spec:
   hosts:
-  - {{ .Values.istio.hostname.kafka_broker_0 }}
-  - {{ .Values.istio.hostname.kafka_broker_1 }}
-  - {{ .Values.istio.hostname.kafka_broker_2 }}
+  - {{ .Release.Name }}-kafka-broker-0.{{ .Release.Name }}-kafka-broker-headless.{{ .Values.namespace }}.svc.cluster.local
+  - {{ .Release.Name }}-kafka-broker-1.{{ .Release.Name }}-kafka-broker-headless.{{ .Values.namespace }}.svc.cluster.local
+  - {{ .Release.Name }}-kafka-broker-2.{{ .Release.Name }}-kafka-broker-headless.{{ .Values.namespace }}.svc.cluster.local
   tcp:
   - match:
-    - port: {{ .Values.istio.port.kafka_port }}  # to match the gateway port basically to bind this to gateway
+    - port: {{ .Values.configs.kafka_port}}  # to match the gateway port basically to bind this to gateway
     route:
     - destination:
-        host: {{ .Values.istio.hostname.kafka_broker_0 }}
+        host: {{ .Release.Name }}-kafka-broker-0.{{ .Release.Name }}-kafka-broker-headless.{{ .Values.namespace }}.svc.cluster.local
         port:
-          number: {{ .Values.istio.port.kafka_port }}
+          number: {{ .Values.configs.kafka_port}}
   - match:
-    - port: {{ .Values.istio.port.kafka_port }}  # to match the gateway port basically to bind this to gateway
+    - port: {{ .Values.configs.kafka_port}}  # to match the gateway port basically to bind this to gateway
     route:
     - destination:
-        host: {{ .Values.istio.hostname.kafka_broker_1 }}
+        host: {{ .Release.Name }}-kafka-broker-1.{{ .Release.Name }}-kafka-broker-headless.{{ .Values.namespace }}.svc.cluster.local
         port:
-          number: {{ .Values.istio.port.kafka_port }}
+          number: {{ .Values.configs.kafka_port}}
   - match:
-    - port: {{ .Values.istio.port.kafka_port }}  # to match the gateway port basically to bind this to gateway
+    - port: {{ .Values.configs.kafka_port}}  # to match the gateway port basically to bind this to gateway
     route:
     - destination:
-        host: {{ .Values.istio.hostname.kafka_broker_2 }}
+        host: {{ .Release.Name }}-kafka-broker-2.{{ .Release.Name }}-kafka-broker-headless.{{ .Values.namespace }}.svc.cluster.local
         port:
-          number: {{ .Values.istio.port.kafka_port }}
+          number: {{ .Values.configs.kafka_port}}
diff --git a/values.yaml b/values.yaml
@@ -63,12 +63,6 @@ psql:
 
 istio:
   namespace: istio-system
-  port:
-    kafka_port: 9094
-  hostname:
-    kafka_broker_0: infra-helm-release-kafka-broker-0.infra-helm-release-kafka-broker-headless.deps.svc.cluster.local
-    kafka_broker_1: infra-helm-release-kafka-broker-1.infra-helm-release-kafka-broker-headless.deps.svc.cluster.local
-    kafka_broker_2: infra-helm-release-kafka-broker-2.infra-helm-release-kafka-broker-headless.deps.svc.cluster.local
 
 postgresql:
   image: