From 5337bb6451634a5df0dc2068b9a37327b661966e Mon Sep 17 00:00:00 2001 From: "Igor D.C" Date: Wed, 30 Sep 2020 17:34:28 +0000 Subject: Add DCM to Helm deployment folder Also add DCM to cleanup-emco.sh. Issue-ID: MULTICLOUD-1143 Change-Id: I2496c1fef2e2588c1c8e750105568afc210d54c3 Signed-off-by: Igor D.C --- deployments/helm/v2/emco/dcm/Chart.yaml | 18 +++++ deployments/helm/v2/emco/dcm/requirements.yaml | 18 +++++ .../helm/v2/emco/dcm/resources/config/config.json | 8 +++ .../helm/v2/emco/dcm/templates/configmap.yaml | 28 ++++++++ .../helm/v2/emco/dcm/templates/deployment.yaml | 16 +++++ .../helm/v2/emco/dcm/templates/service.yaml | 16 +++++ deployments/helm/v2/emco/dcm/values.yaml | 84 ++++++++++++++++++++++ .../helm/v2/emco/emco-services/requirements.yaml | 3 + deployments/kubernetes/cleanup-emco.sh | 3 + 9 files changed, 194 insertions(+) create mode 100644 deployments/helm/v2/emco/dcm/Chart.yaml create mode 100644 deployments/helm/v2/emco/dcm/requirements.yaml create mode 100644 deployments/helm/v2/emco/dcm/resources/config/config.json create mode 100644 deployments/helm/v2/emco/dcm/templates/configmap.yaml create mode 100644 deployments/helm/v2/emco/dcm/templates/deployment.yaml create mode 100644 deployments/helm/v2/emco/dcm/templates/service.yaml create mode 100644 deployments/helm/v2/emco/dcm/values.yaml diff --git a/deployments/helm/v2/emco/dcm/Chart.yaml b/deployments/helm/v2/emco/dcm/Chart.yaml new file mode 100644 index 00000000..9cd356e0 --- /dev/null +++ b/deployments/helm/v2/emco/dcm/Chart.yaml @@ -0,0 +1,18 @@ +# Copyright 2020 Intel Corporation, Inc +# +# 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 +description: Distributed Cloud Manager +name: dcm +version: 0.1.0 diff --git a/deployments/helm/v2/emco/dcm/requirements.yaml b/deployments/helm/v2/emco/dcm/requirements.yaml new file mode 100644 index 00000000..a3792606 --- /dev/null +++ b/deployments/helm/v2/emco/dcm/requirements.yaml @@ -0,0 +1,18 @@ +# Copyright 2020 Intel Corporation, Inc +# +# 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: common + version: ~0.x-0 + repository: '@local' diff --git a/deployments/helm/v2/emco/dcm/resources/config/config.json b/deployments/helm/v2/emco/dcm/resources/config/config.json new file mode 100644 index 00000000..7478656e --- /dev/null +++ b/deployments/helm/v2/emco/dcm/resources/config/config.json @@ -0,0 +1,8 @@ +{ + + "database-type": "mongo", + "database-ip": "emco-mongo", + "etcd-ip": "emco-etcd", + "service-port": "9077" +} + diff --git a/deployments/helm/v2/emco/dcm/templates/configmap.yaml b/deployments/helm/v2/emco/dcm/templates/configmap.yaml new file mode 100644 index 00000000..998e0389 --- /dev/null +++ b/deployments/helm/v2/emco/dcm/templates/configmap.yaml @@ -0,0 +1,28 @@ +{{/* +# Copyright 2020 Intel Corporation, Inc +# +# 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: {{ include "common.fullname" . }} + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: +{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} diff --git a/deployments/helm/v2/emco/dcm/templates/deployment.yaml b/deployments/helm/v2/emco/dcm/templates/deployment.yaml new file mode 100644 index 00000000..cf73fe21 --- /dev/null +++ b/deployments/helm/v2/emco/dcm/templates/deployment.yaml @@ -0,0 +1,16 @@ +{{/* +# Copyright 2020 Intel Corporation, Inc +# +# 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. +*/}} +{{- template "common.deployment" . -}} \ No newline at end of file diff --git a/deployments/helm/v2/emco/dcm/templates/service.yaml b/deployments/helm/v2/emco/dcm/templates/service.yaml new file mode 100644 index 00000000..c9ab68d3 --- /dev/null +++ b/deployments/helm/v2/emco/dcm/templates/service.yaml @@ -0,0 +1,16 @@ +{{/* +# Copyright 2020 Intel Corporation, Inc +# +# 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. +*/}} +{{- template "common.servicemco" . -}} \ No newline at end of file diff --git a/deployments/helm/v2/emco/dcm/values.yaml b/deployments/helm/v2/emco/dcm/values.yaml new file mode 100644 index 00000000..dffa85e9 --- /dev/null +++ b/deployments/helm/v2/emco/dcm/values.yaml @@ -0,0 +1,84 @@ +# Copyright 2020 Intel Corporation, Inc +# +# 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. + +################################################################# +# Global configuration defaults. +################################################################# +global: + nodePortPrefixExt: 304 + persistence: {} +################################################################# +# Application configuration defaults. +################################################################# +# application image +repository: registry.hub.docker.com +image: emcov2/emco:stable +pullPolicy: Always +command: "/opt/emco/entrypoint" +args: "dcm" +workingDir: /opt/emco + +# flag to enable debugging - application support required +debugEnabled: false + +# application configuration is via config files + +# default number of instances +replicaCount: 1 + +nodeSelector: {} + +affinity: {} + +# probe configuration parameters +liveness: + initialDelaySeconds: 10 + periodSeconds: 30 + # necessary to disable liveness probe when setting breakpoints + # in debugger so K8s doesn't restart unresponsive container + enabled: true + +readiness: + initialDelaySeconds: 10 + periodSeconds: 30 + +service: + type: NodePort + name: dcm + portName: dcm + internalPort: 9077 + externalPort: 9077 + nodePort: 77 + +ingress: + enabled: false + +# Configure resource requests and limits +flavor: large +resources: + small: + limits: + cpu: 200m + memory: 500Mi + requests: + cpu: 10m + memory: 10Mi + large: + limits: + cpu: 400m + memory: 1Gi + requests: + cpu: 10m + memory: 100Mi + unlimited: {} diff --git a/deployments/helm/v2/emco/emco-services/requirements.yaml b/deployments/helm/v2/emco/emco-services/requirements.yaml index 9cd7b475..dbb14661 100644 --- a/deployments/helm/v2/emco/emco-services/requirements.yaml +++ b/deployments/helm/v2/emco/emco-services/requirements.yaml @@ -31,3 +31,6 @@ dependencies: - name: ovnaction version: ~0.x-0 repository: '@local' + - name: dcm + version: ~0.x-0 + repository: '@local' diff --git a/deployments/kubernetes/cleanup-emco.sh b/deployments/kubernetes/cleanup-emco.sh index a8aef470..4572350d 100755 --- a/deployments/kubernetes/cleanup-emco.sh +++ b/deployments/kubernetes/cleanup-emco.sh @@ -3,14 +3,17 @@ kubectl -n onap4k8s delete deployment clm kubectl -n onap4k8s delete deployment orchestrator kubectl -n onap4k8s delete deployment ncm kubectl -n onap4k8s delete deployment ovnaction +kubectl -n onap4k8s delete deployment dcm kubectl -n onap4k8s delete deployment rsync kubectl -n onap4k8s delete service clm kubectl -n onap4k8s delete service orchestrator kubectl -n onap4k8s delete service ncm kubectl -n onap4k8s delete service ovnaction +kubectl -n onap4k8s delete service dcm kubectl -n onap4k8s delete service rsync kubectl -n onap4k8s delete configmap clm kubectl -n onap4k8s delete configmap orchestrator kubectl -n onap4k8s delete configmap ncm kubectl -n onap4k8s delete configmap ovnaction +kubectl -n onap4k8s delete configmap dcm kubectl -n onap4k8s delete configmap rsync -- cgit 1.2.3-korg