Merge "Update Service ports"

5 files changed, 23 insertions, 22 deletions

diff --git a/deployments/helm/v2/onap4k8s/README.md b/deployments/helm/v2/onap4k8s/README.md
index 3ce49a5a..43213153 100644
--- a/deployments/helm/v2/onap4k8s/README.md
+++ b/deployments/helm/v2/onap4k8s/README.md
@@ -28,9 +28,9 @@ Pacakges helm charts in tar.gz format. All packages are in **dist/packages** dir
 
 **3. Deploy EMCO Packages for Databases and Services**
 
-`$ helm install dist/packages/emco-db-0.1.0.tgz --name rel-db --namespace emco`
+`$ helm install dist/packages/emco-db-0.1.0.tgz --name emco-db --namespace emco`
 
-`$ helm install dist/packages/emco-services-0.1.0.tgz --name rel-services --namespace emco`
+`$ helm install dist/packages/emco-services-0.1.0.tgz --name emco-services --namespace emco`
 
 **4. Deploy tools (Optional)**
 
@@ -65,10 +65,11 @@ Optional if tools were installed
 
 After deleting the db package and before installing the package again following error happens:
 
-        `Error: release rel01 failed: object is being deleted: persistentvolumes "rel-emco-etcd-data-0" already exists`
+        `Error: release emco-db failed: object is being deleted: persistentvolumes "emco-db-emco-etcd-data-0" already exists`
 
 Workaround :
 
-    `kubectl edit persistentvolumes rel01-emco-etcd-data-0`
+    `kubectl edit persistentvolumes emco-db-emco-etcd-data-0 -n emco`
+
+    and remover finalizers section
 
-    and remover finalizers section
\ No newline at end of file
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/templates/deployment.yaml b/deployments/helm/v2/onap4k8s/ovnaction/templates/deployment.yaml
index 56c62699..261b6ef2 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/templates/deployment.yaml
+++ b/deployments/helm/v2/onap4k8s/ovnaction/templates/deployment.yaml
@@ -43,8 +43,8 @@ spec:
         args: [{{ .Values.args }}]
         workingDir: {{ .Values.workingDir }}
         ports:
-        - containerPort: {{ .Values.service.internalPort }}
         - containerPort: {{ .Values.serviceInternal.internalPort }}
+        - containerPort: {{ .Values.service.internalPort }}
         {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/templates/service.yaml b/deployments/helm/v2/onap4k8s/ovnaction/templates/service.yaml
index e9e59d38..9bf887ed 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/templates/service.yaml
+++ b/deployments/helm/v2/onap4k8s/ovnaction/templates/service.yaml
@@ -26,16 +26,7 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-  - name: {{ .Values.service.name }}
-    {{if eq .Values.service.type "NodePort" -}}
-    port: {{ .Values.service.internalPort }}
-    nodePort: {{ .Values.global.nodePortPrefixExt | default "302" }}{{ .Values.service.nodePort }}
-    {{- else -}}
-    port: {{ .Values.service.externalPort }}
-    targetPort: {{ .Values.service.internalPort }}
-    {{- end}}
-    protocol: TCP
-  - name: {{ .Values.serviceInternal.name }}
+  - name: {{ .Values.serviceInternal.portName }}
     {{if eq .Values.serviceInternal.type "NodePort" -}}
     port: {{ .Values.serviceInternal.internalPort }}
     nodePort: {{ .Values.global.nodePortPrefixExt | default "302" }}{{ .Values.serviceInternal.nodePort }}
@@ -44,6 +35,15 @@ spec:
     targetPort: {{ .Values.serviceInternal.internalPort }}
     {{- end}}
     protocol: TCP
+  - name: {{ .Values.service.portName }}
+    {{if eq .Values.service.type "NodePort" -}}
+    port: {{ .Values.service.internalPort }}
+    nodePort: {{ .Values.global.nodePortPrefixExt | default "302" }}{{ .Values.service.nodePort }}
+    {{- else -}}
+    port: {{ .Values.service.externalPort }}
+    targetPort: {{ .Values.service.internalPort }}
+    {{- end}}
+    protocol: TCP
   selector:
     app: {{ include "common.name" . }}
     release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/values.yaml b/deployments/helm/v2/onap4k8s/ovnaction/values.yaml
index 1773592f..411e5d0e 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/values.yaml
+++ b/deployments/helm/v2/onap4k8s/ovnaction/values.yaml
@@ -57,17 +57,17 @@ readiness:
 service:
   type: NodePort
   name: ovnaction
-  portName: ovnaction
-  internalPort: 9071
-  externalPort: 9071
+  portName: http
+  internalPort: 9051
+  externalPort: 9051
   nodePort: 71
 
 serviceInternal:
   type: NodePort
   name: internal
   portName: internal
-  internalPort: 9073
-  externalPort: 9073
+  internalPort: 9053
+  externalPort: 9053
   nodePort: 73
 
 ingress:
diff --git a/deployments/helm/v2/onap4k8s/rsync/resources/config/config.json b/deployments/helm/v2/onap4k8s/rsync/resources/config/config.json
index 484bdf04..56744d63 100644
--- a/deployments/helm/v2/onap4k8s/rsync/resources/config/config.json
+++ b/deployments/helm/v2/onap4k8s/rsync/resources/config/config.json
@@ -2,5 +2,5 @@
     "database-type": "mongo",
     "database-ip": "emco-mongo",
     "etcd-ip": "emco-etcd",
-    "service-port": "9017"
+    "service-port": "9041"
 }
\ No newline at end of file