From cec10b4b7f1dc17f514d7e9684383b213d0da709 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Tue, 4 Dec 2018 15:10:28 -0500 Subject: Add persistent storage for DCAE Cloudify Manager Issue-ID: DCAEGEN2-990 Change-Id: I700bce2906ab136989968236a02fd8899e29bcd3 Signed-off-by: Jack Lucas --- .../templates/deployment.yaml | 15 +++------ .../charts/dcae-cloudify-manager/templates/pv.yaml | 37 ++++++++++++++++++++++ .../dcae-cloudify-manager/templates/pvc.yaml | 33 +++++++++++++++++++ .../charts/dcae-cloudify-manager/values.yaml | 10 +++++- 4 files changed, 84 insertions(+), 11 deletions(-) create mode 100644 kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pv.yaml create mode 100644 kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pvc.yaml (limited to 'kubernetes/dcaegen2/charts') diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml index 79bd8962da..62eeb45281 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/deployment.yaml @@ -70,18 +70,10 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true + - mountPath: /cfy-persist + name: cm-persistent securityContext: privileged: True - lifecycle: - postStart: - exec: - command: - - bash - - "-c" - - | - set -ex - mkdir -p /var/run/secrets/kubernetes.io/ - ln -s /secret /var/run/secrets/kubernetes.io/serviceaccount volumes: - name: {{ include "common.fullname" . }}-config configMap: @@ -95,5 +87,8 @@ spec: - name: localtime hostPath: path: /etc/localtime + - name: cm-persistent + persistentVolumeClaim: + claimName: {{ include "common.fullname" . }}-data imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pv.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pv.yaml new file mode 100644 index 0000000000..bef681ad27 --- /dev/null +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pv.yaml @@ -0,0 +1,37 @@ +#============LICENSE_START======================================================== +# ================================================================================ +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Modifications Copyright © 2018 Amdocs, Bell Canada +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +kind: PersistentVolume +apiVersion: v1 +metadata: + name: {{ include "common.fullname" . }} + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" + name: {{ include "common.fullname" . }} +spec: + storageClassName: manual + capacity: + storage: {{ .Values.persistence.size }} + accessModes: + - {{ .Values.persistence.accessMode }} + hostPath: + path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }} diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pvc.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pvc.yaml new file mode 100644 index 0000000000..6740082b37 --- /dev/null +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/pvc.yaml @@ -0,0 +1,33 @@ +# ================================================================================ +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= + +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: {{ include "common.fullname" . }}-data + labels: + name: {{ include "common.fullname" . }} + namespace: {{ include "common.namespace" . }} +spec: + storageClassName: manual + accessModes: + - {{ .Values.persistence.accessMode }} + resources: + requests: + storage: {{ .Values.persistence.size }} + selector: + matchLabels: + name: {{ include "common.fullname" . }} \ No newline at end of file diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml index 08e01d6258..ecaee65785 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml @@ -43,7 +43,7 @@ config: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.deployments.cm-container:1.4.2 +image: onap/org.onap.dcaegen2.deployments.cm-container:1.5.0 pullPolicy: Always # probe configuration parameters @@ -87,3 +87,11 @@ resources: # Kubernetes namespace for components deployed via Cloudify manager # If empty, use the common namespace # dcae_ns: "dcae" + +# Parameters for persistent storage +persistence: + enabled: true + accessMode: ReadWriteOnce + size: 4Gi + mountPath: /dockerdata-nfs + mountSubPath: dcae-cm/data -- cgit 1.2.3-korg