[VOL-4285] Helm charts for grpc migration
Change-Id: Ifa3423b43b236bab6c9de437b1dd7045069fe5de
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index a089697..258c20a 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.9.6"
+version: "2.9.7"
description: "A Helm chart for Voltha OpenONU Adapter"
keywords:
- "onf"
@@ -33,4 +33,4 @@
# appVersion refers to multiple components with potentially different
# container image versions.
-appVersion: "1.3.13"
+appVersion: "2.0.0"
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index 72c2771..2360d84 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -82,10 +82,9 @@
- "/app/openonu"
- "--banner=true"
- "--kafka_reconnect_retries=-1"
- - "--kafka_adapter_address={{ tpl .Values.services.kafka.adapter.address . }}"
+ - "--core_endpoint={{ tpl .Values.global.core_endpoint . }}"
+ - "--adapter_endpoint={{ tpl .Values.adapter_open_onu.endpoints.address . }}.{{ .Release.Namespace }}.svc:{{ print .Values.adapter_open_onu.endpoints.port }}"
- "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
- - "--core_topic={{ tpl .Values.adapter_open_onu.topics.core_topic . }}"
- - "--adapter_topic={{ tpl .Values.adapter_open_onu.topics.adapter_open_onu_topic . }}"
- "--event_topic={{ .Values.adapter_open_onu.topics.event_topic }}"
- "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
- "--kv_store_request_timeout={{ tpl .Values.adapter_open_onu.kv_store_timeout . }}"
@@ -95,6 +94,7 @@
- "--max_timeout_interadapter_comm={{ tpl .Values.adapter_open_onu.max_timeout_interadapter_comm . }}"
- "--max_timeout_reconciling={{ tpl .Values.adapter_open_onu.max_timeout_reconciling . }}"
- "--omci_timeout={{ tpl .Values.adapter_open_onu.omci_timeout . }}"
+ - "--rpc_timeout={{ tpl .Values.adapter_open_onu.rpc_timeout . }}"
- "--trace_enabled={{ .Values.global.tracing.enabled }}"
- "--trace_agent_address={{ tpl .Values.services.tracing_agent.address . }}"
- "--log_correlation_enabled={{ .Values.global.log_correlation.enabled }}"
@@ -107,18 +107,21 @@
securityContext:
allowPrivilegeEscalation: false
{{- end }}
+ ports:
+ - containerPort: {{ .Values.adapter_open_onu.endpoints.port }}
+ name: grpc
livenessProbe:
httpGet:
path: /healthz
port: 8080
- initialDelaySeconds: 10
- periodSeconds: 5
+ initialDelaySeconds: {{ .Values.probe.liveness.initial_delay_seconds }}
+ periodSeconds: {{ .Values.probe.liveness.period_seconds }}
readinessProbe:
httpGet:
path: /readz
port: 8080
- initialDelaySeconds: 10
- periodSeconds: 5
+ initialDelaySeconds: {{ .Values.probe.readiness.initial_delay_seconds }}
+ periodSeconds: {{ .Values.probe.readiness.period_seconds }}
resources:
requests:
{{- if .Values.resources.requests.memory }}
diff --git a/voltha-adapter-openonu/templates/openonu-svc.yaml b/voltha-adapter-openonu/templates/openonu-svc.yaml
new file mode 100644
index 0000000..c8cfedd
--- /dev/null
+++ b/voltha-adapter-openonu/templates/openonu-svc.yaml
@@ -0,0 +1,28 @@
+# Copyright 2020-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.
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: "{{ tpl .Values.adapter_open_onu.endpoints.address . }}"
+ namespace: {{ .Release.Namespace }}
+spec:
+ clusterIP: None
+ ports:
+ - name: grpc
+ port: {{ .Values.adapter_open_onu.endpoints.port }}
+ targetPort: {{ .Values.adapter_open_onu.endpoints.port }}
+ selector:
+ app: adapter-open-onu
+ release: {{ .Release.Name }}
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 0d4b7f5..bd30a4c 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -18,12 +18,14 @@
# Default overrides
global:
+ voltha_release_name: voltha
stack_name: voltha
log_level: "WARN"
image_registry: ""
image_tag: ~
image_org: "voltha/"
image_pullPolicy: "Always"
+ core_endpoint: "{{ .Values.global.voltha_release_name }}-{{ .Values.global.stack_name }}-core.{{ .Release.Namespace }}.svc:55558"
incremental_evto_update: False
# timeout for deadline for interadapter communication
# should be in format as expected by parseDuration golang.
@@ -32,6 +34,8 @@
max_timeout_reconciling: "10s"
# timeout for OMCI channel
omci_timeout: "1s"
+ # timeout for RPC request
+ rpc_timeout: "10s"
# kv store timeout
adapter_open_onu:
timeout: "5s"
@@ -52,6 +56,14 @@
# configure "0s" to disable omci alarm audit
interval: 300s
+# Probe values
+probe:
+ liveness:
+ initial_delay_seconds: 3
+ period_seconds: 3
+ readiness:
+ initial_delay_seconds: 3
+ period_seconds: 3
# Default security context under which the containers run
securityContext:
@@ -63,8 +75,6 @@
# Define connectivity to required services
services:
kafka:
- adapter:
- address: kafka:9092
cluster:
address: kafka:9092
@@ -109,13 +119,15 @@
max_timeout_interadapter_comm: '{{ .Values.global.max_timeout_interadapter_comm }}'
max_timeout_reconciling: '{{ .Values.global.max_timeout_reconciling }}'
omci_timeout: '{{ .Values.global.omci_timeout }}'
+ rpc_timeout: '{{ .Values.global.rpc_timeout }}'
kv_store_timeout: '{{ .Values.global.adapter_open_onu.timeout }}'
kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
alarm_audit_interval: '{{ .Values.global.alarm_audit.interval }}'
uni_port_mask: "0x0001"
+ endpoints:
+ address: '{{ template "fullname" . }}-api'
+ port: 50060
topics:
- core_topic: "{{ .Values.global.stack_name }}_rwcore"
- adapter_open_onu_topic: "{{ .Values.global.stack_name }}_brcm_openomci_onu"
event_topic: "voltha.events"
images: