From ede4d881c595b9509a93832e7af6d3ec19eca99e Mon Sep 17 00:00:00 2001
From: AndrewLamb <andrew.a.lamb@est.tech>
Date: Thu, 16 Sep 2021 10:22:29 +0100
Subject: [PATCH] [CPS] Service Mesh Compliance for CPS

Adding the basic requirements for Service Mesh Compliance within CPS
CPS currently using http, so changing service port names to incl http in name

Issue-ID: OOM-2832
Change-Id: Iee4287b3ac1b6d841547a7700fddb96fba0dd6cf
Signed-off-by: AndrewLamb <andrew.a.lamb@est.tech>
---
 kubernetes/cps/components/cps-core/values.yaml        | 4 ++--
 kubernetes/cps/components/cps-temporal/values.yaml    | 4 ++--
 kubernetes/cps/components/ncmp-dmi-plugin/values.yaml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 4f788e7977..b747b71a4c 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -63,7 +63,7 @@ service:
   ports:
     - name: &port http
       port: *svc_port
-    - name: management
+    - name: http-management
       port: *mgt_port
       targetPort: *mgt_port
 
@@ -73,7 +73,7 @@ prometheus:
 metrics:
   serviceMonitor:
     enabled: true
-    port: management
+    port: http-management
       ## specify target port if name is not given to the port in the service definition
       ##
     # targetPort: 8080
diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index da055d0242..f8311697f5 100644
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -54,14 +54,14 @@ service:
     - name: http
       port: *svc_port
       targetPort: *svc_port
-    - name: management
+    - name: http-management
       port: *mgt_port
       targetPort: *mgt_port
 
 metrics:
   serviceMonitor:
     enabled: true
-    port: management
+    port: http-management
       ## specify target port if name is not given to the port in the service definition
       ##
       # targetPort: 8080
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 3f40a79b84..234f9eb646 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -60,14 +60,14 @@ service:
   ports:
     - name: &port http
       port: *svc_port
-    - name: management
+    - name: http-management
       port: *mgt_port
       targetPort: *mgt_port
 
 metrics:
   serviceMonitor:
     enabled: true
-    port: management
+    port: http-management
       ## specify target port if name is not given to the port in the service definition
       ##
     # targetPort: 8080
-- 
2.16.6