Merge pull request #52130 from janetkuo/e2e-kubectl-apps

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update kubectl e2e test manifests to apps/v1 **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #52130 from janetkuo/e2e-kubectl-apps
03a97f8e · Kubernetes Submit Queue · GitHub · 8182501b · 15c2f2a6 · 03a97f8e
Unverified Commit 03a97f8e authored Mar 02, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 02, 2018
13 changed files
--- a/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in
+++ b/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: nginx-deployment
 spec:
  replicas: 2
+  selector:
+    matchLabels:
+      app: nginx
  template:
    metadata:
      labels:
@@ -13,4 +16,4 @@ spec:
      - name: nginx
        image: {{.NginxSlimNewImage}}
        ports:
-        - containerPort: 80
\ No newline at end of file
+        - containerPort: 80
--- a/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in
+++ b/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: nginx-deployment
 spec:
+  selector:
+    matchLabels:
+      app: nginx
  template:
    metadata:
      labels:
@@ -12,4 +15,4 @@ spec:
      - name: nginx
        image: {{.NginxSlimNewImage}}
        ports:
-        - containerPort: 80
\ No newline at end of file
+        - containerPort: 80
--- a/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in
+++ b/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: nginx-deployment
 spec:
+  selector:
+    matchLabels:
+      app: nginx
  template:
    metadata:
      labels:
@@ -12,4 +15,4 @@ spec:
      - name: nginx
        image: {{.NginxSlimImage}}
        ports:
-        - containerPort: 80
\ No newline at end of file
+        - containerPort: 80
--- a/test/e2e/testing-manifests/statefulset/cassandra/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/cassandra/statefulset.yaml
-apiVersion: "apps/v1"
+apiVersion: apps/v1
 kind: StatefulSet
 metadata:
  name: cassandra
 spec:
  serviceName: cassandra
  replicas: 3
+  selector:
+    matchLabels:
+      app: cassandra
  template:
    metadata:
      labels:

--- a/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml
+++ b/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: cassandra-test-server
 spec:
  replicas: 3
+  selector:
+    matchLabels:
+      app: test-server
  template:
    metadata:
      labels:

--- a/test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml
@@ -5,6 +5,9 @@ metadata:
 spec:
  serviceName: "cockroachdb"
  replicas: 3
+  selector:
+    matchLabels:
+      app: cockroachdb
  template:
    metadata:
      labels:

--- a/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
@@ -7,6 +7,9 @@ metadata:
 spec:
  serviceName: etcd
  replicas: 3
+  selector:
+    matchLabels:
+      app: etcd
  template:
    metadata:
      name: etcd

--- a/test/e2e/testing-manifests/statefulset/etcd/tester.yaml
+++ b/test/e2e/testing-manifests/statefulset/etcd/tester.yaml
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: etcd-test-server
 spec:
  replicas: 3
+  selector:
+    matchLabels:
+      app: test-server
  template:
    metadata:
      labels:

--- a/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml
@@ -5,6 +5,9 @@ metadata:
 spec:
  serviceName: "galera"
  replicas: 3
+  selector:
+    matchLabels:
+      app: mysql
  template:
    metadata:
      labels:

--- a/test/e2e/testing-manifests/statefulset/mysql-upgrade/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/mysql-upgrade/statefulset.yaml
@@ -5,6 +5,9 @@ metadata:
 spec:
  serviceName: mysql
  replicas: 3
+  selector:
+    matchLabels:
+      app: mysql
  template:
    metadata:
      labels:

--- a/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml
+++ b/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
  name: mysql-test-server
 spec:
  replicas: 3
+  selector:
+    matchLabels:
+      app: test-server
  template:
    metadata:
      labels:

--- a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
@@ -5,6 +5,9 @@ metadata:
 spec:
  serviceName: "redis"
  replicas: 3
+  selector:
+    matchLabels:
+      app: redis
  template:
    metadata:
      labels:

--- a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
+++ b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml
@@ -5,6 +5,9 @@ metadata:
 spec:
  serviceName: "zk"
  replicas: 3
+  selector:
+    matchLabels:
+      app: zk
  template:
    metadata:
      labels: