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
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 7c243a4..3adaf3c 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for Voltha OpenOLT Adapter
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.0.3
-appVersion: 2.0.0
+version: 2.1.0
+appVersion: 2.1.1
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}}
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index affb839..660e18d 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -13,16 +13,12 @@
# limitations under the License.
---
-use_go: false
-
# Default overrides
defaults:
image_registry: ""
- image_tag: "::DEFAULT::"
+ image_tag: '{{ .Chart.AppVersion }}'
image_org: "voltha/"
image_pullPolicy: "Always"
- default_go_image_tag: "master-go"
- default_py_image_tag: '{{ .Chart.AppVersion }}'
# Define connectivity to required services
services:
@@ -47,6 +43,5 @@
adapter_open_olt:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-openolt-adapter'
- tag_go: '{{ .Values.defaults.image_tag }}'
tag: '{{ .Values.defaults.image_tag }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index bdb4089..aae9589 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for Voltha OpenONU Adapter
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.0.3
-appVersion: 2.0.0
+version: 2.1.0
+appVersion: 2.1.0
diff --git a/voltha-adapter-simulated/Chart.yaml b/voltha-adapter-simulated/Chart.yaml
index 760d9dd..43340fd 100644
--- a/voltha-adapter-simulated/Chart.yaml
+++ b/voltha-adapter-simulated/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for Voltha Simulated Adaptyer based on K8S resources in Voltha project
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.0.3
-appVersion: 2.0.0
+version: 2.1.0
+appVersion: 2.1.1
diff --git a/voltha-etcd-cluster/Chart.yaml b/voltha-etcd-cluster/Chart.yaml
index 7da847d..b0923bc 100644
--- a/voltha-etcd-cluster/Chart.yaml
+++ b/voltha-etcd-cluster/Chart.yaml
@@ -17,4 +17,4 @@
description: Create an etcd-cluster using etcd-operator provided CRD
icon: https://guide.opencord.org/logos/cord.svg
name: voltha-etcd-cluster
-version: 2.0.2
+version: 2.1.0
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 8982087..229a3c4 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for Voltha based on K8S resources in Voltha project
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.0.13
-appVersion: 2.0.0
+version: 2.1.0
+appVersion: 2.1.1
diff --git a/voltha/requirements.yaml b/voltha/requirements.yaml
index 20832fd..f671d8a 100644
--- a/voltha/requirements.yaml
+++ b/voltha/requirements.yaml
@@ -20,5 +20,5 @@
condition: private_kafka_cluster
- name: voltha-etcd-cluster
repository: file://../voltha-etcd-cluster
- version: 2.0.2
+ version: 2.1.0
condition: private_etcd_cluster
diff --git a/voltha/templates/ofagent.yaml b/voltha/templates/ofagent.yaml
index 6ff7c03..a2d2086 100644
--- a/voltha/templates/ofagent.yaml
+++ b/voltha/templates/ofagent.yaml
@@ -16,7 +16,7 @@
apiVersion: apps/v1beta1
kind: Deployment
metadata:
- name: ofagent
+ name: voltha-ofagent
serviceAccountName: {{ .Values.serviceaccount }}
spec:
replicas: {{ .Values.replicas.ofagent }}