diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-03-26 14:20:56 +0100 |
|---|---|---|
| committer | Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2020-03-26 14:20:56 +0100 |
| commit | f11447d127d21dd56b302fe1014f4801d32511c5 (patch) | |
| tree | bdc3c9a91af81a7bf132b4324ee378eb71de11b7 /vnfs/DAaaS | |
| parent | bba7ed02826fa1f33189eb1d2d43c74a0d45fe83 (diff) | |
Fix spacing issues in YAML files in vnfs
Fixes applied as reported by yamllint.
Change-Id: I8bd30d49e728715fdc696bb984fbca842ac1c2b8
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'vnfs/DAaaS')
127 files changed, 142 insertions, 181 deletions
diff --git a/vnfs/DAaaS/deploy/00-init/istio-operator/Chart.yaml b/vnfs/DAaaS/deploy/00-init/istio-operator/Chart.yaml index 1da83af4..a7a59f94 100644 --- a/vnfs/DAaaS/deploy/00-init/istio-operator/Chart.yaml +++ b/vnfs/DAaaS/deploy/00-init/istio-operator/Chart.yaml @@ -1,5 +1,3 @@ - - #/*Copyright 2019 Intel Corporation, Inc # * # * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/vnfs/DAaaS/deploy/00-init/istio-operator/values.yaml b/vnfs/DAaaS/deploy/00-init/istio-operator/values.yaml index cb937c11..f7861441 100644 --- a/vnfs/DAaaS/deploy/00-init/istio-operator/values.yaml +++ b/vnfs/DAaaS/deploy/00-init/istio-operator/values.yaml @@ -1,5 +1,3 @@ - - # This is a YAML-formatted file. # Declare variables to be passed into your templates. diff --git a/vnfs/DAaaS/deploy/00-init/istio/istio-instance/Chart.yaml b/vnfs/DAaaS/deploy/00-init/istio/istio-instance/Chart.yaml index ca2ff626..0f52ed3f 100644 --- a/vnfs/DAaaS/deploy/00-init/istio/istio-instance/Chart.yaml +++ b/vnfs/DAaaS/deploy/00-init/istio/istio-instance/Chart.yaml @@ -1,4 +1,3 @@ - #/* # * Copyright 2019 Intel Corporation, Inc # * diff --git a/vnfs/DAaaS/deploy/00-init/istio/istio-instance/templates/istio-sds.yaml b/vnfs/DAaaS/deploy/00-init/istio/istio-instance/templates/istio-sds.yaml index 8c440a4e..eabb4f9b 100644 --- a/vnfs/DAaaS/deploy/00-init/istio/istio-instance/templates/istio-sds.yaml +++ b/vnfs/DAaaS/deploy/00-init/istio/istio-instance/templates/istio-sds.yaml @@ -1,5 +1,3 @@ - - #/*Copyright 2019 Intel Corporation, Inc # * # * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/vnfs/DAaaS/deploy/00-init/istio/istio-instance/values.yaml b/vnfs/DAaaS/deploy/00-init/istio/istio-instance/values.yaml index 091999ac..4e03eb70 100644 --- a/vnfs/DAaaS/deploy/00-init/istio/istio-instance/values.yaml +++ b/vnfs/DAaaS/deploy/00-init/istio/istio-instance/values.yaml @@ -1,4 +1,3 @@ - #/* # * Copyright 2019 Intel Corporation, Inc # * @@ -36,4 +35,4 @@ spec: image: "docker.io/istio/node-agent-k8s:1.2.2" nodeAgent: enabled: true - image : "docker.io/istio/node-agent-k8s:1.2.2" + image: "docker.io/istio/node-agent-k8s:1.2.2" diff --git a/vnfs/DAaaS/deploy/00-init/keycloak/templates/Deployment.yaml b/vnfs/DAaaS/deploy/00-init/keycloak/templates/Deployment.yaml index ed581e10..e1ccdfc8 100644 --- a/vnfs/DAaaS/deploy/00-init/keycloak/templates/Deployment.yaml +++ b/vnfs/DAaaS/deploy/00-init/keycloak/templates/Deployment.yaml @@ -31,7 +31,7 @@ spec: containers: - name: keycloak image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - env: + env: {{ toYaml .Values.env | indent 8 }} ports: {{ toYaml .Values.ports | indent 8 }} diff --git a/vnfs/DAaaS/deploy/00-init/keycloak/values.yaml b/vnfs/DAaaS/deploy/00-init/keycloak/values.yaml index 2915afc3..a27bbcf5 100644 --- a/vnfs/DAaaS/deploy/00-init/keycloak/values.yaml +++ b/vnfs/DAaaS/deploy/00-init/keycloak/values.yaml @@ -19,7 +19,7 @@ metadata: image: repository: jboss/keycloak tag: 6.0.1 - pullPolicy: IfNotPresent + pullPolicy: IfNotPresent spec: replicas: 1 selector: diff --git a/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml index 1cd33e8c..4735c9a5 100644 --- a/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml +++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/cluster.yml @@ -177,4 +177,4 @@ spec: useAllDevices: false config: databaseSizeMB: "1024" - journalSizeMB: "1024"
\ No newline at end of file + journalSizeMB: "1024" diff --git a/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml index 38ddf5d7..acce459f 100644 --- a/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml +++ b/vnfs/DAaaS/deploy/00-init/rook-ceph/templates/storageclass.yml @@ -25,4 +25,4 @@ parameters: clusterNamespace: rook-ceph # Specify the filesystem type of the volume. If not specified, it will use `ext4`. fstype: xfs -# Optional, default reclaimPolicy is "Delete". Other options are: "Retain", "Recycle" as documented in https://kubernetes.io/docs/concepts/storage/storage-classes/
\ No newline at end of file +# Optional, default reclaimPolicy is "Delete". Other options are: "Retain", "Recycle" as documented in https://kubernetes.io/docs/concepts/storage/storage-classes/ diff --git a/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml index aea55a29..ddfe629a 100644 --- a/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/Chart.yaml @@ -14,6 +14,6 @@ apiVersion: v1 appVersion: "1.0" -description: Cadvisor Helm Chart +description: Cadvisor Helm Chart name: cadvisor version: 0.1.0 diff --git a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml index e287c7d8..e33e5880 100644 --- a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/daemonset.yaml @@ -17,7 +17,7 @@ apiVersion: apps/v1beta2 kind: DaemonSet metadata: - name: {{ template "fullname" . }} + name: {{ template "fullname" . }} labels: app: {{ template "name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml index c52eb22d..daea41d5 100644 --- a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml @@ -17,7 +17,7 @@ apiVersion: v1 kind: Service metadata: - name: cadvisor + name: cadvisor labels: app: cadvisor release: {{ .Release.Name }} @@ -27,7 +27,7 @@ spec: selector: {{ include "rangeskipempty" .Values.cadvisor_prometheus.service.selector | indent 4 }} ports: - - name: cadvisor-prometheus + - name: cadvisor-prometheus {{- if eq .Values.cadvisor_prometheus.service.type "NodePort" }} nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.cadvisor_prometheus.service.nodePort }} {{- end }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml index dfb15f1d..6ca20b6f 100755 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/daemonset.yaml @@ -95,4 +95,4 @@ spec: hostPath: path: {{ $mount.hostPath }} {{- end }} - {{- end }}
\ No newline at end of file + {{- end }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml index 4c5c75fa..226dd486 100755 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/endpoints.yaml @@ -14,4 +14,4 @@ subsets: - name: metrics port: 9100 protocol: TCP -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml index 3d0a636a..b833c246 100755 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/psp-clusterrole.yaml @@ -8,7 +8,7 @@ metadata: rules: - apiGroups: ['extensions'] resources: ['podsecuritypolicies'] - verbs: ['use'] + verbs: ['use'] resourceNames: - {{ template "prometheus-node-exporter.fullname" . }} {{- end }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml index b70745aa..419451b8 100755 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus-node-exporter/templates/serviceaccount.yaml @@ -6,10 +6,10 @@ metadata: name: {{ template "prometheus-node-exporter.serviceAccountName" . }} labels: app: {{ template "prometheus-node-exporter.name" . }} - chart: {{ template "prometheus-node-exporter.chart" . }} + chart: {{ template "prometheus-node-exporter.chart" . }} release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" -imagePullSecrets: +imagePullSecrets: {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }} {{- end -}} -{{- end -}}
\ No newline at end of file +{{- end -}} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml index dfb932d8..4fa053e7 100644 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/role.yaml @@ -18,4 +18,4 @@ rules: verbs: - get - list - - watch
\ No newline at end of file + - watch diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/rolebinding.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/rolebinding.yaml index 04932ee1..b30c6cf7 100644 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/rolebinding.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/templates/rolebinding.yaml @@ -14,4 +14,4 @@ roleRef: subjects: - kind: ServiceAccount name: {{ template "prometheus.serviceAccountName" . }} - namespace: {{ .Release.Namespace }}
\ No newline at end of file + namespace: {{ .Release.Namespace }} diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml index e35c6735..a9f675da 100644 --- a/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml +++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml @@ -37,7 +37,7 @@ prometheus: - port: cadvisor-prometheus interval: 10s path: /metrics - + resources: {} service: type: ClusterIP diff --git a/vnfs/DAaaS/deploy/collection/values.yaml b/vnfs/DAaaS/deploy/collection/values.yaml index d46f3861..96cce139 100644 --- a/vnfs/DAaaS/deploy/collection/values.yaml +++ b/vnfs/DAaaS/deploy/collection/values.yaml @@ -31,9 +31,9 @@ global: # Enable or disable components ################################################################# -cadvisor: +cadvisor: enabled: true - + collectd: enabled: true diff --git a/vnfs/DAaaS/deploy/inference-core/values.yaml b/vnfs/DAaaS/deploy/inference-core/values.yaml index 10714b88..858f7251 100644 --- a/vnfs/DAaaS/deploy/inference-core/values.yaml +++ b/vnfs/DAaaS/deploy/inference-core/values.yaml @@ -27,4 +27,3 @@ global: ################################################################# # k8s Operator Day-0 configuration defaults. ################################################################# - diff --git a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml index 64915c66..ffea5e88 100644 --- a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml +++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/Chart.yaml @@ -18,4 +18,4 @@ sources: maintainers: - name: ppatierno - name: scholzj -- name: tombentley
\ No newline at end of file +- name: tombentley diff --git a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml index 12663c74..80004255 100644 --- a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml +++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml @@ -256,4 +256,4 @@ rules: - create - delete - patch - - update
\ No newline at end of file + - update diff --git a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml index 647774b5..cd8049ec 100644 --- a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml +++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml @@ -22,4 +22,4 @@ roleRef: name: strimzi-cluster-operator-namespaced apiGroup: rbac.authorization.k8s.io {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml index da7f2cda..625f3098 100644 --- a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml +++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/021-ClusterRole-strimzi-cluster-operator-role.yaml @@ -18,4 +18,4 @@ rules: - create - delete - patch - - update
\ No newline at end of file + - update diff --git a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml index 4d470e40..9df0bdad 100644 --- a/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml +++ b/vnfs/DAaaS/deploy/messaging/charts/strimzi-kafka-operator/templates/032-ClusterRole-strimzi-topic-operator.yaml @@ -26,4 +26,4 @@ rules: resources: - events verbs: - - create
\ No newline at end of file + - create diff --git a/vnfs/DAaaS/deploy/messaging/values.yaml b/vnfs/DAaaS/deploy/messaging/values.yaml index 5872bdf9..9f741508 100644 --- a/vnfs/DAaaS/deploy/messaging/values.yaml +++ b/vnfs/DAaaS/deploy/messaging/values.yaml @@ -26,4 +26,3 @@ global: ################################################################# # k8s Operator Day-0 configuration defaults. ################################################################# - diff --git a/vnfs/DAaaS/deploy/minio/templates/deployment.yaml b/vnfs/DAaaS/deploy/minio/templates/deployment.yaml index af335b2d..b21f0c46 100644 --- a/vnfs/DAaaS/deploy/minio/templates/deployment.yaml +++ b/vnfs/DAaaS/deploy/minio/templates/deployment.yaml @@ -57,28 +57,28 @@ spec: "/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway s3 {{ .Values.s3gateway.serviceEndpoint }}" ] {{- else }} {{- if .Values.azuregateway.enabled }} - command: [ "/bin/sh", - "-ce", + command: [ "/bin/sh", + "-ce", "/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway azure" ] {{- else }} {{- if .Values.gcsgateway.enabled }} - command: [ "/bin/sh", - "-ce", + command: [ "/bin/sh", + "-ce", "/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway gcs {{ .Values.gcsgateway.projectId }}" ] {{- else }} {{- if .Values.ossgateway.enabled }} - command: [ "/bin/sh", - "-ce", - "cp /tmp/config.json {{ .Values.configPath }} && + command: [ "/bin/sh", + "-ce", + "cp /tmp/config.json {{ .Values.configPath }} && /usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway oss {{ .Values.ossgateway.endpointURL }}" ] {{- else }} {{- if .Values.nasgateway.enabled }} - command: [ "/bin/sh", - "-ce", + command: [ "/bin/sh", + "-ce", "/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} gateway nas {{ .Values.mountPath }}" ] {{- else }} - command: [ "/bin/sh", - "-ce", + command: [ "/bin/sh", + "-ce", "/usr/bin/docker-entrypoint.sh minio -C {{ .Values.configPath }} server {{ .Values.mountPath }}" ] {{- end }} {{- end }} diff --git a/vnfs/DAaaS/deploy/minio/values.yaml b/vnfs/DAaaS/deploy/minio/values.yaml index 1b81a8cb..60bfb919 100755 --- a/vnfs/DAaaS/deploy/minio/values.yaml +++ b/vnfs/DAaaS/deploy/minio/values.yaml @@ -105,7 +105,7 @@ service: ingress: enabled: true - annotations: + annotations: kubernetes.io/ingress.class: gloo path: /.* hosts: diff --git a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/onap_v1alpha1_collectdglobal_crd.yaml b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/onap_v1alpha1_collectdglobal_crd.yaml index 89d38a70..00635ff2 100644 --- a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/onap_v1alpha1_collectdglobal_crd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/onap_v1alpha1_collectdglobal_crd.yaml @@ -72,4 +72,4 @@ spec: - name: v1alpha1 served: true storage: true -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/onap_v1alpha1_collectdplugin_crd.yaml b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/onap_v1alpha1_collectdplugin_crd.yaml index fccd7cd8..30af4e0f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/onap_v1alpha1_collectdplugin_crd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/onap_v1alpha1_collectdplugin_crd.yaml @@ -69,4 +69,4 @@ spec: - name: v1alpha1 served: true storage: true -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/operator.yaml b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/operator.yaml index c62dde2b..94a1eb5b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/operator.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/operator.yaml @@ -38,4 +38,4 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: "collectd-operator" -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/role.yaml b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/role.yaml index 73de6aad..3dafc6cf 100644 --- a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/role.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/role.yaml @@ -54,4 +54,4 @@ rules: - collectdglobals verbs: - '*' -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/role_binding.yaml b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/role_binding.yaml index 024ba2a1..99deda45 100644 --- a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/role_binding.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/role_binding.yaml @@ -17,4 +17,4 @@ roleRef: kind: ClusterRole name: collectd-operator apiGroup: rbac.authorization.k8s.io -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/service_account.yaml b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/service_account.yaml index d3c17cf8..40db9c9e 100644 --- a/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/service_account.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/collectd-operator/templates/service_account.yaml @@ -9,4 +9,4 @@ metadata: component: service-account release: {{ .Release.Name }} heritage: {{ .Release.Service }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml index 5528f766..5d975615 100644 --- a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-etcd-crd.yaml @@ -15,4 +15,4 @@ metadata: spec: clusterName: {{ .Values.etcdCluster.name }} {{ toYaml .Values.backupOperator.spec | indent 2 }} -{{- end}}
\ No newline at end of file +{{- end}} diff --git a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml index 06aec3df..fb255a84 100644 --- a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/backup-operator-service-account.yaml @@ -9,4 +9,4 @@ metadata: app: {{ template "etcd-backup-operator.name" . }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml index 0d385d8f..e309d5c6 100644 --- a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/etcd-cluster-crd.yaml @@ -22,4 +22,3 @@ spec: {{ toYaml .Values.etcdCluster.tls | indent 4 }} {{- end }} {{- end }} - diff --git a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml index 2faba8af..8eb5e934 100644 --- a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/operator-service-account.yaml @@ -9,4 +9,4 @@ metadata: app: {{ template "etcd-operator.name" . }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml index 73faaab8..e21f13f7 100644 --- a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-etcd-crd.yaml @@ -25,4 +25,4 @@ spec: {{ toYaml .Values.etcdCluster.tls | indent 6 }} {{- end }} {{ toYaml .Values.restoreOperator.spec | indent 2 }} -{{- end}}
\ No newline at end of file +{{- end}} diff --git a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml index 595cee92..d90d45fe 100644 --- a/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/etcd-operator/templates/restore-operator-service-account.yaml @@ -9,4 +9,4 @@ metadata: app: {{ template "etcd-restore-operator.name" . }} heritage: {{ .Release.Service }} release: {{ .Release.Name }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml index fd657f71..b0c8d85f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/ingress.yaml @@ -30,4 +30,4 @@ spec: tls: {{ toYaml .Values.alertmanager.ingress.tls | indent 4 }} {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml index f240fe76..3b47e7bf 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml @@ -17,4 +17,4 @@ spec: matchLabels: app: alertmanager alertmanager: {{ template "prometheus-operator.fullname" . }}-alertmanager -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml index 01eda240..29ddcf85 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/psp.yaml @@ -45,4 +45,3 @@ spec: max: 65535 readOnlyRootFilesystem: false {{- end }} - diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml index e73c465f..c6dfbd56 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/alertmanager/secret.yaml @@ -11,4 +11,4 @@ data: {{- range $key, $val := .Values.alertmanager.templateFiles }} {{ $key }}: {{ $val | b64enc | quote }} {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml index 5b8b54c4..6719e09f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml @@ -16,4 +16,4 @@ data: url: http://{{ template "prometheus-operator.fullname" . }}-prometheus:9090/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }} access: proxy isDefault: true -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml index 161b1907..ff37bf76 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml @@ -1107,4 +1107,4 @@ data: "title": "etcd", "version": 215 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index 5792140e..d5304846 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml @@ -923,4 +923,4 @@ data: "uid": "a6e7d1362e1ddbb79db21d5bb40d7137", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml index b638913e..2f625c2c 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-coredns.yaml @@ -1320,4 +1320,4 @@ data: "uid": "vkQ0UHxik", "version": 1 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index 19394efe..426e63a1 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -950,4 +950,4 @@ data: "uid": "4ac4f123aae0ff6dbaf4f4f66120033b", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml index 2f61ac42..b4643ebe 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -1335,4 +1335,4 @@ data: "uid": "efa86fd1d0c121a26444b636a3f509a8", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml index fae35be8..de4abc37 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -846,4 +846,4 @@ data: "uid": "85a562078cdf77779eaa1add43ccec1e", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml index 1678a051..12efecff 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -873,4 +873,4 @@ data: "uid": "6581e46e4e5c7ba40a07646395ef7b23", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml index ebc112c0..3529e7c9 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml @@ -1325,4 +1325,4 @@ data: "uid": "fa49a4706d07a042595b664c87fb33ea", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml index fe32a013..d6165711 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -356,4 +356,4 @@ data: "uid": "919b92a8e8041bd567af9edab12c840c", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml index f2bc6c40..de5a5cbf 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml @@ -497,4 +497,4 @@ data: "uid": "ab4f13a9892a76a4d21ce8c2445bf4ea", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml index 6195833d..a53a36cb 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml @@ -870,4 +870,4 @@ data: "uid": "a31c1f46e6f727cb37c0d731a7245005", "version": 0 } -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml index 297e8391..d001f69b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml @@ -40,4 +40,4 @@ spec: kubectl delete crd prometheusrules.monitoring.coreos.com; kubectl delete crd servicemonitors.monitoring.coreos.com; restartPolicy: OnFailure -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml index 594a2019..38aa2c4c 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml @@ -68,4 +68,4 @@ rules: - get - list - watch -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml index 9839687e..3efdc21f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/crd-prometheusrules.yaml @@ -357,4 +357,4 @@ spec: - rules type: array version: v1 -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml index 9532c1f9..aebbcf7b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml @@ -17,4 +17,4 @@ spec: namespaceSelector: matchNames: - {{ .Release.Namespace | quote }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml index 1c54f40b..023e7a4f 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml @@ -8,4 +8,4 @@ metadata: {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-alert-relabel-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertRelabelConfigs | b64enc | quote }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml index 4475e7bd..eba6e091 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml @@ -8,4 +8,4 @@ metadata: {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-alertmanager-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs | b64enc | quote }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml index 9d6bb616..4ac56ced 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml @@ -8,4 +8,4 @@ metadata: {{ include "prometheus-operator.labels" . | indent 4 }} data: additional-scrape-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalScrapeConfigs | b64enc | quote }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml index 799027d9..d19a69db 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrole.yaml @@ -32,4 +32,4 @@ rules: verbs: ["get", "list", "watch"] - nonResourceURLs: ["/metrics"] verbs: ["get"] -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml index b0c0e9e1..67b129b2 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml @@ -15,4 +15,3 @@ subjects: name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} namespace: {{ .Release.Namespace }} {{- end }} - diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml index e013e960..ee1434c6 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/ingress.yaml @@ -30,4 +30,4 @@ spec: tls: {{ toYaml .Values.prometheus.ingress.tls | indent 4 }} {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml index a51cda5d..f5aea442 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml @@ -17,4 +17,4 @@ spec: matchLabels: app: prometheus prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml index c172c0e3..eb2a955e 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/prometheus.yaml @@ -103,7 +103,7 @@ spec: ruleSelector: {{ toYaml .Values.prometheus.prometheusSpec.ruleSelector | indent 4}} {{- else if .Values.prometheus.prometheusSpec.ruleSelectorNilUsesHelmValues }} - ruleSelector: + ruleSelector: matchLabels: app: {{ template "prometheus-operator.name" . }} release: {{ .Release.Name | quote }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml index 08faa722..a9e5d83a 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml @@ -15,4 +15,3 @@ subjects: name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} namespace: {{ .Release.Namespace }} {{- end }} - diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml index eef28dad..00a2e8bc 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-config.yaml @@ -13,4 +13,4 @@ rules: - configmaps verbs: - get -{{- end}}
\ No newline at end of file +{{- end}} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml index 9fe3f20e..3c359d4c 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/role-specificNamespace.yaml @@ -24,4 +24,4 @@ items: - list - watch {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml index 64161876..366c5df0 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rolebinding-specificNamespace.yaml @@ -20,4 +20,4 @@ items: name: {{ template "prometheus-operator.prometheus.serviceAccountName" $ }} namespace: {{ $.Release.Namespace }} {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml index c1762fd1..75f9ef02 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml @@ -47,4 +47,4 @@ spec: for: 5m labels: severity: critical -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml index a68eeff2..381c5efe 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml @@ -133,4 +133,4 @@ spec: for: 10m labels: severity: warning -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml index 9f8349f9..431270a1 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml @@ -43,4 +43,4 @@ spec: expr: vector(1) labels: severity: none -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml index 678df008..ffc43130 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml @@ -57,4 +57,4 @@ spec: label_replace(kube_pod_labels{job="kube-state-metrics"}, "pod_name", "$1", "pod", "(.*)") ) record: namespace_name:kube_pod_container_resource_requests_cpu_cores:sum -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml index cbb19cb7..cd9b9768 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml @@ -32,4 +32,4 @@ spec: labels: quantile: '0.5' record: cluster_quantile:apiserver_request_latencies:histogram_quantile -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml index 2df9a096..a66e0685 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml @@ -34,4 +34,4 @@ spec: for: 10m labels: severity: critical -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml index 0d2ff510..b68a3845 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml @@ -34,4 +34,4 @@ spec: record: cluster:node_cpu:sum_rate5m - expr: cluster:node_cpu_seconds_total:rate5m / count(sum(node_cpu_seconds_total) BY (instance, cpu)) record: cluster:node_cpu:ratio -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml index e51b0181..f1eee9a2 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml @@ -56,4 +56,4 @@ spec: labels: quantile: '0.5' record: cluster_quantile:scheduler_binding_latency:histogram_quantile -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml index 19b09491..0115a8ef 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml @@ -120,4 +120,4 @@ spec: labels: severity: critical {{- end }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml index d3d2c498..970144ba 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml @@ -153,4 +153,4 @@ spec: for: 1h labels: severity: warning -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml index ed4a83c6..a281e49b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml @@ -96,4 +96,4 @@ spec: for: 15m labels: severity: warning -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml index edd8f5fc..bb1e1125 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml @@ -55,4 +55,4 @@ spec: for: 5m labels: severity: critical -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml index 8ccfa5bf..488b778b 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml @@ -116,4 +116,4 @@ spec: expr: histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400 labels: severity: critical -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml index 35245437..28159a22 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml @@ -195,4 +195,4 @@ spec: ) ) by (node) record: 'node:node_inodes_free:' -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml index 774a540c..d2a07a23 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml @@ -36,4 +36,4 @@ spec: for: 10m labels: severity: warning -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml index 3c9e1490..5424d709 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml @@ -102,4 +102,4 @@ spec: for: 10m labels: severity: warning -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml index 23841a48..855e4934 100644 --- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml @@ -528,7 +528,7 @@ kube-state-metrics: ## Deploy node exporter as a daemonset to all nodes ## nodeExporter: - enabled: false + enabled: false ## Use the value configured in prometheus-node-exporter.podLabels ## diff --git a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/Chart.yaml b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/Chart.yaml index 74485ffd..59db9c2a 100644 --- a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/Chart.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" -description: A Helm chart for Visualization-operator +description: A Helm chart for Visualization-operator name: visualization-operator version: 0.1.0 diff --git a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/onap_v1alpha1_grafanadatasource_crd.yaml b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/onap_v1alpha1_grafanadatasource_crd.yaml index f7daa406..6d8136a9 100644 --- a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/onap_v1alpha1_grafanadatasource_crd.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/onap_v1alpha1_grafanadatasource_crd.yaml @@ -69,4 +69,4 @@ spec: - name: v1alpha1 served: true storage: true -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/operator.yaml b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/operator.yaml index ed32b763..40f19742 100644 --- a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/operator.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/operator.yaml @@ -36,4 +36,4 @@ spec: fieldPath: metadata.name - name: OPERATOR_NAME value: "visualization-operator" -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/role.yaml b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/role.yaml index 11a7a900..a4f092c5 100644 --- a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/role.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/role.yaml @@ -65,4 +65,4 @@ rules: - '*' verbs: - '*' -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/role_binding.yaml b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/role_binding.yaml index 0b9319e4..ad43bd20 100644 --- a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/role_binding.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/role_binding.yaml @@ -17,4 +17,4 @@ roleRef: kind: Role name: visualization-operator apiGroup: rbac.authorization.k8s.io -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/service_account.yaml b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/service_account.yaml index 58b550ea..4395551a 100644 --- a/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/service_account.yaml +++ b/vnfs/DAaaS/deploy/operator/charts/visualization-operator/templates/service_account.yaml @@ -9,4 +9,4 @@ metadata: component: service-account release: {{ .Release.Name }} heritage: {{ .Release.Service }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml index 02b04862..fb8aff9a 100644 --- a/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml +++ b/vnfs/DAaaS/deploy/training-core/charts/m3db/templates/m3dbcluster.yaml @@ -20,5 +20,3 @@ spec: limits: memory: 12Gi cpu: '4' - - diff --git a/vnfs/DAaaS/deploy/training-core/values.yaml b/vnfs/DAaaS/deploy/training-core/values.yaml index fd98eb36..064be3ee 100644 --- a/vnfs/DAaaS/deploy/training-core/values.yaml +++ b/vnfs/DAaaS/deploy/training-core/values.yaml @@ -26,4 +26,3 @@ global: ################################################################# # k8s Operator Day-0 configuration defaults. ################################################################# - diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml index d125f875..eb4bebe0 100644 --- a/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml +++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/templates/configmap-add-dashboard.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: custom-dashboard1 + name: custom-dashboard1 labels: app: {{ template "grafana.name" . }} chart: {{ template "grafana.chart" . }} diff --git a/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml index dea2bd95..8b075f98 100644 --- a/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml +++ b/vnfs/DAaaS/deploy/visualization/charts/grafana/values.yaml @@ -156,7 +156,7 @@ persistence: # Administrator credentials when not using an existing secret (see below) adminUser: admin -adminPassword: admin +adminPassword: admin # Use an existing secret for the admin user. admin: diff --git a/vnfs/DAaaS/deploy/visualization/grafana-values.yaml b/vnfs/DAaaS/deploy/visualization/grafana-values.yaml index cf04bc8c..daecd280 100644 --- a/vnfs/DAaaS/deploy/visualization/grafana-values.yaml +++ b/vnfs/DAaaS/deploy/visualization/grafana-values.yaml @@ -34,6 +34,6 @@ grafana: editable: true options: path: /var/lib/grafana/dashboards/dashboard1 - + dashboardsConfigMaps: dashboard1: "custom-dashboard1" diff --git a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_hdfs.yaml b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_hdfs.yaml index 1fdd7ca2..3c053192 100644 --- a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_hdfs.yaml +++ b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_hdfs.yaml @@ -7,4 +7,3 @@ metadata: data: #hdfs_url: hdfs1-namenode-1.hdfs1-namenode.hdfs1:8020 hdfs_url: hdfs1-namenode:8020 -
\ No newline at end of file diff --git a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_kafka.yaml b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_kafka.yaml index 503896b3..ba7ef65b 100644 --- a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_kafka.yaml +++ b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_kafka.yaml @@ -8,4 +8,4 @@ data: #broker: kafka-cluster-kafka-1.kafka-cluster-kafka-brokers.hdfs1.svc.cluster.local:9092 broker: kafka-cluster-kafka-bootstrap:9092 group: grp1i - topic: newTopc9
\ No newline at end of file + topic: newTopc9 diff --git a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_writer.yaml b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_writer.yaml index f5d0833b..48b3458e 100644 --- a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_writer.yaml +++ b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/configmap_writer.yaml @@ -1,4 +1,4 @@ -#Preserving a sample config of writer. +#Preserving a sample config of writer. #NOTE : The writer config shall come through the REST request apiVersion: v1 kind: ConfigMap @@ -19,4 +19,3 @@ data: } } ] -
\ No newline at end of file diff --git a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/hdfs_writer_deployment.yaml b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/hdfs_writer_deployment.yaml index 393a1d78..82d1dc0d 100644 --- a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/hdfs_writer_deployment.yaml +++ b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/hdfs_writer_deployment.yaml @@ -31,22 +31,22 @@ spec: value: "8080" - name: BROKER valueFrom: - configMapKeyRef: + configMapKeyRef: name: configmap-kafka key: broker - name: GROUP valueFrom: - configMapKeyRef: + configMapKeyRef: name: configmap-kafka key: group - name: TOPIC valueFrom: - configMapKeyRef: + configMapKeyRef: name: configmap-kafka key: topic - name: HDFS_URL valueFrom: - configMapKeyRef: + configMapKeyRef: name: configmap-hdfs key: hdfs_url resources: @@ -56,7 +56,7 @@ spec: limits: memory: "1280Mi" cpu: "5000m" - volumes: + volumes: - name: config-volume configMap: name: config-json diff --git a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/hdfs_writer_service.yaml b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/hdfs_writer_service.yaml index 596ad5fd..de90e175 100644 --- a/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/hdfs_writer_service.yaml +++ b/vnfs/DAaaS/microservices/GoApps/src/go-hdfs-writer/kubernetes-manifests/hdfs_writer_service.yaml @@ -11,4 +11,3 @@ spec: - nodePort: 30303 port: 9393 targetPort: 9393 -
\ No newline at end of file diff --git a/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/collectdglobal.yaml b/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/collectdglobal.yaml index 60dec7c4..68ffcc2b 100644 --- a/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/collectdglobal.yaml +++ b/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/collectdglobal.yaml @@ -12,4 +12,4 @@ spec: TypesDB "/opt/collectd/share/collectd/vcmts.types.db" #Hostname "localhost" Interval 1 - configMap: typesdb-configmap + configMap: typesdb-configmap diff --git a/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/cpu_collectdplugin_cr.yaml b/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/cpu_collectdplugin_cr.yaml index d10b82af..d6248b83 100644 --- a/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/cpu_collectdplugin_cr.yaml +++ b/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/cpu_collectdplugin_cr.yaml @@ -11,4 +11,3 @@ spec: ReportByState false ReportByCpu false </Plugin> - diff --git a/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/memory_collectdplugin_cr.yaml b/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/memory_collectdplugin_cr.yaml index ee051ed3..f0627dd8 100644 --- a/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/memory_collectdplugin_cr.yaml +++ b/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/memory_collectdplugin_cr.yaml @@ -11,4 +11,3 @@ spec: ValuesAbsolute false ValuesPercentage true </Plugin> -
\ No newline at end of file diff --git a/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/prometheus_collectdplugin_cr.yaml b/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/prometheus_collectdplugin_cr.yaml index 1b8cf9bc..1fada738 100644 --- a/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/prometheus_collectdplugin_cr.yaml +++ b/vnfs/DAaaS/microservices/collectd-operator/examples/collectd/prometheus_collectdplugin_cr.yaml @@ -9,4 +9,3 @@ spec: <Plugin "write_prometheus"> Port 9103 </Plugin> - diff --git a/vnfs/DAaaS/microservices/remote-config-operator/deploy/operator.yaml b/vnfs/DAaaS/microservices/remote-config-operator/deploy/operator.yaml index 5be3f765..4a77165e 100644 --- a/vnfs/DAaaS/microservices/remote-config-operator/deploy/operator.yaml +++ b/vnfs/DAaaS/microservices/remote-config-operator/deploy/operator.yaml @@ -30,4 +30,4 @@ spec: fieldRef: fieldPath: metadata.name - name: OPERATOR_NAME - value: "remote-config-operator"
\ No newline at end of file + value: "remote-config-operator" diff --git a/vnfs/DAaaS/microservices/remote-config-operator/examples/onap.org_v1alpha1_prometheusremoteendpoint_cr.yaml b/vnfs/DAaaS/microservices/remote-config-operator/examples/onap.org_v1alpha1_prometheusremoteendpoint_cr.yaml index 90d1ce74..1d76add3 100644 --- a/vnfs/DAaaS/microservices/remote-config-operator/examples/onap.org_v1alpha1_prometheusremoteendpoint_cr.yaml +++ b/vnfs/DAaaS/microservices/remote-config-operator/examples/onap.org_v1alpha1_prometheusremoteendpoint_cr.yaml @@ -1,5 +1,5 @@ apiVersion: onap.org/v1alpha1 -kind: PrometheusRemoteEndpoint +kind: PrometheusRemoteEndpoint metadata: name: relabelconfig-m3db1 labels: diff --git a/vnfs/DAaaS/microservices/remote-config-operator/examples/onap.org_v1alpha1_remotefilteraction_cr.yaml b/vnfs/DAaaS/microservices/remote-config-operator/examples/onap.org_v1alpha1_remotefilteraction_cr.yaml index c35d8001..c6ab4741 100644 --- a/vnfs/DAaaS/microservices/remote-config-operator/examples/onap.org_v1alpha1_remotefilteraction_cr.yaml +++ b/vnfs/DAaaS/microservices/remote-config-operator/examples/onap.org_v1alpha1_remotefilteraction_cr.yaml @@ -8,4 +8,4 @@ spec: action: drop regex: (.*) sourceLabels: - - __name__
\ No newline at end of file + - __name__ diff --git a/vnfs/DAaaS/microservices/visualization-operator/examples/grafana/influxdb_grafanadatasource_cr.yaml b/vnfs/DAaaS/microservices/visualization-operator/examples/grafana/influxdb_grafanadatasource_cr.yaml index 5d9753ee..3d6ef8c6 100644 --- a/vnfs/DAaaS/microservices/visualization-operator/examples/grafana/influxdb_grafanadatasource_cr.yaml +++ b/vnfs/DAaaS/microservices/visualization-operator/examples/grafana/influxdb_grafanadatasource_cr.yaml @@ -6,7 +6,7 @@ spec: datasources: - name: InfluxDB type: influxdb - url: http://localhost:8086 + url: http://localhost:8086 isDefault: false access: proxy withCredentials: true @@ -19,6 +19,6 @@ spec: jsonData: timeInterval: 15s grafana: - url: http://vis-grafana.default.svc.cluster.local + url: http://vis-grafana.default.svc.cluster.local username: admin password: admin diff --git a/vnfs/DAaaS/microservices/visualization-operator/examples/grafana/prometheus_grafanadatasource_cr.yaml b/vnfs/DAaaS/microservices/visualization-operator/examples/grafana/prometheus_grafanadatasource_cr.yaml index 2820baf7..90303243 100644 --- a/vnfs/DAaaS/microservices/visualization-operator/examples/grafana/prometheus_grafanadatasource_cr.yaml +++ b/vnfs/DAaaS/microservices/visualization-operator/examples/grafana/prometheus_grafanadatasource_cr.yaml @@ -8,7 +8,7 @@ spec: type: prometheus url: http://cp-prometheus-prometheus:9090 isDefault: true - access: direct + access: direct withCredentials: true basicAuth: true basicAuthUser: user @@ -18,6 +18,6 @@ spec: queryTimeout: 50s readOnly: false grafana: - url: http://vis-grafana.default.svc.cluster.local + url: http://vis-grafana.default.svc.cluster.local username: admin password: admin diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/Chart.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/Chart.yaml index 5bfedbf8..90a54ebd 100644 --- a/vnfs/DAaaS/sample-apps/m3db_promql/Chart.yaml +++ b/vnfs/DAaaS/sample-apps/m3db_promql/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" -description: Helm chart for a sample promql query app +description: Helm chart for a sample promql query app name: promql_query_app version: 0.1.0 diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml index 7116a175..31556045 100644 --- a/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml +++ b/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml @@ -3,4 +3,4 @@ kind: ConfigMap metadata: name: {{ if .Values.prometheus.configMapName }}{{ .Values.prometheus.configMapName }}{{ else }}{{ template "promql_query_app.fullname" . }}{{ end }} data: - prometheus_endpoint: {{ .Values.prometheus.serverURL }}
\ No newline at end of file + prometheus_endpoint: {{ .Values.prometheus.serverURL }} diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml index 9920bccd..8bcf0336 100644 --- a/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml +++ b/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml @@ -58,4 +58,3 @@ nodeSelector: {} tolerations: [] affinity: {} - diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml index 3ce06e28..b53b2ff0 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: "A sample horovod application which runs the MNIST application using Tensorflow as backend" name: sample-horovod-app-keras-mnist-advanced -version: 0.1.0 +version: 0.1.0 diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml index 7030dd24..d8b9aa22 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml @@ -35,10 +35,10 @@ worker: image: repository: spark-tf-keras-horovod-pytorch tag: latest - pullPolicy: Never + pullPolicy: Never master: image: - repository: spark-tf-keras-horovod-pytorch + repository: spark-tf-keras-horovod-pytorch tag: latest pullPolicy: Never args: diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml index ae93c445..70d18eab 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml @@ -73,7 +73,7 @@ data: yes | cp /etc/secret-volume/authorized_keys /root/.ssh/authorized_keys set -e fi - + for i in `cat $1 | awk '{print $(1)}'`;do if [[ "$i" != *"master" ]];then retry 30 ssh -o ConnectTimeout=2 -q $i exit @@ -102,14 +102,14 @@ data: if [ $? -ne 0 ]; then exit 1 fi - set -e + set -e } updateSSHPort runCheckSSH $1 worker.run: | #!/bin/bash set -x - + mkdir -p /root/.ssh rm -f /root/.ssh/config touch /root/.ssh/config diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml index e7b05c26..b7fe1e53 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml @@ -10,7 +10,7 @@ metadata: spec: clusterIP: None ports: - - name: ssh + - name: ssh port: {{ .Values.ssh.port }} targetPort: {{ .Values.ssh.port }} selector: diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml index da42ded8..2263ddbc 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml @@ -64,7 +64,7 @@ spec: - name: USESECRETS value: "{{ .Values.ssh.useSecrets }}" {{- end }} - {{- if .Values.master.env }} + {{- if .Values.master.env }} {{- range $key, $value := .Values.master.env }} - name: "{{ $key }}" value: "{{ $value }}" @@ -101,10 +101,10 @@ spec: {{- if .Values.volumeMounts }} {{ toYaml .Values.volumeMounts | indent 8 }} {{- end }} - command: + command: - /horovod/generated/run.sh args: -{{ toYaml .Values.master.args | indent 10 }} +{{ toYaml .Values.master.args | indent 10 }} resources: {{ toYaml .Values.resources | indent 10 }} {{- if .Values.ssh.useSecrets }} @@ -119,13 +119,13 @@ spec: - name: USESECRETS value: "{{ .Values.ssh.useSecrets }}" {{- end }} - {{- if .Values.master.env }} + {{- if .Values.master.env }} {{- range $key, $value := .Values.master.env }} - name: "{{ $key }}" value: "{{ $value }}" {{- end }} {{- end }} - command: + command: - /horovod/generated/waitWorkersReady.sh args: - /horovod/generated/hostfile diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml index c9853ed0..992ed87e 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml @@ -12,4 +12,4 @@ type: Opaque data: host-key: {{ .Values.ssh.hostKey | b64enc | quote }} host-key-pub: {{ .Values.ssh.hostKeyPub | b64enc | quote }} -{{- end }}
\ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml index d0216a86..70fd0478 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml @@ -10,7 +10,7 @@ metadata: spec: clusterIP: None ports: - - name: ssh + - name: ssh port: {{ .Values.ssh.port }} targetPort: {{ .Values.ssh.port }} selector: diff --git a/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml index f728f82e..1b12e479 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml @@ -2,7 +2,7 @@ apiVersion: "sparkoperator.k8s.io/v1beta1" kind: SparkApplication metadata: name: {{ .Values.nameOfTheSparkApp }} - namespace: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} spec: type: {{ .Values.programmingLanguageType }} mode: {{ .Values.modeOfSparkApp | default "cluster" }} @@ -10,7 +10,7 @@ spec: imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }} mainClass: {{ .Values.mainClassOfTheSparkApp }} mainApplicationFile: {{ .Values.mainApplicationFileOfTheSparkApp }} - arguments: + arguments: {{- range .Values.argumentsOfTheSparkProgram }} - {{ . }} {{ end }} diff --git a/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml index afb48d67..07457ac8 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml @@ -2,7 +2,6 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. - #===========================KUBERNETES POD RELATED CONFIGs======================== image: spark-tf-keras-horo:latest imagePullPolicy: Never @@ -11,47 +10,33 @@ volumesName: test-volume hostpath: /tmp hostpathType: Directory - - #============================SPARK APP RELATED CONFIGs============================= - -nameOfTheSparkApp: spark-apache-logs2 +nameOfTheSparkApp: spark-apache-logs2 # Python or Scala supported. programmingLanguageType: Scala modeOfSparkApp: cluster mainClassOfTheSparkApp: ApacheLogAnalysis # can be http path, s3 path, minio path -mainApplicationFileOfTheSparkApp: https://github.com/mohanraj1311/ApacheLogAnalysisJar/raw/master/analysisofapachelogs_2.11-0.1.jar +mainApplicationFileOfTheSparkApp: https://github.com/mohanraj1311/ApacheLogAnalysisJar/raw/master/analysisofapachelogs_2.11-0.1.jar argumentsOfTheSparkProgram: - - hdfs://hdfs-1-namenode-1.hdfs-1-namenode.hdfs1.svc.cluster.local:8020/data/apache-logs - - + - hdfs://hdfs-1-namenode-1.hdfs-1-namenode.hdfs1.svc.cluster.local:8020/data/apache-logs #============================SPARK DRIVER RELATED CONFIGs========================= driverCores: 0.1 driverCoreLimit: 200m driverMemory: 1024m driverVolumeMountsName: test-volume -driverVolumeMountPath: /tmp - - +driverVolumeMountPath: /tmp #============================SPARK EXECUTOR RELATED CONFIGs======================= -executorCores: 1 -executorInstances: 1 +executorCores: 1 +executorInstances: 1 executorMemory: 512m executorVolumeMountsName: test-volume executorVolumeMountPath: /tmp - - #===========================HADOOP RELATED CONFIGs=============================== # config map of the hdfs hadoopConfigMap: hdfs-1-config - ################################################################################### - - - - |