From 2cbcccc6d06324f3c91306ed73f262b631457a23 Mon Sep 17 00:00:00 2001 From: Todd Malsbary Date: Fri, 7 Aug 2020 10:20:12 -0700 Subject: Add playbooks for v2 emco chart. Rename v2/onap4k8s to v2/emco, and rename sanity-check-for-v2.sh to emco.sh. This allows --plugins emco to be passed to installer.sh in place of --plugins onap4k8s. Issue-ID: MULTICLOUD-1181 Signed-off-by: Todd Change-Id: Idb427a8aa4c8aaff181965a540078c8cf6dd88aa --- deployments/helm/v2/emco/clm/Chart.yaml | 18 +++++ deployments/helm/v2/emco/clm/requirements.yaml | 18 +++++ .../helm/v2/emco/clm/resources/config/config.json | 6 ++ .../helm/v2/emco/clm/templates/configmap.yaml | 28 +++++++ .../helm/v2/emco/clm/templates/deployment.yaml | 16 ++++ .../helm/v2/emco/clm/templates/service.yaml | 16 ++++ deployments/helm/v2/emco/clm/values.yaml | 85 ++++++++++++++++++++++ 7 files changed, 187 insertions(+) create mode 100644 deployments/helm/v2/emco/clm/Chart.yaml create mode 100644 deployments/helm/v2/emco/clm/requirements.yaml create mode 100644 deployments/helm/v2/emco/clm/resources/config/config.json create mode 100644 deployments/helm/v2/emco/clm/templates/configmap.yaml create mode 100644 deployments/helm/v2/emco/clm/templates/deployment.yaml create mode 100644 deployments/helm/v2/emco/clm/templates/service.yaml create mode 100644 deployments/helm/v2/emco/clm/values.yaml (limited to 'deployments/helm/v2/emco/clm') diff --git a/deployments/helm/v2/emco/clm/Chart.yaml b/deployments/helm/v2/emco/clm/Chart.yaml new file mode 100644 index 00000000..00520a5f --- /dev/null +++ b/deployments/helm/v2/emco/clm/Chart.yaml @@ -0,0 +1,18 @@ +# Copyright 2019 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: Cluster Management +name: clm +version: 0.1.0 diff --git a/deployments/helm/v2/emco/clm/requirements.yaml b/deployments/helm/v2/emco/clm/requirements.yaml new file mode 100644 index 00000000..c2253cf4 --- /dev/null +++ b/deployments/helm/v2/emco/clm/requirements.yaml @@ -0,0 +1,18 @@ +# Copyright 2019 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/clm/resources/config/config.json b/deployments/helm/v2/emco/clm/resources/config/config.json new file mode 100644 index 00000000..11d22f66 --- /dev/null +++ b/deployments/helm/v2/emco/clm/resources/config/config.json @@ -0,0 +1,6 @@ +{ + "database-type": "mongo", + "database-ip": "emco-mongo", + "etcd-ip": "emco-etcd", + "service-port": "9061" +} \ No newline at end of file diff --git a/deployments/helm/v2/emco/clm/templates/configmap.yaml b/deployments/helm/v2/emco/clm/templates/configmap.yaml new file mode 100644 index 00000000..c9d55fed --- /dev/null +++ b/deployments/helm/v2/emco/clm/templates/configmap.yaml @@ -0,0 +1,28 @@ +{{/* +# Copyright 2019 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/clm/templates/deployment.yaml b/deployments/helm/v2/emco/clm/templates/deployment.yaml new file mode 100644 index 00000000..dea9f79c --- /dev/null +++ b/deployments/helm/v2/emco/clm/templates/deployment.yaml @@ -0,0 +1,16 @@ +{{/* +# Copyright 2019 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/clm/templates/service.yaml b/deployments/helm/v2/emco/clm/templates/service.yaml new file mode 100644 index 00000000..c9ab68d3 --- /dev/null +++ b/deployments/helm/v2/emco/clm/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/clm/values.yaml b/deployments/helm/v2/emco/clm/values.yaml new file mode 100644 index 00000000..156449e4 --- /dev/null +++ b/deployments/helm/v2/emco/clm/values.yaml @@ -0,0 +1,85 @@ +# Copyright 2019 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: "clm" +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: clm + portName: clm + internalPort: 9061 + externalPort: 9061 + nodePort: 61 + +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: {} -- cgit 1.2.3-korg