Merge branch 'develop' of github.com:MetaCell/cloud-harness into feature/CH-147-lint

Author: filippomc

deployment-configuration/helm/templates/auto-database.yaml

@@ -32,7 +32,7 @@ metadata:
   name: {{ .app.harness.database.name | quote }}
   namespace: {{ .root.Values.namespace }}
   labels:
-    usesvolume: {{ .app.harness.database.name }}
+    usesvolume: {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
 spec:
   replicas: 1
   selector:
@@ -43,7 +43,7 @@ spec:
       labels:
         app: {{ .app.harness.database.name | quote }}
         service: db
-        usesvolume: {{ .app.harness.database.name }}
+        usesvolume: {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
     spec:
       affinity:
         podAffinity:
@@ -53,7 +53,8 @@ spec:
                   - key: usesvolume
                     operator: In
                     values:
-                      - {{ .app.harness.database.name }}
+                      - {{ .app.harness.database.name }}-{{ .root.Values.namespace }}
+                      - {{ .app.harness.database.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
               topologyKey: "kubernetes.io/hostname"
       containers:
       - name: {{ .app.harness.database.name | quote }}

deployment-configuration/helm/templates/auto-deployments.yaml

@@ -7,7 +7,7 @@ metadata:
   labels:
     app: {{ .app.harness.deployment.name| quote }}
     {{- if .app.harness.deployment.volume }}
-    usesvolume: {{ .app.harness.deployment.volume.name }}
+    usesvolume: {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
     {{- end }}
 {{- include "deploy_utils.labels" .root | indent 4 }}
 spec:
@@ -26,7 +26,7 @@ spec:
       labels:
         app: {{ .app.harness.deployment.name| quote }}
         {{- if .app.harness.deployment.volume }}
-        usesvolume: {{ .app.harness.deployment.volume.name }}
+        usesvolume: {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
         {{- end }}
 {{- include "deploy_utils.labels" .root | indent 8 }}
     spec:
@@ -44,7 +44,8 @@ spec:
                   - key: usesvolume
                     operator: In
                     values:
-                      - {{ .app.harness.deployment.volume.name }}
+                      - {{ .app.harness.deployment.volume.name }}-{{ .root.Values.namespace }}
+                      - {{ .app.harness.deployment.volume.name }} # Obsolete, kept for backwards compatability, to be removed at a later date
               topologyKey: "kubernetes.io/hostname"
       {{- end }}
       {{- end }}