[VOL-3768] Passing list of allowed vendor IDs trough helm as a startup parameter
Change-Id: I21352077a3c6803e1869188a18356a89a44af455
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 2b88f3f..b4ce283 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openonu"
-version: "2.7.2"
+version: "2.7.3"
description: "A Helm chart for Voltha OpenONU Adapter"
keywords:
- "onf"
diff --git a/voltha-adapter-openonu/templates/_helpers.tpl b/voltha-adapter-openonu/templates/_helpers.tpl
index bf89b45..2cf8200 100644
--- a/voltha-adapter-openonu/templates/_helpers.tpl
+++ b/voltha-adapter-openonu/templates/_helpers.tpl
@@ -15,9 +15,15 @@
{{- define "name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
+
{{/* Create a default fully qualified app name. We truncate at 63 chars because . . . */}}
{{- define "fullname" -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- $fullname := default (printf "%s-%s" .Release.Name $name) .Values.fullNameOverride -}}
{{- $fullname | trunc 63 | trimSuffix "-" -}}
{{- end -}}
+
+{{/* Comma separated list of allowed ONU Vendors */}}
+{{- define "allowed_onu_vendors" -}}
+{{- join "," .Values.allowed_onu_vendors}}
+{{- end -}}
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index 84bb42b..500db47 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -98,6 +98,7 @@
- "--max_timeout_interadapter_comm={{ tpl .Values.adapter_open_onu.max_timeout_interadapter_comm . }}"
- "--trace_enabled={{ .Values.global.tracing.enabled }}"
- "--trace_agent_address={{ tpl .Values.services.tracing_agent.address . }}"
+ - "--allowed_onu_vendors={{ template "allowed_onu_vendors" . }}"
{{- if .Values.securityContext.enabled }}
securityContext:
allowPrivilegeEscalation: false
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 54dbca6..f9f105a 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -65,6 +65,25 @@
tracing_agent:
address: jaeger-agent:6831
+allowed_onu_vendors:
+ - OPEN
+ - ALCL
+ - BRCM
+ - TWSH
+ - ALPH
+ - ISKT
+ - SFAA
+ - BBSM
+ - SCOM
+ - ARPX
+ - DACM
+ - ERSN
+ - HWTC
+ - CIGG
+ - ADTN
+ - ARCA
+ - AVMG
+
# Define the recplica count for everything
replicas:
adapter_open_onu: 1
@@ -83,10 +102,10 @@
adapter_open_onu:
registry: '{{ .Values.global.image_registry }}'
repository: '{{ .Values.global.image_org }}voltha-openonu-adapter'
- tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.5.0{{- end }}{{- else }}2.5.0{{- end }}'
+ tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.7.0{{- end }}{{- else }}2.7.0{{- end }}'
pullPolicy: '{{ .Values.global.image_pullPolicy }}'
adapter_open_onu_go:
registry: '{{ .Values.global.image_registry }}'
repository: '{{ .Values.global.image_org }}voltha-openonu-adapter-go'
- tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}0.1.15{{- end }}{{- else }}0.1.15{{- end }}'
+ tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}1.1.0{{- end }}{{- else }}1.1.0{{- end }}'
pullPolicy: '{{ .Values.global.image_pullPolicy }}'