Update Deployment and statefulSet

helm/oc-mongo/templates/pvc.yaml

@@ -1,10 +1,16 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ .Values.persistence.name }}
+  name: {{ .Values.mongo.pvcName }}
+  labels:
+    app: mongo
+    release: {{ .Release.Name }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode }}
   resources:
     requests:
       storage: {{ .Values.persistence.size }}
+  {{- if .Values.persistence.storageClass }}
+  storageClassName: {{ .Values.persistence.storageClass }}
+  {{- end }}

helm/oc-mongo/templates/secret.yaml

@@ -2,7 +2,10 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ .Release.Name }}-mongo-secret
+  labels:
+    app: mongo
+    release: {{ .Release.Name }}
 type: Opaque
 data:
-  username: {{ .Values.secret.username }}
-  password: {{ .Values.secret.password }}
+  username: {{ .Values.secret.username | b64enc }}
+  password: {{ .Values.secret.password | b64enc }}

helm/oc-mongo/templates/service.yaml

@@ -2,10 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mongo
+  labels:
+    app: mongo
 spec:
   selector:
     app: mongo
   ports:
     - protocol: TCP
       port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.port }}
+      targetPort: {{ .Values.mongo.containerPort }}

helm/oc-mongo/templates/statefulset.yaml

@@ -1,11 +1,11 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ .Release.Name }}-mongo
+  name: mongo
   labels:
     app: mongo
 spec:
-  serviceName: "{{ .Release.Name }}-mongo"
+  serviceName: "mongo"
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:

helm/oc-mongo/values.yaml

@@ -13,7 +13,12 @@ persistence:
   enabled: true
   accessMode: ReadWriteOnce
   size: 1Gi
+  storageClass: ""
 
 secret:
   username: dGVzdA==  # base64 encoding of 'test'
   password: dGVzdA==  # base64 encoding of 'test'
+
+mongo:
+  containerPort: 27017
+  pvcName: mongo-pvc-helm