Update Deployment and statefulSet

helm/oc-catalog/templates/deployment.yml

@@ -1,33 +1,38 @@
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
-  name: {{ .Release.Name }}-oc-catalog
+  name: oc-catalog
   labels:
     app: oc-catalog
+    chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
 spec:
-  serviceName: "{{ .Release.Name }}-oc-catalog"
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       app: oc-catalog
+      release: {{ .Release.Name }}
   template:
     metadata:
       labels:
         app: oc-catalog
+        release: {{ .Release.Name }}
     spec:
       containers:
       - name: oc-catalog
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
-        - containerPort: 8080
+        - containerPort: {{ .Values.service.targetPort }}
         env:
         - name: MONGO_DATABASE
-          value: "DC_myDC"
+          value: {{ .Values.mongo.database }}
         - name: MONGO_URI
-          value: "mongodb://mongo:27017"
+          value: {{ .Values.mongo.uri }}
       imagePullSecrets:
       {{- if .Values.imagePullSecrets }}
-      {{- range .Values.imagePullSecrets }}
+        {{- range .Values.imagePullSecrets }}
         - name: {{ .name }}
-      {{- end }}
-      {{- end }}
+        {{- end }}
+      {{- end }}

helm/oc-catalog/templates/service.yml

@@ -1,12 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-oc-catalog
+  name: oc-catalog
+  labels:
+    app: oc-catalog
+    release: {{ .Release.Name }}
 spec:
-  selector:
-    app: {{ .Chart.Name }}
+  type: {{ .Values.service.type }}
   ports:
     - protocol: TCP
       port: {{ .Values.service.port }}
       targetPort: {{ .Values.service.targetPort }}
-  type: {{ .Values.service.type }}
+  selector:
+    app: oc-catalog
+    release: {{ .Release.Name }}