SEBA-169 Split config for kubernetes service;
add labels for onos containers;
move container image version to master
Change-Id: I2e8ef8d38a45bb3f90708b7ced7f0ae06e8dbc4f
diff --git a/configs/onos-fabric.yaml b/configs/onos-fabric.yaml
index 91aff7e..5e2d1cd 100644
--- a/configs/onos-fabric.yaml
+++ b/configs/onos-fabric.yaml
@@ -35,3 +35,5 @@
onos_env:
- name: ONOS_APPS
value: "openflow"
+
+xos_service_label: ONOS_Fabric
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index 9915686..a1027d7 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -24,6 +24,9 @@
chart: {{ template "onos.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
+{{- if .Values.xos_service_label }}
+ xos_service: {{ .Values.xos_service_label }}
+{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
@@ -35,6 +38,9 @@
labels:
app: {{ template "onos.name" . }}
release: {{ .Release.Name }}
+{{- if .Values.xos_service_label }}
+ xos_service: {{ .Values.xos_service_label }}
+{{- end }}
spec:
serviceAccount: {{ .Values.serviceAccountName }}
serviceAccountName: {{ .Values.serviceAccountName }}
diff --git a/onos/values.yaml b/onos/values.yaml
index f97e21a..0e9bfba 100644
--- a/onos/values.yaml
+++ b/onos/values.yaml
@@ -54,3 +54,5 @@
tolerations: []
affinity: {}
+
+xos_service_label: ""
diff --git a/xos-profiles/base-kubernetes/requirements.yaml b/xos-profiles/base-kubernetes/requirements.yaml
index 4215534..6d0ea7e 100644
--- a/xos-profiles/base-kubernetes/requirements.yaml
+++ b/xos-profiles/base-kubernetes/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: kubernetes
- version: 1.0.0
+ version: 1.0.1-dev
repository: file://../../xos-services/kubernetes
diff --git a/xos-services/kubernetes/Chart.yaml b/xos-services/kubernetes/Chart.yaml
index 121f46f..e565a0e 100644
--- a/xos-services/kubernetes/Chart.yaml
+++ b/xos-services/kubernetes/Chart.yaml
@@ -15,4 +15,4 @@
name: kubernetes
description: A Helm chart for XOS's "kubernetes" service
-version: 1.0.0
+version: 1.0.1-dev
diff --git a/xos-services/kubernetes/templates/_helpers.tpl b/xos-services/kubernetes/templates/_helpers.tpl
index 72c0a99..594d897 100644
--- a/xos-services/kubernetes/templates/_helpers.tpl
+++ b/xos-services/kubernetes/templates/_helpers.tpl
@@ -48,15 +48,9 @@
username: {{ .Values.xosAdminUser | quote }}
password: {{ .Values.xosAdminPassword | quote }}
endpoint: xos-core:50051
-required_models:
- - KubernetesService
- - KubernetesServiceInstance
-dependency_graph: "/opt/xos/synchronizers/kubernetes/model-deps"
-steps_dir: "/opt/xos/synchronizers/kubernetes/steps"
-# model_policies_dir: "/opt/xos/synchronizers/kubernetes/model_policies"
-sys_dir: "/opt/xos/synchronizers/kubernetes/sys"
-models_dir: "/opt/xos/synchronizers/kubernetes/models"
-pull_steps_dir: "/opt/xos/synchronizers/kubernetes/pull_steps"
+event_bus:
+ endpoint: {{ .Values.kafkaService | quote }}
+ kind: kafka
logging:
version: 1
handlers:
diff --git a/xos-services/kubernetes/templates/deployment.yaml b/xos-services/kubernetes/templates/deployment.yaml
index b09a459..5c4a96a 100644
--- a/xos-services/kubernetes/templates/deployment.yaml
+++ b/xos-services/kubernetes/templates/deployment.yaml
@@ -46,8 +46,8 @@
{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- name: kubernetes-config
- mountPath: /opt/xos/synchronizers/kubernetes/kubernetes_config.yaml
- subPath: kubernetes_config.yaml
+ mountPath: /opt/xos/synchronizers/kubernetes/mounted_config.yaml
+ subPath: mounted_config.yaml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
@@ -57,7 +57,7 @@
name: kubernetes
items:
- key: serviceConfig
- path: kubernetes_config.yaml
+ path: mounted_config.yaml
- name: certchain-volume
configMap:
name: ca-certificates
diff --git a/xos-services/kubernetes/values.yaml b/xos-services/kubernetes/values.yaml
index 15e6f52..3b0634b 100644
--- a/xos-services/kubernetes/values.yaml
+++ b/xos-services/kubernetes/values.yaml
@@ -24,11 +24,13 @@
imagePullPolicy: 'Always'
-kubernetes_synchronizerImage: "xosproject/kubernetes-synchronizer:{{ .Chart.Version }}"
+kubernetes_synchronizerImage: "xosproject/kubernetes-synchronizer:master"
xosAdminUser: "admin@opencord.org"
xosAdminPassword: "letmein"
+kafkaService: "cord-kafka"
+
resources: {}
nodeSelector: {}