Revert "Support configuring multiple OF controllers in ofagents"
This reverts commit 8916892a520a60efb847c61c3054da45cb28bdd8.
Change-Id: Iac27757a9ed44d9d180d5ec5cbf5ee2e542a3622
diff --git a/voltha/templates/ofagent-go.yaml b/voltha/templates/ofagent-go.yaml
index f8f2cc2..07c2b94 100644
--- a/voltha/templates/ofagent-go.yaml
+++ b/voltha/templates/ofagent-go.yaml
@@ -64,15 +64,15 @@
image: '{{ tpl .Values.images.ofagent_go.registry . }}{{ tpl .Values.images.ofagent_go.repository . }}:{{ tpl .Values.images.ofagent_go.tag . }}'
imagePullPolicy: {{ tpl .Values.images.ofagent_go.pullPolicy . }}
env:
+ - name: CONTROLLER_SERVICE
+ value: "{{ .Values.services.controller.service }}:{{ .Values.services.controller.port }}"
- name: COMPONENT_NAME
valueFrom:
fieldRef:
fieldPath: metadata.labels['app.kubernetes.io/name']
args:
- "/app/ofagent"
- {{- range .Values.services.controller }}
- - "--controller={{ .service }}:{{ .port }}"
- {{- end }}
+ - "--controller=$(CONTROLLER_SERVICE)"
- "--voltha=voltha-api.{{ .Release.Namespace }}.svc.cluster.local:55555"
- "--kv_store_host=voltha-etcd-cluster-client.{{ .Release.Namespace }}.svc.cluster.local"
- "--kv_store_port=2379"
diff --git a/voltha/templates/ofagent-py.yaml b/voltha/templates/ofagent-py.yaml
index 711c4d6..7996d80 100644
--- a/voltha/templates/ofagent-py.yaml
+++ b/voltha/templates/ofagent-py.yaml
@@ -63,13 +63,13 @@
- name: ofagent
image: '{{ tpl .Values.images.ofagent_py.registry . }}{{ tpl .Values.images.ofagent_py.repository . }}:{{ tpl .Values.images.ofagent_py.tag . }}'
imagePullPolicy: {{ tpl .Values.images.ofagent_py.pullPolicy . }}
+ env:
+ - name: CONTROLLER_SERVICE
+ value: "{{ .Values.services.controller.service }}:{{ .Values.services.controller.port }}"
args:
- "/ofagent/ofagent/main.py"
- "-v"
- - "--controller"
- {{- range .Values.services.controller }}
- - "{{ .service }}:{{ .port }}"
- {{- end }}
+ - "--controller=$(CONTROLLER_SERVICE)"
- "--grpc-endpoint=voltha-api.{{ .Release.Namespace }}.svc.cluster.local:55555"
- "--probe=:8080"
livenessProbe: