Merge "Update values.yaml of exampleservice chart"
diff --git a/xos-services/exampleservice/templates/configmap.yaml b/xos-services/exampleservice/templates/configmap.yaml
index c0c1b9a..7e25008 100644
--- a/xos-services/exampleservice/templates/configmap.yaml
+++ b/xos-services/exampleservice/templates/configmap.yaml
@@ -19,19 +19,6 @@
metadata:
name: exampleservice
data:
- service-config: |
- name: exampleservice
- accessor:
- username: {{ .Values.xos.admin_user }}
- password: {{ .Values.xos.admin_password }}
- endpoint: xos-core:50051
- required_models:
- - ExampleService
- - ExampleServiceInstance
- - ServiceDependency
- - ServiceMonitoringAgentInfo
- dependency_graph: "/opt/xos/synchronizers/exampleservice/model-deps"
- steps_dir: "/opt/xos/synchronizers/exampleservice/steps"
- sys_dir: "/opt/xos/synchronizers/exampleservice/sys"
- model_policies_dir: "/opt/xos/synchronizers/exampleservice/model_policies"
- models_dir: "/opt/xos/synchronizers/exampleservice/models"
+ serviceConfig: |
+{{ toYaml .Values.serviceConfig | indent 4 }}
+
diff --git a/xos-services/exampleservice/templates/deployment.yaml b/xos-services/exampleservice/templates/deployment.yaml
index 8e5dbc9..14f0c22 100644
--- a/xos-services/exampleservice/templates/deployment.yaml
+++ b/xos-services/exampleservice/templates/deployment.yaml
@@ -52,7 +52,7 @@
configMap:
name: exampleservice
items:
- - key: service-config
+ - key: serviceConfig
path: exampleservice_config.yaml
- name: cert-chain-secret
secret:
diff --git a/xos-services/exampleservice/values.yaml b/xos-services/exampleservice/values.yaml
index f93c1cb..c1f3ae1 100644
--- a/xos-services/exampleservice/values.yaml
+++ b/xos-services/exampleservice/values.yaml
@@ -35,6 +35,19 @@
affinity: {}
-xos:
- admin_user: admin@opencord.org
- admin_password: letmein
+serviceConfig:
+ name: exampleservice
+ accessor:
+ username: admin@opencord.org
+ password: letmein
+ endpoint: xos-core:50051
+ required_models:
+ - ExampleService
+ - ExampleServiceInstance
+ - ServiceDependency
+ - ServiceMonitoringAgentInfo
+ dependency_graph: "/opt/xos/synchronizers/exampleservice/model-deps"
+ steps_dir: "/opt/xos/synchronizers/exampleservice/steps"
+ sys_dir: "/opt/xos/synchronizers/exampleservice/sys"
+ model_policies_dir: "/opt/xos/synchronizers/exampleservice/model_policies"
+ models_dir: "/opt/xos/synchronizers/exampleservice/models"