commit 5b2eaa8481e094f13f737eb474c0ffbb55fea99b
author Scott Baker <smbaker@gmail.com> Tue Dec 17 11:24:00 2019 -0800
committer Scott Baker <smbaker@gmail.com> Tue Dec 17 16:27:52 2019 -0800
tree 848d0f868280d41051ec6426ecf0c922fdc882e2
parent c250dddbab16e262776c51566f8239323e36aec3

VOL-2371 Pre-release voltha 2.2.0;
Remove multi-core configurations

Change-Id: I8445190a5c9e156cf454fc33bd1d37507dc5e304

voltha/values.yaml

diff --git a/voltha/values.yaml b/voltha/values.yaml
index 8d288a7..bea3bb3 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -16,7 +16,6 @@
 serviceaccount: voltha-serviceaccount
 private_etcd_cluster: true
 private_kafka_cluster: true
-therecanbeonlyone: false
 
 # Default Values
 # The following are the default values used for every container in the
@@ -71,14 +70,8 @@
   rw_core: 1
 
   # For everything else replicas are replicas
-  cli: 1
   ofagent: 1
-  ro_core: 1
-  afrouter: 1
-  afrouterd: 1
 
-ro_core:
-  log_level: '{{ .Values.defaults.log_level }}'
 
 rw_core:
   log_level: '{{ .Values.defaults.log_level }}'
@@ -86,44 +79,18 @@
   timeout_long_request: '{{ .Values.defaults.rw_core.timeout }}'
   timeout_request: '{{ .Values.defaults.rw_core.timeout }}'
 
-api_server:
-  kafka_topic: 'affinityRouter'
 
 # Define Docker images to be used
 images:
-  cli:
-    registry: '{{ .Values.defaults.image_registry }}'
-    repository: '{{ .Values.defaults.image_org }}voltha-cli'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.2{{- end }}{{- else }}2.2.2{{- end }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
-
   ofagent:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-ofagent'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.2{{- end }}{{- else }}2.2.2{{- end }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
-
-  ro_core:
-    registry: '{{ .Values.defaults.image_registry }}'
-    repository: '{{ .Values.defaults.image_org }}voltha-ro-core'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.2{{- end }}{{- else }}2.2.2{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.3{{- end }}{{- else }}2.2.3{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   rw_core:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-rw-core'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.2{{- end }}{{- else }}2.2.2{{- end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.3{{- end }}{{- else }}2.2.3{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
-  afrouter:
-    registry: '{{ .Values.defaults.image_registry }}'
-    repository: '{{ .Values.defaults.image_org }}voltha-afrouter'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.2{{- end }}{{- else }}2.2.2{{- end }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
-
-  afrouterd:
-    registry: '{{ .Values.defaults.image_registry }}'
-    repository: '{{ .Values.defaults.image_org }}voltha-afrouterd'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.2{{- end }}{{- else }}2.2.2{{- end }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
-    restartPolicy: 'Always'