CORD-3028 deploy SimpleExampleService
Change-Id: Ib0ff4597656dbeffb65c55d19d4015ea0ed12fba
diff --git a/examples/adminuser-values.yaml b/examples/adminuser-values.yaml
index 435a13b..4395e74 100644
--- a/examples/adminuser-values.yaml
+++ b/examples/adminuser-values.yaml
@@ -41,3 +41,6 @@
kubernetes:
xosAdminUser: *adminuser
xosAdminPassword: *adminpass
+simpleexampleservice:
+ xosAdminUser: *adminuser
+ xosAdminPassword: *adminpass
\ No newline at end of file
diff --git a/examples/candidate-tag-values.yaml b/examples/candidate-tag-values.yaml
index e2c0106..523d307 100644
--- a/examples/candidate-tag-values.yaml
+++ b/examples/candidate-tag-values.yaml
@@ -44,3 +44,5 @@
vrouter_synchronizerImage: "xosproject/vrouter-synchronizer:candidate"
kubernetes:
kubernetes_synchronizerImage: "xosproject/kubernetes-synchronizer:candidate"
+simpleexampleservice:
+ simpleexampleservice_synchronizerImage: "xosproject/simpleexampleservice-synchronizer:candidate"
diff --git a/examples/filter-images.yaml b/examples/filter-images.yaml
index b2e661b..9c9adbe 100644
--- a/examples/filter-images.yaml
+++ b/examples/filter-images.yaml
@@ -34,6 +34,7 @@
- xosproject/addressmanager-synchronizer
- xosproject/vsg-hw-synchronizer
- xosproject/kubernetes-synchronizer
+- xosproject/simpleexampleservice-synchronizer
- xosproject/fabric-synchronizer
- xosproject/xos-api-tester
- nginx
diff --git a/examples/pull-always-values.yaml b/examples/pull-always-values.yaml
index de15672..81208ce 100644
--- a/examples/pull-always-values.yaml
+++ b/examples/pull-always-values.yaml
@@ -36,3 +36,5 @@
imagePullPolicy: 'Always'
xos-gui:
imagePullPolicy: 'Always'
+simpleexampleservice:
+ imagePullPolicy: 'Always'
diff --git a/xos-profiles/container-vnf/.helmignore b/xos-profiles/container-vnf/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/xos-profiles/container-vnf/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml b/xos-profiles/container-vnf/Chart.yaml
similarity index 82%
copy from xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
copy to xos-profiles/container-vnf/Chart.yaml
index ffaf1d6..e99deb2 100644
--- a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
+++ b/xos-profiles/container-vnf/Chart.yaml
@@ -1,4 +1,5 @@
---
+
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +15,7 @@
# limitations under the License.
apiVersion: v1
-kind: ConfigMap
-metadata:
- name: rcord-lite-config
-data:
- serviceConfig: |
-{{ include "rcord.serviceConfig" . | indent 4 }}
+appVersion: "1.0"
+description: A Helm chart for XOS's "container-vnf" profile
+name: container-vnf
+version: 0.1.0
diff --git a/xos-profiles/container-vnf/requirements.yaml b/xos-profiles/container-vnf/requirements.yaml
new file mode 100644
index 0000000..943fe48
--- /dev/null
+++ b/xos-profiles/container-vnf/requirements.yaml
@@ -0,0 +1,41 @@
+---
+
+# Copyright 2018-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.
+
+dependencies:
+- name: rcord
+ version: 0.1.0
+ repository: file://../../xos-services/rcord
+- name: onos-service
+ version: 0.1.0
+ repository: file://../../xos-services/onos-service
+- name: fabric
+ version: 0.1.0
+ repository: file://../../xos-services/fabric
+- name: volt
+ version: 0.1.0
+ repository: file://../../xos-services/volt
+- name: vsg-hw
+ version: 0.1.0
+ repository: file://../../xos-services/vsg-hw
+- name: vrouter
+ version: 0.1.0
+ repository: file://../../xos-services/vrouter
+- name: kubernetes
+ version: 0.1.0
+ repository: file://../../xos-services/kubernetes
+- name: simpleexampleservice
+ version: 0.1.0
+ repository: file://../../xos-services/simpleexampleservice
diff --git a/xos-profiles/container-vnf/templates/_helpers.tpl b/xos-profiles/container-vnf/templates/_helpers.tpl
new file mode 100644
index 0000000..9ff6d05
--- /dev/null
+++ b/xos-profiles/container-vnf/templates/_helpers.tpl
@@ -0,0 +1,52 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-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.
+*/}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "container-vnf.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "container-vnf.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "container-vnf.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+The R-CORD synchronizer loads R-CORD-specific models into the core
+*/}}
+
diff --git a/xos-profiles/container-vnf/templates/tosca-configmap.yaml b/xos-profiles/container-vnf/templates/tosca-configmap.yaml
new file mode 100644
index 0000000..a84a875
--- /dev/null
+++ b/xos-profiles/container-vnf/templates/tosca-configmap.yaml
@@ -0,0 +1,31 @@
+---
+
+# Copyright 2018-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: ConfigMap
+metadata:
+ name: container-vnf-tosca
+data:
+ 010-fixtures.yaml: |
+{{ toYaml .Values.toscaRecipes.fixtures | indent 4 }}
+ 020-deployment.yaml: |
+{{ toYaml .Values.toscaRecipes.deployment | indent 4 }}
+ 030-fabric-service.yaml: |
+{{ toYaml .Values.toscaRecipes.fabricService | indent 4 }}
+ 040-cord-services.yaml: |
+{{ toYaml .Values.toscaRecipes.cordServices | indent 4 }}
+ 050-service-graph-constraints.yaml: |
+{{ toYaml .Values.toscaRecipes.serviceGraphConstraints | indent 4 }}
diff --git a/xos-profiles/container-vnf/templates/tosca-deployment.yaml b/xos-profiles/container-vnf/templates/tosca-deployment.yaml
new file mode 100644
index 0000000..1dcc6b4
--- /dev/null
+++ b/xos-profiles/container-vnf/templates/tosca-deployment.yaml
@@ -0,0 +1,61 @@
+---
+
+# Copyright 2018-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: apps/v1beta2
+kind: Deployment
+metadata:
+ name: {{ template "container-vnf.fullname" . }}-tosca-loader
+ labels:
+ app: {{ template "container-vnf.name" . }}
+ chart: {{ template "container-vnf.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ template "container-vnf.name" . }}
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "container-vnf.name" . }}
+ release: {{ .Release.Name }}
+ annotations:
+ checksum/config: {{ include (print $.Template.BasePath "/tosca-configmap.yaml") . | sha256sum }}
+ spec:
+ containers:
+ - name: {{ .Chart.Name }}-tosca-loader
+ image: {{ .Values.httpieImage | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
+ command: ["/bin/sh"]
+ args:
+ - "-c"
+ - |
+ for recipe in /opt/tosca/*
+ do
+ echo $recipe
+ http --check-status --ignore-stdin POST http://xos-tosca:$XOS_TOSCA_SERVICE_PORT/run xos-username:{{ .Values.xosAdminUser }} xos-password:{{ .Values.xosAdminPassword }} @$recipe || exit 1
+ echo ''
+ done
+ sleep 3600
+ volumeMounts:
+ - name: container-vnf-tosca
+ mountPath: /opt/tosca
+ volumes:
+ - name: container-vnf-tosca
+ configMap:
+ name: container-vnf-tosca
diff --git a/xos-profiles/container-vnf/values.yaml b/xos-profiles/container-vnf/values.yaml
new file mode 100644
index 0000000..fd62847
--- /dev/null
+++ b/xos-profiles/container-vnf/values.yaml
@@ -0,0 +1,333 @@
+---
+# Copyright 2018-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.
+
+# Default values for the container-vnf profile.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+nameOverride: ""
+fullnameOverride: ""
+
+imagePullPolicy: 'IfNotPresent'
+
+rcord_synchronizerImage: "xosproject/rcord-synchronizer:master"
+httpieImage: "clue/httpie:latest"
+
+xosAdminUser: "admin@opencord.org"
+xosAdminPassword: "letmein"
+
+# TOSCA recipes for the tosca-loader
+toscaRecipes:
+ fixtures:
+ tosca_definitions_version: tosca_simple_yaml_1_0
+ description: Some basic fixtures
+ imports:
+ - custom_types/siterole.yaml
+ - custom_types/slicerole.yaml
+ - custom_types/networkparametertype.yaml
+ - custom_types/networktemplate.yaml
+ topology_template:
+ node_templates:
+ # -----------------------------------------------------------------------------
+ # Network Parameter Types
+ # -----------------------------------------------------------------------------
+ s_tag:
+ type: tosca.nodes.NetworkParameterType
+ properties:
+ name: s_tag
+ c_tag:
+ type: tosca.nodes.NetworkParameterType
+ properties:
+ name: c_tag
+ next_hop:
+ type: tosca.nodes.NetworkParameterType
+ properties:
+ name: next_hop
+ device:
+ type: tosca.nodes.NetworkParameterType
+ properties:
+ name: device
+ bridge:
+ type: tosca.nodes.NetworkParameterType
+ properties:
+ name: bridge
+ neutron_port_name:
+ type: tosca.nodes.NetworkParameterType
+ properties:
+ name: neutron_port_name
+ # ----------------------------------------------------------------------------
+ # Roles
+ # ----------------------------------------------------------------------------
+ siterole#admin:
+ type: tosca.nodes.SiteRole
+ properties:
+ role: admin
+ siterole#pi:
+ type: tosca.nodes.SiteRole
+ properties:
+ role: pi
+ siterole#tech:
+ type: tosca.nodes.SiteRole
+ properties:
+ role: tech
+ slicerole#admin:
+ type: tosca.nodes.SliceRole
+ properties:
+ role: admin
+ slicerole#access:
+ type: tosca.nodes.SliceRole
+ properties:
+ role: access
+ # -----------------------------------------------------------------------------
+ # Network Templates
+ # -----------------------------------------------------------------------------
+ Private:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: Private
+ visibility: private
+ translation: none
+ Public shared IPv4:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: Public shared IPv4
+ visibility: private
+ translation: NAT
+ shared_network_name: nat-net
+ Public dedicated IPv4:
+ type: tosca.nodes.NetworkTemplate
+ properties:
+ name: Public dedicated IPv4
+ visibility: public
+ translation: none
+ shared_network_name: ext-net
+
+ deployment:
+ tosca_definitions_version: tosca_simple_yaml_1_0
+ imports:
+ - custom_types/deployment.yaml
+ description: deployment config, generated by platform-install
+ topology_template:
+ node_templates:
+ MyDeployment:
+ type: tosca.nodes.Deployment
+ properties:
+ name: MyDeployment
+
+ fabricService:
+ tosca_definitions_version: tosca_simple_yaml_1_0
+ imports:
+ - custom_types/fabricservice.yaml
+ - custom_types/onosapp.yaml
+ - custom_types/onosservice.yaml
+ - custom_types/serviceattribute.yaml
+ - custom_types/servicedependency.yaml
+ - custom_types/serviceinstancelink.yaml
+ description: fabric services, generated by rcord profile
+ topology_template:
+ node_templates:
+ service#ONOS_Fabric:
+ type: tosca.nodes.ONOSService
+ properties:
+ name: ONOS_Fabric
+ kind: platform
+ no_container: true
+ rest_hostname: onos-fabric-ui
+ rest_port: 8181
+ service#fabric:
+ type: tosca.nodes.FabricService
+ properties:
+ name: fabric
+ kind: platform
+ Fabric_ONOS_app:
+ type: tosca.nodes.ONOSApp
+ requirements:
+ - owner:
+ node: service#ONOS_Fabric
+ relationship: tosca.relationships.BelongsToOne
+ properties:
+ name: Fabric_ONOS_app
+ dependencies: org.onosproject.drivers, org.onosproject.openflow, org.onosproject.netcfghostprovider, org.onosproject.segmentrouting, org.onosproject.vrouter
+ service_dependency#onos-fabric_fabric:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: None
+ requirements:
+ - subscriber_service:
+ node: service#ONOS_Fabric
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#fabric
+ relationship: tosca.relationships.BelongsToOne
+
+ cordServices:
+ tosca_definitions_version: tosca_simple_yaml_1_0
+ description: Set up VOLT, AddressManager, and RCORD services
+ imports:
+ - custom_types/simpleexampleservice.yaml
+ - custom_types/fabricservice.yaml
+ - custom_types/image.yaml
+ - custom_types/kubernetesservice.yaml
+ - custom_types/network.yaml
+ - custom_types/networkslice.yaml
+ - custom_types/networktemplate.yaml
+ - custom_types/nodelabel.yaml
+ - custom_types/onosapp.yaml
+ - custom_types/onosservice.yaml
+ - custom_types/site.yaml
+ - custom_types/service.yaml
+ - custom_types/servicedependency.yaml
+ - custom_types/serviceinstanceattribute.yaml
+ - custom_types/serviceinstancelink.yaml
+ - custom_types/slice.yaml
+ - custom_types/voltservice.yaml
+ - custom_types/vrouterservice.yaml
+ - custom_types/vsghwservice.yaml
+ - custom_types/trustdomain.yaml
+ topology_template:
+ node_templates:
+ default_trustdomain:
+ type: tosca.nodes.TrustDomain
+ properties:
+ name: "default"
+ requirements:
+ - owner:
+ node: service#kubernetes
+ relationship: tosca.relationships.BelongsToOne
+ service#ONOS_Fabric:
+ type: tosca.nodes.ONOSService
+ properties:
+ name: ONOS_Fabric
+ must-exist: true
+ service#fabric:
+ type: tosca.nodes.FabricService
+ properties:
+ name: fabric
+ must-exist: true
+ service#rcord:
+ type: tosca.nodes.Service
+ properties:
+ name: rcord
+ rcord_volt:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: None
+ requirements:
+ - subscriber_service:
+ node: service#rcord
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#volt
+ relationship: tosca.relationships.BelongsToOne
+ service#kubernetes:
+ type: tosca.nodes.KubernetesService
+ properties:
+ name: kubernetes
+ service#volt:
+ type: tosca.nodes.VOLTService
+ properties:
+ name: volt
+ voltha_url: voltha.voltha.svc.cluster.local:8882
+ p_onos_url: onos-voltha-ui.voltha.svc.cluster.local:8181
+ p_onos_user: karaf
+ p_onos_pass: karaf
+ service#vsg-hw:
+ type: tosca.nodes.VSGHWService
+ properties:
+ name: vsg-hw
+ service#vrouter:
+ type: tosca.nodes.VRouterService
+ properties:
+ name: vrouter
+ kind: rcord
+ service_dependency#fabric_vrouter:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: None
+ requirements:
+ - subscriber_service:
+ node: service#fabric
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#vrouter
+ relationship: tosca.relationships.BelongsToOne
+ volt_vsg-hw:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: None
+ requirements:
+ - subscriber_service:
+ node: service#volt
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#vsg-hw
+ relationship: tosca.relationships.BelongsToOne
+ onos_fabric_vsg-hw:
+ type: tosca.nodes.ServiceDependency
+ properties:
+ connect_method: None
+ requirements:
+ - subscriber_service:
+ node: service#vsg-hw
+ relationship: tosca.relationships.BelongsToOne
+ - provider_service:
+ node: service#ONOS_Fabric
+ relationship: tosca.relationships.BelongsToOne
+ httpd_image:
+ type: tosca.nodes.Image
+ properties:
+ name: "httpd"
+ tag: "2.4"
+ service#simpleexampleservice:
+ type: tosca.nodes.SimpleExampleService
+ properties:
+ name: simpleexampleservice
+ service_message: hello
+ mysite:
+ type: tosca.nodes.Site
+ properties:
+ name: "mysite"
+ must-exist: true
+ simpleexampleservice_slice:
+ type: tosca.nodes.Slice
+ properties:
+ name: "mysite_simpleexampleservice"
+ requirements:
+ - site:
+ node: mysite
+ relationship: tosca.relationships.BelongsToOne
+ - trust_domain:
+ node: default_trustdomain
+ relationship: tosca.relationships.BelongsToOne
+ - default_image:
+ node: httpd_image
+ relationship: tosca.relationships.BelongsToOne
+ - service:
+ node: service#simpleexampleservice
+ relationship: tosca.relationships.BelongsToOne
+
+ serviceGraphConstraints:
+ tosca_definitions_version: tosca_simple_yaml_1_0
+ imports:
+ - custom_types/servicegraphconstraint.yaml
+ description: Constraints on the Services position in the graph
+ topology_template:
+ node_templates:
+ constraints:
+ type: tosca.nodes.ServiceGraphConstraint
+ properties:
+ constraints: '[[null, "rcord"], [null, "volt"], ["ONOS_Fabric", "vsg-hw"], ["fabric", null], ["vrouter", null]]'
diff --git a/xos-profiles/rcord-lite/requirements.yaml b/xos-profiles/rcord-lite/requirements.yaml
index 3508a8d..e5bf92f 100644
--- a/xos-profiles/rcord-lite/requirements.yaml
+++ b/xos-profiles/rcord-lite/requirements.yaml
@@ -15,6 +15,9 @@
# limitations under the License.
dependencies:
+- name: rcord
+ version: 0.1.0
+ repository: file://../../xos-services/rcord
- name: onos-service
version: 0.1.0
repository: file://../../xos-services/onos-service
diff --git a/xos-profiles/rcord-lite/templates/_helpers.tpl b/xos-profiles/rcord-lite/templates/_helpers.tpl
index 7d070a9..54ed1fa 100644
--- a/xos-profiles/rcord-lite/templates/_helpers.tpl
+++ b/xos-profiles/rcord-lite/templates/_helpers.tpl
@@ -50,15 +50,4 @@
The R-CORD synchronizer loads R-CORD-specific models into the core
*/}}
-{{- define "rcord.serviceConfig" -}}
-name: rcord
-accessor:
- username: {{ .Values.xosAdminUser | quote }}
- password: {{ .Values.xosAdminPassword | quote }}
- endpoint: xos-core:50051
-dependency_graph: "/opt/xos/synchronizers/rcord/model-deps"
-sys_dir: "/opt/xos/synchronizers/rcord/sys"
-models_dir: "/opt/xos/synchronizers/rcord/models"
-model_policies_dir: "/opt/xos/synchronizers/rcord/model_policies"
-{{- end -}}
diff --git a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml b/xos-services/rcord/Chart.yaml
similarity index 82%
copy from xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
copy to xos-services/rcord/Chart.yaml
index ffaf1d6..c6e0c37 100644
--- a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
+++ b/xos-services/rcord/Chart.yaml
@@ -1,4 +1,5 @@
---
+
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +15,7 @@
# limitations under the License.
apiVersion: v1
-kind: ConfigMap
-metadata:
- name: rcord-lite-config
-data:
- serviceConfig: |
-{{ include "rcord.serviceConfig" . | indent 4 }}
+appVersion: "1.0"
+description: A Helm chart for XOS's "rcord" service
+name: rcord
+version: 0.1.0
diff --git a/xos-services/rcord/templates/_helpers.tpl b/xos-services/rcord/templates/_helpers.tpl
new file mode 100644
index 0000000..9e26ecb
--- /dev/null
+++ b/xos-services/rcord/templates/_helpers.tpl
@@ -0,0 +1,59 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-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.
+*/}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "rcord.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "rcord.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "rcord.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "rcord.serviceConfig" -}}
+name: rcord
+accessor:
+ username: {{ .Values.xosAdminUser | quote }}
+ password: {{ .Values.xosAdminPassword | quote }}
+ endpoint: xos-core:50051
+dependency_graph: "/opt/xos/synchronizers/rcord/model-deps"
+sys_dir: "/opt/xos/synchronizers/rcord/sys"
+models_dir: "/opt/xos/synchronizers/rcord/models"
+model_policies_dir: "/opt/xos/synchronizers/rcord/model_policies"
+{{- end -}}
diff --git a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml b/xos-services/rcord/templates/configmap.yaml
similarity index 95%
rename from xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
rename to xos-services/rcord/templates/configmap.yaml
index ffaf1d6..05b56dd 100644
--- a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
+++ b/xos-services/rcord/templates/configmap.yaml
@@ -16,7 +16,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: rcord-lite-config
+ name: rcord
data:
serviceConfig: |
{{ include "rcord.serviceConfig" . | indent 4 }}
diff --git a/xos-profiles/rcord-lite/templates/rcord-models-deployment.yaml b/xos-services/rcord/templates/deployment.yaml
similarity index 70%
rename from xos-profiles/rcord-lite/templates/rcord-models-deployment.yaml
rename to xos-services/rcord/templates/deployment.yaml
index ed01549..e99e565 100644
--- a/xos-profiles/rcord-lite/templates/rcord-models-deployment.yaml
+++ b/xos-services/rcord/templates/deployment.yaml
@@ -1,4 +1,5 @@
---
+
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,41 +17,43 @@
apiVersion: apps/v1beta2
kind: Deployment
metadata:
- name: {{ template "rcord-lite.fullname" . }}-rcord-models
+ name: {{ template "rcord.fullname" . }}
labels:
- app: {{ template "rcord-lite.name" . }}
- chart: {{ template "rcord-lite.chart" . }}
+ app: {{ template "rcord.name" . }}
+ chart: {{ template "rcord.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
- app: {{ template "rcord-lite.name" . }}
+ app: {{ template "rcord.name" . }}
release: {{ .Release.Name }}
template:
metadata:
labels:
- app: {{ template "rcord-lite.name" . }}
+ app: {{ template "rcord.name" . }}
release: {{ .Release.Name }}
annotations:
- checksum/config: {{ include (print $.Template.BasePath "/rcord-models-configmap.yaml") . | sha256sum }}
+ checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
spec:
containers:
- - name: {{ .Chart.Name }}-rcord
+ - name: {{ .Chart.Name }}
image: {{ .Values.rcord_synchronizerImage | quote }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
+ resources:
+{{ toYaml .Values.resources | indent 12 }}
volumeMounts:
- - name: rcord-lite-config
+ - name: rcord-config
mountPath: /opt/xos/synchronizers/rcord/rcord_config.yaml
subPath: rcord_config.yaml
- name: certchain-volume
mountPath: /usr/local/share/ca-certificates/local_certs.crt
subPath: config/ca_cert_chain.pem
volumes:
- - name: rcord-lite-config
+ - name: rcord-config
configMap:
- name: rcord-lite-config
+ name: rcord
items:
- key: serviceConfig
path: rcord_config.yaml
@@ -60,3 +63,15 @@
items:
- key: chain
path: config/ca_cert_chain.pem
+ {{- with .Values.nodeSelector }}
+ nodeSelector:
+{{ toYaml . | indent 8 }}
+ {{- end }}
+ {{- with .Values.affinity }}
+ affinity:
+{{ toYaml . | indent 8 }}
+ {{- end }}
+ {{- with .Values.tolerations }}
+ tolerations:
+{{ toYaml . | indent 8 }}
+ {{- end }}
diff --git a/xos-services/rcord/values.yaml b/xos-services/rcord/values.yaml
new file mode 100644
index 0000000..3939701
--- /dev/null
+++ b/xos-services/rcord/values.yaml
@@ -0,0 +1,38 @@
+---
+# Copyright 2018-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.
+
+# Default values for rcord
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+nameOverride: ""
+fullnameOverride: ""
+
+imagePullPolicy: 'IfNotPresent'
+
+rcord_synchronizerImage: "xosproject/rcord-synchronizer:master"
+
+xosAdminUser: "admin@opencord.org"
+xosAdminPassword: "letmein"
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml b/xos-services/simpleexampleservice/Chart.yaml
similarity index 82%
copy from xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
copy to xos-services/simpleexampleservice/Chart.yaml
index ffaf1d6..81a4546 100644
--- a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
+++ b/xos-services/simpleexampleservice/Chart.yaml
@@ -1,4 +1,5 @@
---
+
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +15,7 @@
# limitations under the License.
apiVersion: v1
-kind: ConfigMap
-metadata:
- name: rcord-lite-config
-data:
- serviceConfig: |
-{{ include "rcord.serviceConfig" . | indent 4 }}
+appVersion: "1.0"
+description: A Helm chart for XOS's "simpleexampleservice" service
+name: simpleexampleservice
+version: 0.1.0
diff --git a/xos-services/simpleexampleservice/templates/_helpers.tpl b/xos-services/simpleexampleservice/templates/_helpers.tpl
new file mode 100644
index 0000000..bb419c3
--- /dev/null
+++ b/xos-services/simpleexampleservice/templates/_helpers.tpl
@@ -0,0 +1,86 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Copyright 2018-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.
+*/}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "simpleexampleservice.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "simpleexampleservice.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "simpleexampleservice.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "simpleexampleservice.serviceConfig" -}}
+name: simpleexampleservice
+accessor:
+ username: {{ .Values.xosAdminUser | quote }}
+ password: {{ .Values.xosAdminPassword | quote }}
+ endpoint: xos-core:50051
+required_models:
+ - SimpleExampleService
+ - SimpleExampleServiceInstance
+ - ServiceDependency
+ - KubernetesService
+ - KubernetesServiceInstance
+ - KubernetesConfigMap
+ - KubernetesSecret
+ - KubernetesConfigVolumeMount
+ - KubernetesSecretVolumeMount
+dependency_graph: "/opt/xos/synchronizers/simpleexampleservice/model-deps"
+steps_dir: "/opt/xos/synchronizers/simpleexampleservice/steps"
+sys_dir: "/opt/xos/synchronizers/simpleexampleservice/sys"
+model_policies_dir: "/opt/xos/synchronizers/simpleexampleservice/model_policies"
+models_dir: "/opt/xos/synchronizers/simpleexampleservice/models"
+logging:
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ file:
+ class: logging.handlers.RotatingFileHandler
+ filename: /var/log/xos.log
+ maxBytes: 10485760
+ backupCount: 5
+ loggers:
+ 'multistructlog':
+ handlers:
+ - console
+ - file
+ level: DEBUG
+{{- end -}}
diff --git a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml b/xos-services/simpleexampleservice/templates/configmap.yaml
similarity index 87%
copy from xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
copy to xos-services/simpleexampleservice/templates/configmap.yaml
index ffaf1d6..ef13d3e 100644
--- a/xos-profiles/rcord-lite/templates/rcord-models-configmap.yaml
+++ b/xos-services/simpleexampleservice/templates/configmap.yaml
@@ -1,4 +1,5 @@
---
+
# Copyright 2018-present Open Networking Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +17,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
- name: rcord-lite-config
+ name: simpleexampleservice
data:
serviceConfig: |
-{{ include "rcord.serviceConfig" . | indent 4 }}
+{{ include "simpleexampleservice.serviceConfig" . | indent 4 }}
diff --git a/xos-services/simpleexampleservice/templates/deployment.yaml b/xos-services/simpleexampleservice/templates/deployment.yaml
new file mode 100644
index 0000000..314dba9
--- /dev/null
+++ b/xos-services/simpleexampleservice/templates/deployment.yaml
@@ -0,0 +1,74 @@
+---
+# Copyright 2018-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: apps/v1beta2
+kind: Deployment
+metadata:
+ name: {{ template "simpleexampleservice.fullname" . }}
+ labels:
+ app: {{ template "simpleexampleservice.name" . }}
+ chart: {{ template "simpleexampleservice.chart" . }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ template "simpleexampleservice.name" . }}
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app: {{ template "simpleexampleservice.name" . }}
+ release: {{ .Release.Name }}
+ spec:
+ containers:
+ - name: {{ .Chart.Name }}
+ image: {{ .Values.simpleexampleservice_synchronizerImage | quote }}
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
+ resources:
+{{ toYaml .Values.resources | indent 12 }}
+ volumeMounts:
+ - name: simpleexampleservice-config
+ mountPath: /opt/xos/synchronizers/simpleexampleservice/simpleexampleservice_config.yaml
+ subPath: simpleexampleservice_config.yaml
+ - name: certchain-volume
+ mountPath: /usr/local/share/ca-certificates/local_certs.crt
+ subPath: config/ca_cert_chain.pem
+ volumes:
+ - name: simpleexampleservice-config
+ configMap:
+ name: simpleexampleservice
+ items:
+ - key: serviceConfig
+ path: simpleexampleservice_config.yaml
+ - name: certchain-volume
+ configMap:
+ name: ca-certificates
+ items:
+ - key: chain
+ path: config/ca_cert_chain.pem
+ {{- with .Values.nodeSelector }}
+ nodeSelector:
+{{ toYaml . | indent 8 }}
+ {{- end }}
+ {{- with .Values.affinity }}
+ affinity:
+{{ toYaml . | indent 8 }}
+ {{- end }}
+ {{- with .Values.tolerations }}
+ tolerations:
+{{ toYaml . | indent 8 }}
+ {{- end }}
diff --git a/xos-services/simpleexampleservice/values.yaml b/xos-services/simpleexampleservice/values.yaml
new file mode 100644
index 0000000..019a0f4
--- /dev/null
+++ b/xos-services/simpleexampleservice/values.yaml
@@ -0,0 +1,38 @@
+---
+# Copyright 2018-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.
+
+# Default values for simpleexampleservice.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+nameOverride: ""
+fullnameOverride: ""
+
+imagePullPolicy: 'IfNotPresent'
+
+simpleexampleservice_synchronizerImage: "xosproject/simpleexampleservice-synchronizer:master"
+
+xosAdminUser: "admin@opencord.org"
+xosAdminPassword: "letmein"
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}