From 52031eddc168d79f2492b28456ffe6e42347f09c Mon Sep 17 00:00:00 2001
From: zoues <zouyee1989@gmail.com>
Date: Mon, 30 Oct 2017 02:54:54 -0500
Subject: [PATCH] [staging/openshift-origin]update deploy apiversion (#129)

---
 staging/openshift-origin/etcd-controller.yaml           | 7 +++++--
 staging/openshift-origin/etcd-discovery-controller.yaml | 5 ++++-
 staging/openshift-origin/openshift-controller.yaml      | 7 +++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/staging/openshift-origin/etcd-controller.yaml b/staging/openshift-origin/etcd-controller.yaml
index 419c57db..14c6e09a 100644
--- a/staging/openshift-origin/etcd-controller.yaml
+++ b/staging/openshift-origin/etcd-controller.yaml
@@ -1,8 +1,11 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: etcd
 spec:
+  selector:
+    matchLabels:
+      name: etcd
   strategy:
     type: Recreate
   replicas: 3
@@ -34,7 +37,7 @@ spec:
           # ETCD_DISCOVERY_TOKEN is a unique token used by the discovery service. Conforms to etcd-cluster-[a-z0-9]{5}
         - name: ETCD_DISCOVERY_TOKEN
           value: INSERT_ETCD_DISCOVERY_TOKEN
-          # ETCD_DISCOVERY_URL connects etcd instances together by storing a list of peer addresses, 
+          # ETCD_DISCOVERY_URL connects etcd instances together by storing a list of peer addresses,
           # metadata and the initial size of the cluster under a unique address
         - name: ETCD_DISCOVERY_URL
           value: "http://etcd-discovery:2379"
diff --git a/staging/openshift-origin/etcd-discovery-controller.yaml b/staging/openshift-origin/etcd-discovery-controller.yaml
index 33f593ac..568ce2a4 100644
--- a/staging/openshift-origin/etcd-discovery-controller.yaml
+++ b/staging/openshift-origin/etcd-discovery-controller.yaml
@@ -1,8 +1,11 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: etcd-discovery
 spec:
+  selector:
+    matchLabels:
+      name: etcd-discovery
   strategy:
     type: Recreate
   replicas: 1
diff --git a/staging/openshift-origin/openshift-controller.yaml b/staging/openshift-origin/openshift-controller.yaml
index 1844a70c..d1b0d31b 100644
--- a/staging/openshift-origin/openshift-controller.yaml
+++ b/staging/openshift-origin/openshift-controller.yaml
@@ -1,10 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   labels:
     name: openshift
   name: openshift
 spec:
+  selector:
+    matchLabels:
+      name: openshift
   replicas: 1
   selector:
     matchLabels:
@@ -31,4 +34,4 @@ spec:
       volumes:
         - name: config
           secret:
-            secretName: openshift-config
\ No newline at end of file
+            secretName: openshift-config