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
```
This commit is contained in:
Kubernetes Submit Queue 2018-03-02 19:20:34 -08:00 committed by GitHub
commit 03a97f8ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 49 additions and 10 deletions

View File

@ -1,9 +1,12 @@
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment
spec: spec:
replicas: 2 replicas: 2
selector:
matchLabels:
app: nginx
template: template:
metadata: metadata:
labels: labels:
@ -13,4 +16,4 @@ spec:
- name: nginx - name: nginx
image: {{.NginxSlimNewImage}} image: {{.NginxSlimNewImage}}
ports: ports:
- containerPort: 80 - containerPort: 80

View File

@ -1,8 +1,11 @@
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment
spec: spec:
selector:
matchLabels:
app: nginx
template: template:
metadata: metadata:
labels: labels:
@ -12,4 +15,4 @@ spec:
- name: nginx - name: nginx
image: {{.NginxSlimNewImage}} image: {{.NginxSlimNewImage}}
ports: ports:
- containerPort: 80 - containerPort: 80

View File

@ -1,8 +1,11 @@
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment
spec: spec:
selector:
matchLabels:
app: nginx
template: template:
metadata: metadata:
labels: labels:
@ -12,4 +15,4 @@ spec:
- name: nginx - name: nginx
image: {{.NginxSlimImage}} image: {{.NginxSlimImage}}
ports: ports:
- containerPort: 80 - containerPort: 80

View File

@ -1,10 +1,13 @@
apiVersion: "apps/v1" apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: cassandra name: cassandra
spec: spec:
serviceName: cassandra serviceName: cassandra
replicas: 3 replicas: 3
selector:
matchLabels:
app: cassandra
template: template:
metadata: metadata:
labels: labels:

View File

@ -1,9 +1,12 @@
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: cassandra-test-server name: cassandra-test-server
spec: spec:
replicas: 3 replicas: 3
selector:
matchLabels:
app: test-server
template: template:
metadata: metadata:
labels: labels:

View File

@ -5,6 +5,9 @@ metadata:
spec: spec:
serviceName: "cockroachdb" serviceName: "cockroachdb"
replicas: 3 replicas: 3
selector:
matchLabels:
app: cockroachdb
template: template:
metadata: metadata:
labels: labels:

View File

@ -7,6 +7,9 @@ metadata:
spec: spec:
serviceName: etcd serviceName: etcd
replicas: 3 replicas: 3
selector:
matchLabels:
app: etcd
template: template:
metadata: metadata:
name: etcd name: etcd

View File

@ -1,9 +1,12 @@
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: etcd-test-server name: etcd-test-server
spec: spec:
replicas: 3 replicas: 3
selector:
matchLabels:
app: test-server
template: template:
metadata: metadata:
labels: labels:

View File

@ -5,6 +5,9 @@ metadata:
spec: spec:
serviceName: "galera" serviceName: "galera"
replicas: 3 replicas: 3
selector:
matchLabels:
app: mysql
template: template:
metadata: metadata:
labels: labels:

View File

@ -5,6 +5,9 @@ metadata:
spec: spec:
serviceName: mysql serviceName: mysql
replicas: 3 replicas: 3
selector:
matchLabels:
app: mysql
template: template:
metadata: metadata:
labels: labels:

View File

@ -1,9 +1,12 @@
apiVersion: apps/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: mysql-test-server name: mysql-test-server
spec: spec:
replicas: 3 replicas: 3
selector:
matchLabels:
app: test-server
template: template:
metadata: metadata:
labels: labels:

View File

@ -5,6 +5,9 @@ metadata:
spec: spec:
serviceName: "redis" serviceName: "redis"
replicas: 3 replicas: 3
selector:
matchLabels:
app: redis
template: template:
metadata: metadata:
labels: labels:

View File

@ -5,6 +5,9 @@ metadata:
spec: spec:
serviceName: "zk" serviceName: "zk"
replicas: 3 replicas: 3
selector:
matchLabels:
app: zk
template: template:
metadata: metadata:
labels: labels: