Voltha helm optimizations
Change-Id: I25eca498cef603f3bb2dd978a1be00810728cd49
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index 840dc0a..5d9e343 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -18,6 +18,7 @@
kind: Deployment
metadata:
name: {{ template "onos.fullname" . }}
+ namespace: {{ .Values.namespace }}
labels:
app: {{ template "onos.name" . }}
chart: {{ template "onos.chart" . }}
@@ -35,10 +36,14 @@
app: {{ template "onos.name" . }}
release: {{ .Release.Name }}
spec:
+ serviceAccount: {{ .Values.serviceAccountName }}
+ serviceAccountName: {{ .Values.serviceAccountName }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
+ env:
+{{ toYaml .Values.onos_env | indent 12 }}
ports:
- name: ovsdb
containerPort: {{ .Values.services.ovsdb.port }}
diff --git a/onos/templates/openflow-service.yaml b/onos/templates/openflow-service.yaml
index c61f611..05fadeb 100644
--- a/onos/templates/openflow-service.yaml
+++ b/onos/templates/openflow-service.yaml
@@ -16,13 +16,14 @@
kind: Service
metadata:
name: {{ template "onos.fullname" . }}-openflow
+ namespace: {{ .Values.namespace }}
labels:
app: {{ template "onos.name" . }}
chart: {{ template "onos.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
- type: {{ .Values.services.serviceType }}
+ type: {{ .Values.services.openflowServiceType }}
ports:
- name: openflow
{{ toYaml .Values.services.openflow | indent 4 }}
diff --git a/onos/templates/ovsdb-service.yaml b/onos/templates/ovsdb-service.yaml
index cfda477..f0760fe 100644
--- a/onos/templates/ovsdb-service.yaml
+++ b/onos/templates/ovsdb-service.yaml
@@ -16,13 +16,14 @@
kind: Service
metadata:
name: {{ template "onos.fullname" . }}-ovsdb
+ namespace: {{ .Values.namespace }}
labels:
app: {{ template "onos.name" . }}
chart: {{ template "onos.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
- type: {{ .Values.services.serviceType }}
+ type: {{ .Values.services.ovsdbServiceType }}
ports:
- name: ovsdb
{{ toYaml .Values.services.ovsdb | indent 4 }}
diff --git a/onos/templates/ssh-service.yaml b/onos/templates/ssh-service.yaml
index fdcbb66..bf0b8a0 100644
--- a/onos/templates/ssh-service.yaml
+++ b/onos/templates/ssh-service.yaml
@@ -16,13 +16,14 @@
kind: Service
metadata:
name: {{ template "onos.fullname" . }}-ssh
+ namespace: {{ .Values.namespace }}
labels:
app: {{ template "onos.name" . }}
chart: {{ template "onos.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
- type: {{ .Values.services.serviceType }}
+ type: {{ .Values.services.sshServiceType }}
ports:
- name: ssh
{{ toYaml .Values.services.ssh | indent 4 }}
diff --git a/onos/templates/ui-service.yaml b/onos/templates/ui-service.yaml
index 40cbd68..4c05f4d 100644
--- a/onos/templates/ui-service.yaml
+++ b/onos/templates/ui-service.yaml
@@ -16,13 +16,14 @@
kind: Service
metadata:
name: {{ template "onos.fullname" . }}-ui
+ namespace: {{ .Values.namespace }}
labels:
app: {{ template "onos.name" . }}
chart: {{ template "onos.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
- type: {{ .Values.services.serviceType }}
+ type: {{ .Values.services.uiServiceType }}
ports:
- name: ui
{{ toYaml .Values.services.ui | indent 4 }}
diff --git a/onos/values.yaml b/onos/values.yaml
index 688fff6..c46008f 100644
--- a/onos/values.yaml
+++ b/onos/values.yaml
@@ -28,8 +28,14 @@
nameOverride: ""
fullnameOverride: ""
+namespace: default
+serviceAccountName: default
+
services:
- serviceType: ClusterIP
+ openflowServiceType: ClusterIP
+ ovsdbServiceType: ClusterIP
+ sshServiceType: ClusterIP
+ uiServiceType: ClusterIP
ovsdb:
port: 6640
openflow:
@@ -41,6 +47,8 @@
cluster:
port: 9876
+onos_env: []
+
resources: {}
nodeSelector: {}