commit 0b44de179de0ee444a0ff96c977ad3cfb072e894
author David Bainbridge <dbainbri@ciena.com> Wed Aug 21 21:00:35 2019 +0000
committer David Bainbridge <dbainbri@ciena.com> Wed Aug 21 21:02:29 2019 +0000
tree 12b31f4eb65ed0f84135d635650350bec6314d98
parent 9601c1d951ac1767d2184f5b0be04fb61256d9a5

VOL-1874 - update image versions to released

also:
- removed the optional python version of olt adapter
- changed the name on ofagent pod to voltha-ofagent to
  be like other pods

Change-Id: Ied8487adecd19dddf01abf85adc595d4e5200733

voltha-adapter-openolt/templates/adapters-openolt.yaml

diff --git a/voltha-adapter-openolt/templates/adapters-openolt.yaml b/voltha-adapter-openolt/templates/adapters-openolt.yaml
index e4b9f1b..c410fd1 100644
--- a/voltha-adapter-openolt/templates/adapters-openolt.yaml
+++ b/voltha-adapter-openolt/templates/adapters-openolt.yaml
@@ -37,22 +37,9 @@
     spec:
       containers:
         - name: adapter-open-olt
-          {{- if .Values.use_go }}
-          {{- $image_tag := tpl .Values.images.adapter_open_olt.tag_go . }}
-          {{- if eq "::DEFAULT::" $image_tag }}
-          {{- $image_tag = .Values.defaults.default_go_image_tag }}
-          {{- end }}
-          image: {{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ $image_tag }}
-          {{- else }}
-          {{- $image_tag := tpl .Values.images.adapter_open_olt.tag . }}
-          {{- if eq "::DEFAULT::" $image_tag }}
-          {{- $image_tag = .Values.defaults.default_py_image_tag }}
-          {{- end }}
-          image: {{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ $image_tag }}
-          {{- end }}
+          image: {{ tpl .Values.images.adapter_open_olt.registry . }}{{ tpl .Values.images.adapter_open_olt.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_olt.tag . ) . }}
           imagePullPolicy: {{ tpl .Values.images.adapter_open_olt.pullPolicy . }}
           args:
-            {{- if .Values.use_go }}
             - "/app/openolt"
             - "--kafka_adapter_host={{ .Values.services.kafka.adapter.service }}"
             - "--kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
@@ -61,12 +48,3 @@
             - "--core_topic=rwcore"
             - "--kv_store_host={{ .Values.services.etcd.service }}"
             - "--kv_store_port={{ .Values.services.etcd.port }}"
-            {{- else}}
-            - "/voltha/adapters/openolt/main.py"
-            - "--verbose"
-            - "--kafka_adapter={{ .Values.services.kafka.adapter.service }}:{{ .Values.services.kafka.adapter.port }}"
-            - "--kafka_cluster={{ .Values.services.kafka.cluster.service }}:{{ .Values.services.kafka.cluster.port }}"
-            - "--core_topic=rwcore"
-            - "--backend=etcd"
-            - "--etcd={{ .Values.services.etcd.service }}:{{ .Values.services.etcd.port }}"
-            {{- end}}