[VOL-2666] - Create Helm Charts for Golang OpenONU Adapter
- review comments considered
- args changed for call of openonugo
Change-Id: I530bc04781e228705a7de364868023e30d4d35eb
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index b432692..03518ed 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.2.2
+version: 2.2.3
appVersion: 2.3.2
diff --git a/voltha-adapter-openonu/templates/adapters-openonu-go.yaml b/voltha-adapter-openonu/templates/adapters-openonu-go.yaml
new file mode 100644
index 0000000..74fd58a
--- /dev/null
+++ b/voltha-adapter-openonu/templates/adapters-openonu-go.yaml
@@ -0,0 +1,93 @@
+{{- if and (hasKey .Values "use_openonu_adapter_go") .Values.use_openonu_adapter_go }}
+# Copyright 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- $log_level := tpl .Values.adapter_open_onu.log_level . | upper }}
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: adapter-open-onu
+ namespace: {{ .Release.Namespace }}
+ {{- if or (hasKey .Values "extra_deployment_labels") (hasKey .Values "openonu_deployment_labels") }}
+ labels:
+ {{- if hasKey .Values "extra_deployment_labels" }}
+ {{- range $key, $val := .Values.extra_deployment_labels }}
+ {{ $key }}: {{ $val | quote }}
+ {{- end }}
+ {{- end }}
+ {{- if hasKey .Values "openonu_deployment_labels" }}
+ {{- range $key, $val := .Values.openonu_deployment_labels }}
+ {{ $key }}: {{ $val | quote }}
+ {{- end }}
+ {{- end }}
+ {{- end }}
+spec:
+ replicas: {{ .Values.replicas.adapter_open_onu }}
+ selector:
+ matchLabels:
+ app: adapter-open-onu
+ template:
+ metadata:
+ labels:
+ app: adapter-open-onu
+ app.kubernetes.io/name: "adapter-open-onu"
+ app.kubernetes.io/version: {{ quote .Chart.AppVersion }}
+ app.kubernetes.io/component: "adapter"
+ app.kubernetes.io/part-of: "voltha"
+ app.kubernetes.io/managed-by: {{ quote .Release.Service }}
+ helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ {{- if hasKey .Values "extra_pod_labels" }}
+ {{- range $key, $val := .Values.extra_pod_labels }}
+ {{ $key }}: {{ $val | quote }}
+ {{- end }}
+ {{- end }}
+ {{- if hasKey .Values "openonu_pod_labels" }}
+ {{- range $key, $val := .Values.openonu_pod_labels }}
+ {{ $key }}: {{ $val | quote }}
+ {{- end }}
+ {{- end }}
+ annotations:
+ cni: "calico"
+ spec:
+ containers:
+ - name: adapter-open-onu
+ image: '{{ tpl .Values.images.adapter_open_onu.registry . }}{{ tpl .Values.images.adapter_open_onu_go.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_onu_go.tag . ) . }}'
+ imagePullPolicy: {{ tpl .Values.images.adapter_open_onu_go.pullPolicy . }}
+ args:
+ - "/app/openonugo"
+ - "--banner=true"
+ - "--kafka_reconnect_retries=-1"
+ - "--kafka_adapter_host={{ .Values.services.kafka.adapter.service }}"
+ - "--kafka_adapter_port={{ .Values.services.kafka.adapter.port }}"
+ - "--kafka_cluster_host={{ .Values.services.kafka.cluster.service }}"
+ - "--kafka_cluster_port={{ .Values.services.kafka.cluster.port }}"
+ - "--core_topic=rwcore"
+ - "--adapter_topic=brcm_openomci_onu"
+ - "--kv_store_host={{ .Values.services.etcd.service }}"
+ - "--kv_store_port={{ .Values.services.etcd.port }}"
+ - "--log_level={{ $log_level }}"
+ - "--probe_port=8080"
+ livenessProbe:
+ httpGet:
+ path: /healthz
+ port: 8080
+ initialDelaySeconds: 10
+ periodSeconds: 5
+ readinessProbe:
+ httpGet:
+ path: /readz
+ port: 8080
+ initialDelaySeconds: 10
+ periodSeconds: 5
+{{- end }}
\ No newline at end of file
diff --git a/voltha-adapter-openonu/templates/adapters-openonu.yaml b/voltha-adapter-openonu/templates/adapters-openonu.yaml
index 3c72078..c857fbc 100644
--- a/voltha-adapter-openonu/templates/adapters-openonu.yaml
+++ b/voltha-adapter-openonu/templates/adapters-openonu.yaml
@@ -1,3 +1,4 @@
+{{- if not (and (hasKey .Values "use_openonu_adapter_go") .Values.use_openonu_adapter_go) }}
# Copyright 2019-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -89,3 +90,4 @@
port: 8080
initialDelaySeconds: 10
periodSeconds: 5
+{{- end }}
\ No newline at end of file
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index eb4bbfe..a8a57ca 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -13,6 +13,8 @@
# limitations under the License.
---
+use_openonu_adapter_go: false
+
# Default overrides
defaults:
log_level: "WARN"
@@ -49,3 +51,7 @@
repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter'
tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
+ adapter_open_onu_go:
+ repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter-go'
+ tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
+ pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
\ No newline at end of file