From 7eeb66d6e4bc78e647e1166c70acfaea487743e0 Mon Sep 17 00:00:00 2001 From: BorislavG Date: Sun, 22 Apr 2018 11:53:43 +0000 Subject: [PATCH] Fix DCAE Redis Change-Id: Ie9375030601961ee6975f49acddb9822e1eb067c Issue-ID: OOM-985 Signed-off-by: BorislavG --- kubernetes/dcaegen2/charts/{redis => dcae-redis}/.helmignore | 0 kubernetes/dcaegen2/charts/{redis => dcae-redis}/Chart.yaml | 2 +- .../dcaegen2/charts/{redis => dcae-redis}/requirements.yaml | 0 .../resources/redis/scripts/redis-cluster-config.sh | 0 .../dcaegen2/charts/{redis => dcae-redis}/templates/NOTES.txt | 0 .../charts/{redis => dcae-redis}/templates/configmap.yaml | 0 .../dcaegen2/charts/{redis => dcae-redis}/templates/pv.yaml | 0 .../charts/{redis => dcae-redis}/templates/service.yaml | 10 +++++----- .../charts/{redis => dcae-redis}/templates/statefulset.yaml | 0 kubernetes/dcaegen2/charts/{redis => dcae-redis}/values.yaml | 7 ++++--- 10 files changed, 10 insertions(+), 9 deletions(-) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/.helmignore (100%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/Chart.yaml (97%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/requirements.yaml (100%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/resources/redis/scripts/redis-cluster-config.sh (100%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/templates/NOTES.txt (100%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/templates/configmap.yaml (100%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/templates/pv.yaml (100%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/templates/service.yaml (88%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/templates/statefulset.yaml (100%) rename kubernetes/dcaegen2/charts/{redis => dcae-redis}/values.yaml (98%) diff --git a/kubernetes/dcaegen2/charts/redis/.helmignore b/kubernetes/dcaegen2/charts/dcae-redis/.helmignore similarity index 100% rename from kubernetes/dcaegen2/charts/redis/.helmignore rename to kubernetes/dcaegen2/charts/dcae-redis/.helmignore diff --git a/kubernetes/dcaegen2/charts/redis/Chart.yaml b/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml similarity index 97% rename from kubernetes/dcaegen2/charts/redis/Chart.yaml rename to kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml index 692b7ab5d9..271458c8df 100644 --- a/kubernetes/dcaegen2/charts/redis/Chart.yaml +++ b/kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml @@ -14,5 +14,5 @@ apiVersion: v1 description: ONAP DCAE Redis -name: redis +name: dcae-redis version: 2.0.0 diff --git a/kubernetes/dcaegen2/charts/redis/requirements.yaml b/kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml similarity index 100% rename from kubernetes/dcaegen2/charts/redis/requirements.yaml rename to kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml diff --git a/kubernetes/dcaegen2/charts/redis/resources/redis/scripts/redis-cluster-config.sh b/kubernetes/dcaegen2/charts/dcae-redis/resources/redis/scripts/redis-cluster-config.sh similarity index 100% rename from kubernetes/dcaegen2/charts/redis/resources/redis/scripts/redis-cluster-config.sh rename to kubernetes/dcaegen2/charts/dcae-redis/resources/redis/scripts/redis-cluster-config.sh diff --git a/kubernetes/dcaegen2/charts/redis/templates/NOTES.txt b/kubernetes/dcaegen2/charts/dcae-redis/templates/NOTES.txt similarity index 100% rename from kubernetes/dcaegen2/charts/redis/templates/NOTES.txt rename to kubernetes/dcaegen2/charts/dcae-redis/templates/NOTES.txt diff --git a/kubernetes/dcaegen2/charts/redis/templates/configmap.yaml b/kubernetes/dcaegen2/charts/dcae-redis/templates/configmap.yaml similarity index 100% rename from kubernetes/dcaegen2/charts/redis/templates/configmap.yaml rename to kubernetes/dcaegen2/charts/dcae-redis/templates/configmap.yaml diff --git a/kubernetes/dcaegen2/charts/redis/templates/pv.yaml b/kubernetes/dcaegen2/charts/dcae-redis/templates/pv.yaml similarity index 100% rename from kubernetes/dcaegen2/charts/redis/templates/pv.yaml rename to kubernetes/dcaegen2/charts/dcae-redis/templates/pv.yaml diff --git a/kubernetes/dcaegen2/charts/redis/templates/service.yaml b/kubernetes/dcaegen2/charts/dcae-redis/templates/service.yaml similarity index 88% rename from kubernetes/dcaegen2/charts/redis/templates/service.yaml rename to kubernetes/dcaegen2/charts/dcae-redis/templates/service.yaml index b3ee24dba2..636f512a53 100644 --- a/kubernetes/dcaegen2/charts/redis/templates/service.yaml +++ b/kubernetes/dcaegen2/charts/dcae-redis/templates/service.yaml @@ -15,7 +15,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "common.fullname" . }} + name: {{ include "common.servicename" . }} namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }} @@ -31,17 +31,17 @@ spec: #Example internal target port if required #targetPort: {{ .Values.service.internalPort }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.externalPort2 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} - name: {{ .Values.service.name2 }} + name: {{ .Values.service.portName2 }} {{- else -}} - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} - name: {{ .Values.service.name }} + name: {{ .Values.service.portName }} - port: {{ .Values.service.externalPort2 }} targetPort: {{ .Values.service.internalPort2 }} - name: {{ .Values.service.name2 }} + name: {{ .Values.service.portName2 }} {{- end}} selector: app: {{ include "common.name" . }} diff --git a/kubernetes/dcaegen2/charts/redis/templates/statefulset.yaml b/kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml similarity index 100% rename from kubernetes/dcaegen2/charts/redis/templates/statefulset.yaml rename to kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml diff --git a/kubernetes/dcaegen2/charts/redis/values.yaml b/kubernetes/dcaegen2/charts/dcae-redis/values.yaml similarity index 98% rename from kubernetes/dcaegen2/charts/redis/values.yaml rename to kubernetes/dcaegen2/charts/dcae-redis/values.yaml index 7b38163bbc..9a5eacdcc9 100644 --- a/kubernetes/dcaegen2/charts/redis/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-redis/values.yaml @@ -29,7 +29,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.deployments.redis-cluster-container.redis-cluster-container:1.0.0 +image: onap/org.onap.dcaegen2.deployments.redis-cluster-container:1.0.0 pullPolicy: Always # application configuration @@ -61,11 +61,12 @@ service: #Services may use any combination of ports depending on the 'type' of #service being defined. type: NodePort - name: client + name: dcae-redis + portName: client externalPort: 6379 internalPort: 6379 nodePort: 86 - name2: gossip + portName2: gossip externalPort2: 16379 internalPort2: 16379 nodePort2: 87 -- 2.16.6