summaryrefslogtreecommitdiffstats
path: root/deployments/helm/v2/onap4k8s/common
diff options
context:
space:
mode:
authorTodd Malsbary <todd.malsbary@intel.com>2020-08-07 10:20:12 -0700
committerRitu Sood <ritu.sood@intel.com>2020-09-23 20:00:03 +0000
commit2cbcccc6d06324f3c91306ed73f262b631457a23 (patch)
treea9365925c2b1362c0cafec15cb79e9446e1c470c /deployments/helm/v2/onap4k8s/common
parent18c0ffea7babfcda74e4367413a331259c406c10 (diff)
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 <todd.malsbary@intel.com> Change-Id: Idb427a8aa4c8aaff181965a540078c8cf6dd88aa
Diffstat (limited to 'deployments/helm/v2/onap4k8s/common')
-rw-r--r--deployments/helm/v2/onap4k8s/common/Chart.yaml18
-rw-r--r--deployments/helm/v2/onap4k8s/common/templates/_deployment.tpl93
-rw-r--r--deployments/helm/v2/onap4k8s/common/templates/_name.tpl31
-rw-r--r--deployments/helm/v2/onap4k8s/common/templates/_namespace.tpl26
-rw-r--r--deployments/helm/v2/onap4k8s/common/templates/_repository.tpl49
-rw-r--r--deployments/helm/v2/onap4k8s/common/templates/_resources.tpl59
-rw-r--r--deployments/helm/v2/onap4k8s/common/templates/_service.tpl31
-rw-r--r--deployments/helm/v2/onap4k8s/common/templates/_servicemco.tpl48
-rw-r--r--deployments/helm/v2/onap4k8s/common/values.yaml18
9 files changed, 0 insertions, 373 deletions
diff --git a/deployments/helm/v2/onap4k8s/common/Chart.yaml b/deployments/helm/v2/onap4k8s/common/Chart.yaml
deleted file mode 100644
index 34ba55d1..00000000
--- a/deployments/helm/v2/onap4k8s/common/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2017 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: v1
-description: Common templates for inclusion in other charts
-name: common
-version: 0.1.0
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_deployment.tpl b/deployments/helm/v2/onap4k8s/common/templates/_deployment.tpl
deleted file mode 100644
index defc55c4..00000000
--- a/deployments/helm/v2/onap4k8s/common/templates/_deployment.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-{{/*
-# 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.
-*/}}
-{{- define "common.deployment" -}}
-{{- $common := dict "Values" .Values.common -}}
-{{- $noCommon := omit .Values "common" -}}
-{{- $overrides := dict "Values" $noCommon -}}
-{{- $noValues := omit . "Values" -}}
-{{- with merge $noValues $overrides $common -}}
-apiVersion: apps/v1
-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:
- selector:
- matchLabels:
- app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
- replicas: {{ .Values.replicaCount }}
- template:
- metadata:
- labels:
- app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
- spec:
- containers:
- - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}
- command: [{{ .Values.command }}]
- args: [{{ .Values.args }}]
- workingDir: {{ .Values.workingDir }}
- ports:
- - containerPort: {{ .Values.service.internalPort }}
- {{- if eq .Values.liveness.enabled true }}
- livenessProbe:
- tcpSocket:
- port: {{ .Values.service.internalPort }}
- initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
- periodSeconds: {{ .Values.liveness.periodSeconds }}
- {{ end }}
-
- readinessProbe:
- tcpSocket:
- port: {{ .Values.service.internalPort }}
- initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
- periodSeconds: {{ .Values.readiness.periodSeconds }}
- volumeMounts:
- - mountPath: /etc/localtime
- name: localtime
- readOnly: true
- - mountPath: /opt/emco/config.json
- name: {{ include "common.name" .}}
- subPath: config.json
- resources:
-{{ include "common.resources" . }}
- {{- if .Values.nodeSelector }}
- nodeSelector:
-{{ toYaml .Values.nodeSelector }}
- {{- end -}}
- {{- if .Values.affinity }}
- affinity:
-{{ toYaml .Values.affinity }}
- {{- end }}
- volumes:
- - name: localtime
- hostPath:
- path: /etc/localtime
- - name : {{ include "common.name" . }}
- configMap:
- name: {{ include "common.fullname" . }}
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
-{{- end -}}
-{{- end -}}
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_name.tpl b/deployments/helm/v2/onap4k8s/common/templates/_name.tpl
deleted file mode 100644
index 42999846..00000000
--- a/deployments/helm/v2/onap4k8s/common/templates/_name.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{/*
-# Copyright © 2017 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.
-*/}}
-
-{{/*
- Expand the name of a chart.
-*/}}
-{{- define "common.name" -}}
- {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
- Create a default fully qualified application name.
- Truncated at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "common.fullname" -}}
- {{- $name := default .Chart.Name .Values.nameOverride -}}
- {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}} \ No newline at end of file
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_namespace.tpl b/deployments/helm/v2/onap4k8s/common/templates/_namespace.tpl
deleted file mode 100644
index 94c9ee72..00000000
--- a/deployments/helm/v2/onap4k8s/common/templates/_namespace.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{{/*
-# Copyright © 2017 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.
-*/}}
-
-{{/*
- Resolve the namespace to apply to a chart. The default namespace suffix
- is the name of the chart. This can be overridden if necessary (eg. for subcharts)
- using the following value:
-
- - .Values.nsPrefix : override namespace prefix
-*/}}
-{{- define "common.namespace" -}}
- {{- default .Release.Namespace .Values.nsPrefix -}}
-{{- end -}}
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_repository.tpl b/deployments/helm/v2/onap4k8s/common/templates/_repository.tpl
deleted file mode 100644
index 272db421..00000000
--- a/deployments/helm/v2/onap4k8s/common/templates/_repository.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-{{/*
-# Copyright © 2017 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.
-*/}}
-
-{{/*
- Resolve the name of the common image repository.
- The value for .Values.repository is used by default,
- unless either override mechanism is used.
-
- - .Values.global.repository : override default image repository for all images
- - .Values.repositoryOverride : override global and default image repository on a per image basis
-*/}}
-{{- define "common.repository" -}}
- {{if .Values.repositoryOverride }}
- {{- printf "%s" .Values.repositoryOverride -}}
- {{else}}
- {{- default .Values.repository .Values.global.repository -}}
- {{end}}
-{{- end -}}
-
-
-{{/*
- Resolve the image repository secret token.
- The value for .Values.global.repositoryCred is used:
- repositoryCred:
- user: user
- password: password
- mail: email (optional)
-*/}}
-{{- define "common.repository.secret" -}}
- {{- $repo := include "common.repository" . }}
- {{- $repo := default "nexus3.onap.org:10001" $repo }}
- {{- $cred := .Values.global.repositoryCred }}
- {{- $mail := default "@" $cred.mail }}
- {{- $auth := printf "%s:%s" $cred.user $cred.password | b64enc }}
- {{- printf "{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}" $repo $cred.user $cred.password $mail $auth | b64enc -}}
-{{- end -}}
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_resources.tpl b/deployments/helm/v2/onap4k8s/common/templates/_resources.tpl
deleted file mode 100644
index fae77435..00000000
--- a/deployments/helm/v2/onap4k8s/common/templates/_resources.tpl
+++ /dev/null
@@ -1,59 +0,0 @@
-{{- /*
-# 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.
-*/ -}}
-
-{{- /*
- Resolve the name of the common resource limit/request flavor.
- The value for .Values.flavor is used by default,
- unless either override mechanism is used.
-
- - .Values.global.flavor : override default flavor for all charts
- - .Values.flavorOverride : override global and default flavor on a per chart basis
-*/ -}}
-{{- define "common.flavor" -}}
- {{if .Values.flavorOverride }}
- {{- printf "%s" .Values.flavorOverride -}}
- {{else}}
- {{- default .Values.flavor .Values.global.flavor -}}
- {{end}}
-{{- end -}}
-
-{{- /*
- Resolve the resource limit/request flavor using the desired flavor value.
-
- - .Values.resources : YAML definition of resource limits. The flavor key
- is computed based on the common.flavor template and
- is used as the selected resource limit through the pluck
- e.g: resources:
- small:
- limits:
- cpu: 200m
- memory: 4Gi
- requests:
- cpu: 100m
- memory: 1Gi
- large:
- limits:
- cpu: 400m
- memory: 8Gi
- requests:
- cpu: 200m
- memory: 2Gi
- unlimited: {}
-*/ -}}
-{{- define "common.resources" -}}
-{{- $flavor := include "common.flavor" . -}}
-{{- toYaml (pluck $flavor .Values.resources | first) | indent 12 -}}
-{{- end -}}
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_service.tpl b/deployments/helm/v2/onap4k8s/common/templates/_service.tpl
deleted file mode 100644
index 77b77d05..00000000
--- a/deployments/helm/v2/onap4k8s/common/templates/_service.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-{{/*
-# Copyright © 2017 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.
-*/}}
-
-{{/*
- Resolve the name of a chart's service.
-
- The default will be the chart name (or .Values.nameOverride if set).
- And the use of .Values.service.name overrides all.
-
- - .Values.service.name : override default service (ie. chart) name
-*/}}
-{{/*
- Expand the service name for a chart.
-*/}}
-{{- define "common.servicename" -}}
- {{- $name := default .Chart.Name .Values.nameOverride -}}
- {{- default $name .Values.service.name | trunc 63 | trimSuffix "-" -}}
-{{- end -}} \ No newline at end of file
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_servicemco.tpl b/deployments/helm/v2/onap4k8s/common/templates/_servicemco.tpl
deleted file mode 100644
index d791abba..00000000
--- a/deployments/helm/v2/onap4k8s/common/templates/_servicemco.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-{{/*
-# 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.
-*/}}
-{{- define "common.servicemco" -}}
-{{- $common := dict "Values" .Values.common -}}
-{{- $noCommon := omit .Values "common" -}}
-{{- $overrides := dict "Values" $noCommon -}}
-{{- $noValues := omit . "Values" -}}
-{{- with merge $noValues $overrides $common -}}
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "common.servicename" . }}
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.fullname" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
-spec:
- type: {{ .Values.service.type }}
- ports:
- - name: {{ .Values.service.PortName }}
- {{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.internalPort }}
- nodePort: {{ .Values.global.nodePortPrefixExt | default "302" }}{{ .Values.service.nodePort }}
- {{- else -}}
- port: {{ .Values.service.externalPort }}
- targetPort: {{ .Values.service.internalPort }}
- {{- end}}
- protocol: TCP
- selector:
- app: {{ include "common.name" . }}
- release: {{ .Release.Name }}
-{{- end -}}
-{{- end -}} \ No newline at end of file
diff --git a/deployments/helm/v2/onap4k8s/common/values.yaml b/deployments/helm/v2/onap4k8s/common/values.yaml
deleted file mode 100644
index 852f15c8..00000000
--- a/deployments/helm/v2/onap4k8s/common/values.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright © 2017 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 default values that can be inherited by
-# all subcharts.
-#################################################################