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/device-management/.helmignore b/device-management/.helmignore
new file mode 100644
index 0000000..f0c1319
--- /dev/null
+++ b/device-management/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/device-management/Chart.yaml b/device-management/Chart.yaml
new file mode 100644
index 0000000..23115a7
--- /dev/null
+++ b/device-management/Chart.yaml
@@ -0,0 +1,18 @@
+---
+# 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.
+
+name: device-management
+description: Redfish device management for SEBA
+version: 1.0.0-dev
diff --git a/device-management/README.md b/device-management/README.md
new file mode 100644
index 0000000..91d659c
--- /dev/null
+++ b/device-management/README.md
@@ -0,0 +1,7 @@
+# Nem Monitoring
+
+To deploy this chart please use:
+
+```shell
+helm install -n device-management device-management --set images.device_management.pullPolicy='IfNotPresent' --set images.device_management.tag='latest' --set useCeph=false
+```
diff --git a/device-management/templates/NOTES.txt b/device-management/templates/NOTES.txt
new file mode 100644
index 0000000..45a59a1
--- /dev/null
+++ b/device-management/templates/NOTES.txt
@@ -0,0 +1,5 @@
+Thank you for installing {{ .Chart.Name }}.
+
+Your release is named {{ .Release.Name }}.
+
+
diff --git a/device-management/templates/importer-deployment.yaml b/device-management/templates/importer-deployment.yaml
new file mode 100644
index 0000000..7852f0e
--- /dev/null
+++ b/device-management/templates/importer-deployment.yaml
@@ -0,0 +1,72 @@
+---
+# 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.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: EVENT_NOTIFICATION_DESTIP
+ value: "{{ .Values.event_destip }}"
+ - name: DEVICE_MANAGEMENT_DESTPORT
+ value: "{{ .Values.device_management_httpPort }}"
+{{- if .Values.needPersistence }}
+ - name: DEVICE_MANAGEMENT_PVMOUNT
+ value: {{ .Values.device_management_pv_mount | quote }}
+ volumeMounts:
+ - name: device-management-persistent-storage
+ mountPath: {{ .Values.device_management_pv_mount | quote }}
+ volumes:
+ - name: device-management-persistent-storage
+ persistentVolumeClaim:
+ claimName: {{ .Values.pvClaimName }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+ name: {{ .Values.pvClaimName }}
+spec:
+{{- if .Values.useCeph }}
+ storageClassName: {{ .Values.storageCephClassName }}
+{{- else }}
+ storageClassName: {{ .Values.storageLDClassName }}
+{{- end }}
+ accessModes:
+ - ReadWriteOnce
+ resources:
+ requests:
+ storage: 1Gi
+{{- end }}
diff --git a/nem-monitoring/templates/importer-service.yaml b/device-management/templates/importer-service.yaml
similarity index 88%
rename from nem-monitoring/templates/importer-service.yaml
rename to device-management/templates/importer-service.yaml
index 55b4089..795b247 100644
--- a/nem-monitoring/templates/importer-service.yaml
+++ b/device-management/templates/importer-service.yaml
@@ -25,12 +25,12 @@
- name: http
port: 8080
targetPort: 8080
- nodePort: {{ .Values.nem_device_management_httpPort }}
+ nodePort: {{ .Values.device_management_httpPort }}
protocol: TCP
- name: grpc
port: 50051
targetPort: 50051
- nodePort: {{ .Values.nem_device_management_grpcPort }}
+ nodePort: {{ .Values.device_management_grpcPort }}
protocol: TCP
selector:
app: "device-management"
diff --git a/device-management/values.yaml b/device-management/values.yaml
new file mode 100644
index 0000000..46263b2
--- /dev/null
+++ b/device-management/values.yaml
@@ -0,0 +1,37 @@
+---
+# Copyright 2018-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.
+
+global:
+ registry: ''
+
+images:
+ device_management:
+ repository: 'opencord/device-management'
+ tag: 'master'
+ pullPolicy: 'Always'
+
+device_management_grpcPort: 31085
+device_management_httpPort: 30180
+device_management_replicas: 1
+device_management_pv_mount: '/tmp'
+
+event_destip: ''
+
+# persistence related vars
+needPersistence: true
+useCeph: true
+pvClaimName: device-management-pv-claim
+storageLDClassName: local-directory
+storageCephClassName: cord-ceph-rbd
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/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