From 15c2f2a68403637f860e826367d683670f17c8e0 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Thu, 7 Sep 2017 16:21:55 -0700 Subject: [PATCH] Update kubectl e2e test manifests to apps/v1 --- .../testing-manifests/kubectl/nginx-deployment1.yaml.in | 7 +++++-- .../testing-manifests/kubectl/nginx-deployment2.yaml.in | 7 +++++-- .../testing-manifests/kubectl/nginx-deployment3.yaml.in | 7 +++++-- .../statefulset/cassandra/statefulset.yaml | 5 ++++- .../testing-manifests/statefulset/cassandra/tester.yaml | 5 ++++- .../statefulset/cockroachdb/statefulset.yaml | 3 +++ .../testing-manifests/statefulset/etcd/statefulset.yaml | 3 +++ test/e2e/testing-manifests/statefulset/etcd/tester.yaml | 5 ++++- .../statefulset/mysql-galera/statefulset.yaml | 3 +++ .../statefulset/mysql-upgrade/statefulset.yaml | 3 +++ .../statefulset/mysql-upgrade/tester.yaml | 5 ++++- .../testing-manifests/statefulset/redis/statefulset.yaml | 3 +++ .../statefulset/zookeeper/statefulset.yaml | 3 +++ 13 files changed, 49 insertions(+), 10 deletions(-) diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in b/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in index 74beacad2e6..99b109cfd3a 100644 --- a/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in +++ b/test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in @@ -1,9 +1,12 @@ -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 diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in b/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in index b4955f7ec36..436b469979a 100644 --- a/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in +++ b/test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in @@ -1,8 +1,11 @@ -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 diff --git a/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in b/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in index 4b81f287e1a..5b5a624c133 100644 --- a/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in +++ b/test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in @@ -1,8 +1,11 @@ -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 diff --git a/test/e2e/testing-manifests/statefulset/cassandra/statefulset.yaml b/test/e2e/testing-manifests/statefulset/cassandra/statefulset.yaml index 26d68d1fae7..5849f55bbb5 100644 --- a/test/e2e/testing-manifests/statefulset/cassandra/statefulset.yaml +++ b/test/e2e/testing-manifests/statefulset/cassandra/statefulset.yaml @@ -1,10 +1,13 @@ -apiVersion: "apps/v1" +apiVersion: apps/v1 kind: StatefulSet metadata: name: cassandra spec: serviceName: cassandra replicas: 3 + selector: + matchLabels: + app: cassandra template: metadata: labels: diff --git a/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml b/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml index 8139cf5f99a..7fa74a72f17 100644 --- a/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml +++ b/test/e2e/testing-manifests/statefulset/cassandra/tester.yaml @@ -1,9 +1,12 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: cassandra-test-server spec: replicas: 3 + selector: + matchLabels: + app: test-server template: metadata: labels: diff --git a/test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml b/test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml index 276b481af95..9fc233fdd55 100644 --- 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: diff --git a/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml b/test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml index f61574e8cf0..bc7e442dd67 100644 --- 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 diff --git a/test/e2e/testing-manifests/statefulset/etcd/tester.yaml b/test/e2e/testing-manifests/statefulset/etcd/tester.yaml index ee53bc14196..e172d50ef50 100644 --- a/test/e2e/testing-manifests/statefulset/etcd/tester.yaml +++ b/test/e2e/testing-manifests/statefulset/etcd/tester.yaml @@ -1,9 +1,12 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: etcd-test-server spec: replicas: 3 + selector: + matchLabels: + app: test-server template: metadata: labels: diff --git a/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml b/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml index 20483ea454a..4e0271f449e 100644 --- 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: diff --git a/test/e2e/testing-manifests/statefulset/mysql-upgrade/statefulset.yaml b/test/e2e/testing-manifests/statefulset/mysql-upgrade/statefulset.yaml index 0604aa5f615..b470b144cec 100644 --- 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: diff --git a/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml b/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml index 3a60b3473a6..aff3d3a77bb 100644 --- a/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml +++ b/test/e2e/testing-manifests/statefulset/mysql-upgrade/tester.yaml @@ -1,9 +1,12 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: mysql-test-server spec: replicas: 3 + selector: + matchLabels: + app: test-server template: metadata: labels: diff --git a/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml index 85c6b497ac0..bd06144a33e 100644 --- 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: diff --git a/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml index d08e62800e6..537a808cb48 100644 --- 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: