Merge "[COMMON] fix logic of post upgrade hook script to handle upgrade run without...

[oom.git] / kubernetes / common / etcd / templates / statefulset.yaml

diff --git a/kubernetes/common/etcd/templates/statefulset.yaml b/kubernetes/common/etcd/templates/statefulset.yaml
index cef1a48..fcab51c 100644 (file)
--- 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:
@@ -216,7 +219,7 @@ spec:
       labels:
         name: {{ include "common.fullname" . }}
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-        release: "{{ .Release.Name }}"
+        release: "{{ include "common.release" . }}"
         heritage: "{{ .Release.Service }}"
     spec:
       accessModes: