SEBA-761 separate device management from nem-monitoring chartby creating a new device management chart that includes the use of persistent volumes
Change-Id: I29bdd6a77533716afdb8ac8a78b14b5ab97d461b
diff --git a/nem-monitoring/Chart.yaml b/nem-monitoring/Chart.yaml
index 197d37c..2816c6c 100644
--- a/nem-monitoring/Chart.yaml
+++ b/nem-monitoring/Chart.yaml
@@ -15,4 +15,4 @@
name: nem-monitoring
description: Time Series Storage and Dashboard for SEBA
-version: 1.0.11-dev
+version: 1.0.12-dev
diff --git a/nem-monitoring/templates/importer-deployment.yaml b/nem-monitoring/templates/importer-deployment.yaml
deleted file mode 100644
index 0744c4f..0000000
--- a/nem-monitoring/templates/importer-deployment.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
- name: device-management
- labels:
- release: {{ .Release.Name }}
-spec:
- replicas: {{ .Values.nem_device_management_replicas }}
- template:
- metadata:
- labels:
- app: device-management
- release: {{ .Release.Name }}
- spec:
- containers:
- - name: device-management
- image: "{{ .Values.global.registry }}{{ .Values.images.device_management.repository }}:{{ tpl .Values.images.device_management.tag . }}"
- imagePullPolicy: "{{ .Values.images.device_management.pullPolicy }}"
- ports:
- - containerPort: 8080
- port: 8080
- protocol: TCP
- - containerPort: 50051
- port: 50051
- protocol: TCP
- env:
- - name: DEVICE_MANAGEMENT_DESTIP
- valueFrom:
- fieldRef:
- fieldPath: status.hostIP
- - name: DEVICE_MANAGEMENT_DESTPORT
- value: "{{ .Values.nem_device_management_httpPort }}"
diff --git a/nem-monitoring/templates/importer-service.yaml b/nem-monitoring/templates/importer-service.yaml
deleted file mode 100644
index 55b4089..0000000
--- a/nem-monitoring/templates/importer-service.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: device-management
- labels:
- release: {{ .Release.Name }}
-spec:
- type: NodePort
- ports:
- - name: http
- port: 8080
- targetPort: 8080
- nodePort: {{ .Values.nem_device_management_httpPort }}
- protocol: TCP
- - name: grpc
- port: 50051
- targetPort: 50051
- nodePort: {{ .Values.nem_device_management_grpcPort }}
- protocol: TCP
- selector:
- app: "device-management"
diff --git a/nem-monitoring/values.yaml b/nem-monitoring/values.yaml
index ccf0277..47b0682 100644
--- a/nem-monitoring/values.yaml
+++ b/nem-monitoring/values.yaml
@@ -22,15 +22,6 @@
tag: '1.2.3'
pullPolicy: 'Always'
- device_management:
- repository: 'opencord/device-management'
- tag: 'master'
- pullPolicy: 'Always'
-
-nem_device_management_grpcPort: 31085
-nem_device_management_httpPort: 30180
-nem_device_management_replicas: 1
-
kpi_exporter:
nem_kpi_exporter_nodePort: 31080
nem_kpi_exporter_replicas: 2