From bb0af81a7d5144d6d38190ba00bc3603480f56c5 Mon Sep 17 00:00:00 2001
From: Michal Vala <mvala@redhat.com>
Date: Mon, 22 Jul 2019 15:04:18 +0200
Subject: [PATCH] fix ingress and service metadata in registries helm charts

Signed-off-by: Michal Vala <mvala@redhat.com>
---
 .../che-devfile-registry/templates/ingress.yaml           | 4 ++--
 .../che-devfile-registry/templates/service.yaml           | 8 +++++---
 .../che-plugin-registry/templates/ingress.yaml            | 4 ++--
 .../che-plugin-registry/templates/service.yaml            | 8 +++++---
 deploy/kubernetes/helm/che/values.yaml                    | 4 ++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/ingress.yaml b/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/ingress.yaml
index 1ce3228249b..4736b8157ae 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/ingress.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/ingress.yaml
@@ -10,7 +10,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: che-devfile-registry
+  name: devfile-registry
   annotations:
     kubernetes.io/ingress.class: "nginx"
 spec:
@@ -20,7 +20,7 @@ spec:
       paths:
       - path: /
         backend:
-          serviceName: che-devfile-registry
+          serviceName: devfile-registry
           servicePort: 8080
 {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/service.yaml b/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/service.yaml
index b94e4e44c20..9b2c8001dc4 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/service.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-devfile-registry/templates/service.yaml
@@ -11,12 +11,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: che-devfile-registry
-  name: che-devfile-registry
+    app: che
+    component: devfile-registry
+  name: devfile-registry
 spec:
   ports:
     - protocol: TCP
       port: 8080
       targetPort: 8080
   selector:
-    app: che-devfile-registry
+    app: che
+    component: devfile-registry
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/ingress.yaml b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/ingress.yaml
index f98f739c599..d55c7cc60d1 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/ingress.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/ingress.yaml
@@ -10,7 +10,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: che-plugin-registry
+  name: plugin-registry
   annotations:
     kubernetes.io/ingress.class: "nginx"
 spec:
@@ -20,7 +20,7 @@ spec:
       paths:
       - path: /
         backend:
-          serviceName: che-plugin-registry
+          serviceName: plugin-registry
           servicePort: 8080
 {{- if .Values.global.tls.enabled }}
   tls:
diff --git a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/service.yaml b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/service.yaml
index 267487b30d9..4f0448ead5b 100644
--- a/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/service.yaml
+++ b/deploy/kubernetes/helm/che/custom-charts/che-plugin-registry/templates/service.yaml
@@ -11,12 +11,14 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: che-plugin-registry
-  name: che-plugin-registry
+    app: che
+    component: plugin-registry
+  name: plugin-registry
 spec:
   ports:
     - protocol: TCP
       port: 8080
       targetPort: 8080
   selector:
-    app: che-plugin-registry
+    app: che
+    component: plugin-registry
diff --git a/deploy/kubernetes/helm/che/values.yaml b/deploy/kubernetes/helm/che/values.yaml
index 3b758eac421..80f77d87189 100644
--- a/deploy/kubernetes/helm/che/values.yaml
+++ b/deploy/kubernetes/helm/che/values.yaml
@@ -66,8 +66,8 @@ global:
     runAsUser: 1724
     fsGroup: 1724
   postgresDebugLogs: false
-  cheDevfileRegistryUrlFormat: "che-devfile-registry-%s.%s"
-  chePluginRegistryUrlFormat: "che-plugin-registry-%s.%s"
+  cheDevfileRegistryUrlFormat: "devfile-registry-%s.%s"
+  chePluginRegistryUrlFormat: "plugin-registry-%s.%s"
 
 che:
   workspace: {}