From 6d7c9539bb348af48f6c3d109c46f6f22d927be0 Mon Sep 17 00:00:00 2001 From: Srivahni Date: Fri, 8 Mar 2019 10:29:07 -0800 Subject: Remove redundant directories Change-Id: I0b39b22d0cf4dba0c1bee6b142b95b78e697b569 Issue-ID: ONAPARC-393 Signed-off-by: Srivahni Chivukula --- vnfs/DAaaS/collectd-helm/templates/NOTES.txt | 2 - vnfs/DAaaS/collectd-helm/templates/_helpers.tpl | 25 ------- vnfs/DAaaS/collectd-helm/templates/configmap.yaml | 71 -------------------- vnfs/DAaaS/collectd-helm/templates/daemonset.yaml | 79 ----------------------- vnfs/DAaaS/collectd-helm/templates/service.yaml | 16 ----- 5 files changed, 193 deletions(-) delete mode 100644 vnfs/DAaaS/collectd-helm/templates/NOTES.txt delete mode 100644 vnfs/DAaaS/collectd-helm/templates/_helpers.tpl delete mode 100644 vnfs/DAaaS/collectd-helm/templates/configmap.yaml delete mode 100644 vnfs/DAaaS/collectd-helm/templates/daemonset.yaml delete mode 100644 vnfs/DAaaS/collectd-helm/templates/service.yaml (limited to 'vnfs/DAaaS/collectd-helm/templates') diff --git a/vnfs/DAaaS/collectd-helm/templates/NOTES.txt b/vnfs/DAaaS/collectd-helm/templates/NOTES.txt deleted file mode 100644 index d96bc7d2..00000000 --- a/vnfs/DAaaS/collectd-helm/templates/NOTES.txt +++ /dev/null @@ -1,2 +0,0 @@ -1. Collect Charts has been installed -2. Collectd prometheus metrics endpoint {{ .Values.collectd_prometheus.service.port}} diff --git a/vnfs/DAaaS/collectd-helm/templates/_helpers.tpl b/vnfs/DAaaS/collectd-helm/templates/_helpers.tpl deleted file mode 100644 index b5e98086..00000000 --- a/vnfs/DAaaS/collectd-helm/templates/_helpers.tpl +++ /dev/null @@ -1,25 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "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). -*/}} -{{- define "fullname" -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* Workaround for https://github.com/helm/helm/issues/3117 */}} -{{- define "rangeskipempty" -}} -{{- range $key, $value := . }} -{{- if $value }} -{{ $key }}: {{ $value }} -{{- end }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/vnfs/DAaaS/collectd-helm/templates/configmap.yaml b/vnfs/DAaaS/collectd-helm/templates/configmap.yaml deleted file mode 100644 index 2f8b4527..00000000 --- a/vnfs/DAaaS/collectd-helm/templates/configmap.yaml +++ /dev/null @@ -1,71 +0,0 @@ -{{/* -# Copyright 2018 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: {{ template "fullname" . }}-config - labels: - app: {{ template "name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} -data: - node-collectd.conf: |- - FQDNLookup false - - LoadPlugin cpu - LoadPlugin memory - LoadPlugin cpufreq - LoadPlugin disk - LoadPlugin ethstat - LoadPlugin ipc - LoadPlugin ipmi - LoadPlugin load - LoadPlugin numa - LoadPlugin processes - LoadPlugin df - LoadPlugin turbostat - LoadPlugin uptime - LoadPlugin contextswitch - LoadPlugin irq - LoadPlugin df - LoadPlugin swap - LoadPlugin write_prometheus - - LoadPlugin logfile - - LogLevel info - File "/var/log/collectd.log" - Timestamp true - PrintSeverity false - - - Interval 5 - ReportByState false - ReportByCpu false - - - - Interval 30 - ValuesAbsolute false - ValuesPercentage true - - - - Port "{{ .Values.prometheus_port }}" - - - #Last line (collectd requires ‘\n’ at the last line) diff --git a/vnfs/DAaaS/collectd-helm/templates/daemonset.yaml b/vnfs/DAaaS/collectd-helm/templates/daemonset.yaml deleted file mode 100644 index 4b98b808..00000000 --- a/vnfs/DAaaS/collectd-helm/templates/daemonset.yaml +++ /dev/null @@ -1,79 +0,0 @@ -{{/* -# Copyright 2018 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: extensions/v1beta1 -kind: DaemonSet -metadata: - name: {{ template "fullname" . }} - labels: - app: {{ template "name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} -spec: - replicas: {{ .Values.replicaCount }} - template: - metadata: - labels: - app: {{ template "name" . }} - collector: collectd - release: {{ .Release.Name }} - spec: - hostNetwork: true - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - securityContext: - privileged: true - volumeMounts: - - name: {{ template "fullname" . }}-config - mountPath: /opt/collectd/etc - - name: proc - mountPath: /mnt/proc - readOnly: true - - name: root - mountPath: /hostfs - readOnly: true - - name: etc - mountPath: /mnt/etc - readOnly: true - - name: run - mountPath: /var/run/docker.sock - resources: -{{ toYaml .Values.resources | indent 12 }} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} - {{- end }} - volumes: - - name: {{ template "fullname" . }}-config - configMap: - name: {{ template "fullname" . }}-config - items: - - key: node-collectd.conf - path: collectd.conf - - name: proc - hostPath: - path: /proc - - name: root - hostPath: - path: / - - name: etc - hostPath: - path: /etc - - name: run - hostPath: - path: /var/run/docker.sock \ No newline at end of file diff --git a/vnfs/DAaaS/collectd-helm/templates/service.yaml b/vnfs/DAaaS/collectd-helm/templates/service.yaml deleted file mode 100644 index b4231af3..00000000 --- a/vnfs/DAaaS/collectd-helm/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: collectd-prometheus-metrics-endpoint - labels: - app: collectd - collector: collectd -spec: - ports: - - name: collectd-prometheus - port: {{ .Values.collectd_prometheus.service.port }} - protocol: TCP - targetPort: {{ .Values.collectd_prometheus.service.targetPort }} - selector: -{{ include "rangeskipempty" .Values.collectd_prometheus.service.selector | indent 4 }} - type: ClusterIP \ No newline at end of file -- cgit 1.2.3-korg