OZG-3328 resolve merge conflicts

src/main/helm/templates/_helpers.tpl

@@ -15,6 +15,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 helm.sh/chart: {{ printf "%s-%s" .Chart.Name .Chart.Version }}
+ozgcloud-mongodb-client: "true"
 {{- end -}}
 
 {{- define "app.matchLabels" }}

src/test/helm/deployment_defaults_labels_test.yaml

@@ -46,6 +46,8 @@ tests:
             app.kubernetes.io/name: administration
             app.kubernetes.io/namespace: sh-helm-test
             helm.sh/chart: administration-0.0.0-MANAGED-BY-JENKINS
+            ozgcloud-mongodb-client: "true"
+
   - it: should set spec.selector.matchLabels
     asserts:
       - equal:
@@ -65,4 +67,5 @@ tests:
             app.kubernetes.io/name: administration
             app.kubernetes.io/namespace: sh-helm-test
             component: administration
-            helm.sh/chart: administration-0.0.0-MANAGED-BY-JENKINS
\ No newline at end of file
+            helm.sh/chart: administration-0.0.0-MANAGED-BY-JENKINS
+            ozgcloud-mongodb-client: "true"
\ No newline at end of file

src/test/helm/deployment_test.yaml

@@ -80,6 +80,15 @@ tests:
           value: "RollingUpdate"
   - it: should have correct template configuration
     asserts:
+      - equal:
+          path: spec.template.metadata.labels["app.kubernetes.io/instance"]
+          value: "administration"
+      - equal:
+          path: spec.template.metadata.labels.component
+          value: "administration"
+      - equal:
+          path: metadata.labels["ozgcloud-mongodb-client"]
+          value: "true"
       - equal:
           path: spec.template.spec.topologySpreadConstraints[0].maxSkew
           value: 1

src/test/helm/service_test.yaml

@@ -82,4 +82,5 @@ tests:
             app.kubernetes.io/name: administration
             app.kubernetes.io/namespace: helm-test
             component: administration-service
-            helm.sh/chart: administration-0.0.0-helm-test-version
\ No newline at end of file
+            helm.sh/chart: administration-0.0.0-helm-test-version
+            ozgcloud-mongodb-client: "true"
\ No newline at end of file