From 1ba2b2560856dae9f921745ca1298bb19ea57a96 Mon Sep 17 00:00:00 2001 From: Dominic Lunanuova Date: Mon, 30 Apr 2018 19:01:31 +0000 Subject: Merge message-router chart under dmaap Borislav: Fixed Makefile and renamed charts. Also cosmetic fixes. Includes corrections for the service name of MR used by dbc to be "message-router", which matches the message-router chart Patchset 2: standardize abbreviation for bus-controller to be "dbc" Patchset 3: correct references in README to match what is deployed Patchset 4: blew previous commit. Also added dmaap/Makefile lint step Change-Id: I36c07c7c1200f8e23ae12bd7357a5626346dcccd Signed-off-by: Dominic Lunanuova Issue-ID: DMAAP-386 Signed-off-by: Dominic Lunanuova --- .../charts/zookeeper/templates/pv.yaml | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 kubernetes/message-router/charts/zookeeper/templates/pv.yaml (limited to 'kubernetes/message-router/charts/zookeeper/templates/pv.yaml') diff --git a/kubernetes/message-router/charts/zookeeper/templates/pv.yaml b/kubernetes/message-router/charts/zookeeper/templates/pv.yaml deleted file mode 100644 index da117f4919..0000000000 --- a/kubernetes/message-router/charts/zookeeper/templates/pv.yaml +++ /dev/null @@ -1,37 +0,0 @@ -{{/* -# Copyright © 2017 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. -*/}} - -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} -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: - capacity: - storage: {{ .Values.persistence.size }} - accessModes: - - {{ .Values.persistence.accessMode }} - persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }} - hostPath: - path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }} -{{- end -}} -- cgit 1.2.3-korg