Update DI utility config
Change-Id: I9381b91cd868c46eb5c8ef857c9864581996a6d5
diff --git a/di-topology-watchdog/Chart.yaml b/di-topology-watchdog/Chart.yaml
index 020a77e..52d2270 100644
--- a/di-topology-watchdog/Chart.yaml
+++ b/di-topology-watchdog/Chart.yaml
@@ -4,4 +4,4 @@
appVersion: "1.0"
description: A Helm chart for Deep Insight topology watchdog
name: di-topology-watchdog
-version: 0.0.4
+version: 0.0.5
diff --git a/di-topology-watchdog/templates/deployment.yaml b/di-topology-watchdog/templates/deployment.yaml
index 9797fa4..880e31e 100644
--- a/di-topology-watchdog/templates/deployment.yaml
+++ b/di-topology-watchdog/templates/deployment.yaml
@@ -19,11 +19,11 @@
- name: wait-onos-api
image: curlimages/curl:7.78.0
imagePullPolicy: IfNotPresent
- command: ['sh', '-c', "until curl -I -s {{ .Values.onosAddr }}; do echo waiting for ONOS API; sleep 2; done"]
+ command: ['sh', '-c', "until curl -I -s {{ .Values.onosAddr }}:{{ .Values.onosPort }}; do echo waiting for ONOS API; sleep 2; done"]
- name: wait-di-api
image: curlimages/curl:7.78.0
imagePullPolicy: IfNotPresent
- command: ['sh', '-c', "until curl -I -s -k https://{{ .Values.diAddr }}; do echo waiting for gateway svc; sleep 2; done"]
+ command: ['sh', '-c', "until curl -I -s -k https://{{ .Values.diAddr }}:{{ .Values.diPort }}; do echo waiting for gateway svc; sleep 2; done"]
containers:
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -32,8 +32,12 @@
- "./topo_watchdog"
- "--di-addr"
- "{{ .Values.diAddr }}"
+ - "--di-port"
+ - "{{ .Values.diPort }}"
- "--onos-addr"
- "{{ .Values.onosAddr }}"
+ - "--onos-port"
+ - "{{ .Values.onosPort }}"
{{- if .Values.withEndHost }}
- "--k8s-subnet"
- "{{ .Values.k8sSubnet }}"
@@ -43,6 +47,11 @@
{{- if .Values.enableP4RuntimeTranslation }}
- "--enable-p4runtime-translation"
{{- end }}
+ {{- if .Values.withUp4 }}
+ - "--with-up4"
+ - "--up4-port"
+ - "{{ .Values.up4Port }}"
+ {{- end }}
{{- if hasKey .Values.image "pullSecrets" }}
imagePullSecrets:
{{- range .Values.image.pullSecrets }}
diff --git a/di-topology-watchdog/values.yaml b/di-topology-watchdog/values.yaml
index b365376..8763e96 100644
--- a/di-topology-watchdog/values.yaml
+++ b/di-topology-watchdog/values.yaml
@@ -6,9 +6,16 @@
tag: 4.2.0-ONF
pullPolicy: Always
replicas: 1
-onosAddr: sdfabric-onos-classic-hs:8181
-diAddr: gateway-service-internal.deepinsight:3030
+onosAddr: sdfabric-onos-classic-hs
+onosPort: 8181
+diAddr: gateway-service-internal.deepinsight
+diPort: 3030
withEndHost: false
enableP4RuntimeTranslation: false
# k8sSubnet: 10.128.13.0/24 # The cluster subnet
# nodeIfaceNo: 1 # Default K8s node interface number retrieved via `ip link`.
+
+# Enable UP4 support, the topology watch dog will try to get UE subnets from UP4 app via
+# P4Runtime protocol.
+withUp4: false
+up4Port: 51001