updated servicenames

charts/rstudio/templates/ingress.yaml

@@ -5,7 +5,7 @@ kind: Ingress
 metadata:
   name: "{{ $.Release.Name }}-ingress"
   labels:
-    app:  {{ $.Values.rstudio.name }}
+    app:  "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
     chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
     release: "{{ $.Release.Name }}"
     heritage: "{{ $.Release.Service }}"
@@ -23,7 +23,7 @@ spec:
       paths:
         - path: {{ default "/" .path }}
           backend:
-            serviceName: {{ $.Values.rstudio.service.name }}
+            serviceName: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
             servicePort: {{ $.Values.rstudio.service.port }}
 {{- if .tls }}
   tls:

charts/rstudio/templates/service.yaml

@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.rstudio.service.name }}
+  name: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
   labels:
-    app: {{ .Values.rstudio.service.name }}
+    app: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   type: {{ .Values.rstudio.service.type }}
   ports:
-    - name: {{ .Values.rstudio.service.name }}
+    - name: "{{ .Release.Name}}-{{ .Values.rstudio.service.name }}"
       port: {{ .Values.rstudio.service.port }}
   selector:
     app: {{ template "rstudio.name" . }}