X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=kubernetes%2Fcommon%2Fetcd%2Ftemplates%2Fstatefulset.yaml;h=fcab51cb59654f0d537e5634794bb0364f2a1401;hb=c03c318d3848792a313d67ecfec255ad5090073f;hp=7190c5bca05639edf97a433d81ba06a68dc1eb04;hpb=25f7bae5721a1033707a987fe9d065444a733f7d;p=oom.git

diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml
index 7190c5bca0..fcab51cb59 100644
--- a/kubernetes/common/etcd/templates/statefulset.yaml
+++ b/kubernetes/common/etcd/templates/statefulset.yaml
@@ -11,23 +11,26 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "common.fullname" .  }}
   labels:
     heritage: "{{ .Release.Service }}"
-    release: "{{ .Release.Name }}"
+    release: "{{ include "common.release" . }}"
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     app: {{ include "common.name" . }}
 spec:
   serviceName: {{ include "common.servicename" .}}
   replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ include "common.name" .  }}
   template:
     metadata:
       labels:
         heritage: "{{ .Release.Service }}"
-        release: "{{ .Release.Name }}"
+        release: "{{ include "common.release" . }}"
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         app: {{ include "common.name" . }}
     spec:
@@ -213,14 +216,19 @@ spec:
   volumeClaimTemplates:
   - metadata:
       name: {{ include "common.fullname" . }}-data
+      labels:
+        name: {{ include "common.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ include "common.release" . }}"
+        heritage: "{{ .Release.Service }}"
     spec:
       accessModes:
-        - "{{ .Values.persistence.accessMode }}"
+      - "{{ .Values.persistence.accessMode }}"
+      storageClassName: {{ include "common.storageClass" . }}
       resources:
         requests:
           # upstream recommended max is 700M
           storage: "{{ .Values.persistence.storage }}"
-      storageClassName: {{ include "common.fullname" . }}-data
   {{- else }}
       volumes:
       - name: {{ include "common.fullname" . }}-data
@@ -231,4 +239,3 @@ spec:
         emptyDir: {}
       {{- end }}
   {{- end }}
-