From 7acab5645e0fa68f45941c8f1358307fb2e10c8f Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Fri, 1 Mar 2019 09:26:13 +0100 Subject: [PATCH] Add CDS as new chart CDS (Common Design Studio) was put in common but with the arrival of a chart that hosts the UI, it seems better to have it into its own "root" chart. For now, CDS chart is being installed if it's set as enabled in SDNC. Change-Id: I73bdcfaeb29b796793374513e152244a41e82d52 Issue-ID: CCSDK-1015 Signed-off-by: Sylvain Desbureaux --- .../controller-blueprints => cds}/.helmignore | 0 kubernetes/cds/Chart.yaml | 19 +++++ kubernetes/cds/README.md | 20 +++++ .../charts}/blueprints-processor/Chart.yaml | 0 .../charts}/blueprints-processor/requirements.yaml | 0 .../resources/config/application.properties | 0 .../resources/config/logback.xml | 0 .../blueprints-processor/templates/configmap.yaml | 0 .../blueprints-processor/templates/deployment.yaml | 0 .../blueprints-processor/templates/secrets.yaml | 0 .../blueprints-processor/templates/service.yaml | 0 .../charts}/blueprints-processor/values.yaml | 0 .../cds/charts/controller-blueprints/.helmignore | 21 +++++ .../charts}/controller-blueprints/Chart.yaml | 0 .../controller-blueprints/requirements.yaml | 0 .../resources/config/application.properties | 0 .../resources/config/logback.xml | 0 .../controller-blueprints/templates/configmap.yaml | 0 .../templates/deployment.yaml | 0 .../controller-blueprints/templates/secrets.yaml | 0 .../controller-blueprints/templates/service.yaml | 0 .../charts}/controller-blueprints/values.yaml | 0 kubernetes/cds/requirements.yaml | 19 +++++ kubernetes/cds/templates/deployment.yaml | 99 ++++++++++++++++++++++ kubernetes/cds/templates/service.yaml | 39 +++++++++ kubernetes/cds/values.yaml | 90 ++++++++++++++++++++ kubernetes/sdnc/requirements.yaml | 3 +- kubernetes/sdnc/values.yaml | 3 + 28 files changed, 312 insertions(+), 1 deletion(-) rename kubernetes/{common/controller-blueprints => cds}/.helmignore (100%) create mode 100644 kubernetes/cds/Chart.yaml create mode 100644 kubernetes/cds/README.md rename kubernetes/{common => cds/charts}/blueprints-processor/Chart.yaml (100%) rename kubernetes/{common => cds/charts}/blueprints-processor/requirements.yaml (100%) rename kubernetes/{common => cds/charts}/blueprints-processor/resources/config/application.properties (100%) rename kubernetes/{common => cds/charts}/blueprints-processor/resources/config/logback.xml (100%) rename kubernetes/{common => cds/charts}/blueprints-processor/templates/configmap.yaml (100%) rename kubernetes/{common => cds/charts}/blueprints-processor/templates/deployment.yaml (100%) rename kubernetes/{common => cds/charts}/blueprints-processor/templates/secrets.yaml (100%) rename kubernetes/{common => cds/charts}/blueprints-processor/templates/service.yaml (100%) rename kubernetes/{common => cds/charts}/blueprints-processor/values.yaml (100%) create mode 100644 kubernetes/cds/charts/controller-blueprints/.helmignore rename kubernetes/{common => cds/charts}/controller-blueprints/Chart.yaml (100%) rename kubernetes/{common => cds/charts}/controller-blueprints/requirements.yaml (100%) rename kubernetes/{common => cds/charts}/controller-blueprints/resources/config/application.properties (100%) rename kubernetes/{common => cds/charts}/controller-blueprints/resources/config/logback.xml (100%) rename kubernetes/{common => cds/charts}/controller-blueprints/templates/configmap.yaml (100%) rename kubernetes/{common => cds/charts}/controller-blueprints/templates/deployment.yaml (100%) rename kubernetes/{common => cds/charts}/controller-blueprints/templates/secrets.yaml (100%) rename kubernetes/{common => cds/charts}/controller-blueprints/templates/service.yaml (100%) rename kubernetes/{common => cds/charts}/controller-blueprints/values.yaml (100%) create mode 100644 kubernetes/cds/requirements.yaml create mode 100644 kubernetes/cds/templates/deployment.yaml create mode 100644 kubernetes/cds/templates/service.yaml create mode 100644 kubernetes/cds/values.yaml diff --git a/kubernetes/common/controller-blueprints/.helmignore b/kubernetes/cds/.helmignore similarity index 100% rename from kubernetes/common/controller-blueprints/.helmignore rename to kubernetes/cds/.helmignore diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml new file mode 100644 index 0000000000..fa430d2f78 --- /dev/null +++ b/kubernetes/cds/Chart.yaml @@ -0,0 +1,19 @@ +# Copyright © 2017 Amdocs, Bell Canada +# Modifications Copyright © 2018 Orange +# +# 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: ONAP Common Design Studio +name: cds +version: 4.0.0 diff --git a/kubernetes/cds/README.md b/kubernetes/cds/README.md new file mode 100644 index 0000000000..6619b8f2c3 --- /dev/null +++ b/kubernetes/cds/README.md @@ -0,0 +1,20 @@ +# CDS + +## Introduction + +CDS stands for Common Design Studio. It helps developping service specific +artifacts for pre instanciation and post configuration. + +Full description is on [ONAP Read the Doc](https://docs.onap.org/en/latest/submodules/ccsdk/cds.git/docs/index.html). + +Charts has an UI and blueprints processort and controllers. +Trigger to enable it is on SDNC chart has of today. + +## Requirements + +CDS needs the following ONAP projects to work: + +- AAI +- SO +- SDC +- SDNC diff --git a/kubernetes/common/blueprints-processor/Chart.yaml b/kubernetes/cds/charts/blueprints-processor/Chart.yaml similarity index 100% rename from kubernetes/common/blueprints-processor/Chart.yaml rename to kubernetes/cds/charts/blueprints-processor/Chart.yaml diff --git a/kubernetes/common/blueprints-processor/requirements.yaml b/kubernetes/cds/charts/blueprints-processor/requirements.yaml similarity index 100% rename from kubernetes/common/blueprints-processor/requirements.yaml rename to kubernetes/cds/charts/blueprints-processor/requirements.yaml diff --git a/kubernetes/common/blueprints-processor/resources/config/application.properties b/kubernetes/cds/charts/blueprints-processor/resources/config/application.properties similarity index 100% rename from kubernetes/common/blueprints-processor/resources/config/application.properties rename to kubernetes/cds/charts/blueprints-processor/resources/config/application.properties diff --git a/kubernetes/common/blueprints-processor/resources/config/logback.xml b/kubernetes/cds/charts/blueprints-processor/resources/config/logback.xml similarity index 100% rename from kubernetes/common/blueprints-processor/resources/config/logback.xml rename to kubernetes/cds/charts/blueprints-processor/resources/config/logback.xml diff --git a/kubernetes/common/blueprints-processor/templates/configmap.yaml b/kubernetes/cds/charts/blueprints-processor/templates/configmap.yaml similarity index 100% rename from kubernetes/common/blueprints-processor/templates/configmap.yaml rename to kubernetes/cds/charts/blueprints-processor/templates/configmap.yaml diff --git a/kubernetes/common/blueprints-processor/templates/deployment.yaml b/kubernetes/cds/charts/blueprints-processor/templates/deployment.yaml similarity index 100% rename from kubernetes/common/blueprints-processor/templates/deployment.yaml rename to kubernetes/cds/charts/blueprints-processor/templates/deployment.yaml diff --git a/kubernetes/common/blueprints-processor/templates/secrets.yaml b/kubernetes/cds/charts/blueprints-processor/templates/secrets.yaml similarity index 100% rename from kubernetes/common/blueprints-processor/templates/secrets.yaml rename to kubernetes/cds/charts/blueprints-processor/templates/secrets.yaml diff --git a/kubernetes/common/blueprints-processor/templates/service.yaml b/kubernetes/cds/charts/blueprints-processor/templates/service.yaml similarity index 100% rename from kubernetes/common/blueprints-processor/templates/service.yaml rename to kubernetes/cds/charts/blueprints-processor/templates/service.yaml diff --git a/kubernetes/common/blueprints-processor/values.yaml b/kubernetes/cds/charts/blueprints-processor/values.yaml similarity index 100% rename from kubernetes/common/blueprints-processor/values.yaml rename to kubernetes/cds/charts/blueprints-processor/values.yaml diff --git a/kubernetes/cds/charts/controller-blueprints/.helmignore b/kubernetes/cds/charts/controller-blueprints/.helmignore new file mode 100644 index 0000000000..f0c1319444 --- /dev/null +++ b/kubernetes/cds/charts/controller-blueprints/.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/kubernetes/common/controller-blueprints/Chart.yaml b/kubernetes/cds/charts/controller-blueprints/Chart.yaml similarity index 100% rename from kubernetes/common/controller-blueprints/Chart.yaml rename to kubernetes/cds/charts/controller-blueprints/Chart.yaml diff --git a/kubernetes/common/controller-blueprints/requirements.yaml b/kubernetes/cds/charts/controller-blueprints/requirements.yaml similarity index 100% rename from kubernetes/common/controller-blueprints/requirements.yaml rename to kubernetes/cds/charts/controller-blueprints/requirements.yaml diff --git a/kubernetes/common/controller-blueprints/resources/config/application.properties b/kubernetes/cds/charts/controller-blueprints/resources/config/application.properties similarity index 100% rename from kubernetes/common/controller-blueprints/resources/config/application.properties rename to kubernetes/cds/charts/controller-blueprints/resources/config/application.properties diff --git a/kubernetes/common/controller-blueprints/resources/config/logback.xml b/kubernetes/cds/charts/controller-blueprints/resources/config/logback.xml similarity index 100% rename from kubernetes/common/controller-blueprints/resources/config/logback.xml rename to kubernetes/cds/charts/controller-blueprints/resources/config/logback.xml diff --git a/kubernetes/common/controller-blueprints/templates/configmap.yaml b/kubernetes/cds/charts/controller-blueprints/templates/configmap.yaml similarity index 100% rename from kubernetes/common/controller-blueprints/templates/configmap.yaml rename to kubernetes/cds/charts/controller-blueprints/templates/configmap.yaml diff --git a/kubernetes/common/controller-blueprints/templates/deployment.yaml b/kubernetes/cds/charts/controller-blueprints/templates/deployment.yaml similarity index 100% rename from kubernetes/common/controller-blueprints/templates/deployment.yaml rename to kubernetes/cds/charts/controller-blueprints/templates/deployment.yaml diff --git a/kubernetes/common/controller-blueprints/templates/secrets.yaml b/kubernetes/cds/charts/controller-blueprints/templates/secrets.yaml similarity index 100% rename from kubernetes/common/controller-blueprints/templates/secrets.yaml rename to kubernetes/cds/charts/controller-blueprints/templates/secrets.yaml diff --git a/kubernetes/common/controller-blueprints/templates/service.yaml b/kubernetes/cds/charts/controller-blueprints/templates/service.yaml similarity index 100% rename from kubernetes/common/controller-blueprints/templates/service.yaml rename to kubernetes/cds/charts/controller-blueprints/templates/service.yaml diff --git a/kubernetes/common/controller-blueprints/values.yaml b/kubernetes/cds/charts/controller-blueprints/values.yaml similarity index 100% rename from kubernetes/common/controller-blueprints/values.yaml rename to kubernetes/cds/charts/controller-blueprints/values.yaml diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml new file mode 100644 index 0000000000..d7b38dc0b1 --- /dev/null +++ b/kubernetes/cds/requirements.yaml @@ -0,0 +1,19 @@ +# Copyright © 2017 Amdocs, Bell Canada +# Modifications Copyright © 2018 Orange +# +# 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: ~4.x-0 + repository: '@local' diff --git a/kubernetes/cds/templates/deployment.yaml b/kubernetes/cds/templates/deployment.yaml new file mode 100644 index 0000000000..134e6b7443 --- /dev/null +++ b/kubernetes/cds/templates/deployment.yaml @@ -0,0 +1,99 @@ +# Copyright © 2018 Orange +# Modifications Copyright © 2018 Amdocs, Bell Canada +# +# 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: extensions/v1beta1 +kind: Deployment +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 }} +spec: + replicas: {{ .Values.replicaCount }} + template: + metadata: + labels: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} + name: {{ include "common.fullname" . }} + spec: + containers: + - name: {{ include "common.name" . }} + image: "{{ include "common.repository" . }}/{{ .Values.image }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + ports: + - containerPort: {{ .Values.service.internalPort }} + # disable liveness probe when breakpoints set in debugger + # so K8s doesn't restart unresponsive container + {{ if .Values.liveness.enabled }} + livenessProbe: + tcpSocket: + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.liveness.periodSeconds }} + {{ end }} + env: + - name: HOST + value: 0.0.0.0 + readinessProbe: + tcpSocket: + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.readiness.periodSeconds }} + volumeMounts: + - mountPath: /etc/localtime + name: localtime + readOnly: true + resources: +{{ include "common.resources" . | indent 12 }} + {{- if .Values.nodeSelector }} + nodeSelector: +{{ toYaml .Values.nodeSelector | indent 10 }} + {{- end -}} + {{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 10 }} + {{- end }} + # side car containers + # - name: filebeat-onap + # image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + # imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + # volumeMounts: + # - mountPath: /usr/share/filebeat/filebeat.yml + # name: filebeat-conf + # subPath: filebeat.yml + # - mountPath: /home/esr/works/logs + # name: esr-server-logs + # - mountPath: /usr/share/filebeat/data + # name: esr-server-filebeat + volumes: + - name: localtime + hostPath: + path: /etc/localtime + # - name: filebeat-conf + # configMap: + # name: {{ include "common.fullname" . }}-esr-filebeat + # - name: esr-server-logs + # emptyDir: {} + # - name: esr-server-filebeat + # emptyDir: {} + # - name: esrserver-log + # configMap: + # name: {{ include "common.fullname" . }}-esr-esrserver-log + imagePullSecrets: + - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/cds/templates/service.yaml b/kubernetes/cds/templates/service.yaml new file mode 100644 index 0000000000..f8e91120eb --- /dev/null +++ b/kubernetes/cds/templates/service.yaml @@ -0,0 +1,39 @@ +# Copyright © 2017 Amdocs, Bell Canada, Orange +# +# 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: Service +metadata: + name: {{ include "common.servicename" . }} + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + type: {{ .Values.service.type }} + ports: + {{if eq .Values.service.type "NodePort" -}} + - port: {{ .Values.service.internalPort }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} + name: {{ .Values.service.portName }}-{{ .Values.service.internalPort }} + {{- else -}} + - port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.service.internalPort }} + name: {{ .Values.service.portName }} + {{- end}} + selector: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} diff --git a/kubernetes/cds/values.yaml b/kubernetes/cds/values.yaml new file mode 100644 index 0000000000..3815d9af21 --- /dev/null +++ b/kubernetes/cds/values.yaml @@ -0,0 +1,90 @@ +# Copyright © 2018 Orange +# Modifications Copyright © 2018 Amdocs, Bell Canada +# +# 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: + nodePortPrefix: 303 + readinessRepository: oomk8s + readinessImage: readiness-check:1.1.0 + loggingRepository: docker.elastic.co + loggingImage: beats/filebeat:5.5.0 + +subChartsOnly: + enabled: true + +# application image +repository: nexus3.onap.org:10001 +image: onap/ccsdk-cds-ui:1.0.0-STAGING-latest +pullPolicy: Always + +# application configuration +config: + + +# default number of instances +replicaCount: 1 + +nodeSelector: {} + +affinity: {} + +# probe configuration parameters +liveness: + httpGet: + path: / + port: 3000 + initialDelaySeconds: 30 + periodSeconds: 10 + # necessary to disable liveness probe when setting breakpoints + # in debugger so K8s doesn't restart unresponsive container + enabled: true + +readiness: + httpGet: + path: /ping + port: 3000 + initialDelaySeconds: 30 + periodSeconds: 10 + +service: + type: NodePort + portName: ui + name: cds + nodePort: 97 + internalPort: 3000 + +ingress: + enabled: false +# Resource Limit flavor -By Default using small +flavor: small +# Segregation for Different environment (Small and Large) +resources: + small: + limits: + cpu: 1 + memory: 1Gi + requests: + cpu: 10m + memory: 100Mi + large: + limits: + cpu: 2 + memory: 2Gi + requests: + cpu: 200m + memory: 200Mi + unlimited: {} diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml index d144d76f93..56e20672f7 100644 --- a/kubernetes/sdnc/requirements.yaml +++ b/kubernetes/sdnc/requirements.yaml @@ -16,9 +16,10 @@ dependencies: - name: common version: ~4.x-0 repository: '@local' - - name: controller-blueprints + - name: cds version: ~4.x-0 repository: '@local' + condition: cds.enabled - name: mysql version: ~4.x-0 repository: '@local' diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 20f20af3ec..7faba15a57 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -60,6 +60,9 @@ config: javaHome: /usr/lib/jvm/java-1.8-openjdk # dependency / sub-chart configuration +cds: + enabled: true + dmaap-listener: nameOverride: sdnc-dmaap-listener config: -- 2.16.6