summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-04-23 19:03:17 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-23 19:03:17 +0000
commit821245db5d88cf7bfdaf8c5e2a5d24b237d98608 (patch)
treea24211561bd76e0826d9dbcc3884621574176400
parenta33d337d7a133ba26ac519c62e50b4c006a21bd5 (diff)
parent7eeb66d6e4bc78e647e1166c70acfaea487743e0 (diff)
Merge "Fix DCAE Redis"
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/.helmignore (renamed from kubernetes/dcaegen2/charts/redis/.helmignore)0
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/Chart.yaml (renamed from kubernetes/dcaegen2/charts/redis/Chart.yaml)2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/requirements.yaml (renamed from kubernetes/dcaegen2/charts/redis/requirements.yaml)0
-rwxr-xr-xkubernetes/dcaegen2/charts/dcae-redis/resources/redis/scripts/redis-cluster-config.sh (renamed from kubernetes/dcaegen2/charts/redis/resources/redis/scripts/redis-cluster-config.sh)0
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/templates/NOTES.txt (renamed from kubernetes/dcaegen2/charts/redis/templates/NOTES.txt)0
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/templates/configmap.yaml (renamed from kubernetes/dcaegen2/charts/redis/templates/configmap.yaml)0
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/templates/pv.yaml (renamed from kubernetes/dcaegen2/charts/redis/templates/pv.yaml)0
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/templates/service.yaml (renamed from kubernetes/dcaegen2/charts/redis/templates/service.yaml)10
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/templates/statefulset.yaml (renamed from kubernetes/dcaegen2/charts/redis/templates/statefulset.yaml)0
-rw-r--r--kubernetes/dcaegen2/charts/dcae-redis/values.yaml (renamed from kubernetes/dcaegen2/charts/redis/values.yaml)7
10 files changed, 10 insertions, 9 deletions
diff --git a/kubernetes/dcaegen2/charts/redis/.helmignore b/kubernetes/dcaegen2/charts/dcae-redis/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/dcaegen2/charts/redis/.helmignore
+++ b/kubernetes/dcaegen2/charts/dcae-redis/.helmignore
diff --git a/kubernetes/dcaegen2/charts/redis/Chart.yaml b/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
index 7244af3970..7244af3970 100644
--- a/kubernetes/dcaegen2/charts/redis/requirements.yaml
+++ b/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
index 3431e7e6e7..3431e7e6e7 100755
--- 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
diff --git a/kubernetes/dcaegen2/charts/redis/templates/NOTES.txt b/kubernetes/dcaegen2/charts/dcae-redis/templates/NOTES.txt
index d333bfc159..d333bfc159 100644
--- a/kubernetes/dcaegen2/charts/redis/templates/NOTES.txt
+++ b/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
index 85ebee672b..85ebee672b 100644
--- a/kubernetes/dcaegen2/charts/redis/templates/configmap.yaml
+++ b/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
index 2d7e25dd2c..2d7e25dd2c 100644
--- a/kubernetes/dcaegen2/charts/redis/templates/pv.yaml
+++ b/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
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
index 472471416b..472471416b 100644
--- a/kubernetes/dcaegen2/charts/redis/templates/statefulset.yaml
+++ b/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
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