Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kubectl e2e test manifests to apps/v1 #52130

Merged
merged 1 commit into from
Mar 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions test/e2e/testing-manifests/kubectl/nginx-deployment1.yaml.in
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -13,4 +16,4 @@ spec:
- name: nginx
image: {{.NginxSlimNewImage}}
ports:
- containerPort: 80
- containerPort: 80
7 changes: 5 additions & 2 deletions test/e2e/testing-manifests/kubectl/nginx-deployment2.yaml.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: nginx-deployment
spec:
selector:
matchLabels:
app: nginx
template:
metadata:
labels:
Expand All @@ -12,4 +15,4 @@ spec:
- name: nginx
image: {{.NginxSlimNewImage}}
ports:
- containerPort: 80
- containerPort: 80
7 changes: 5 additions & 2 deletions test/e2e/testing-manifests/kubectl/nginx-deployment3.yaml.in
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: nginx-deployment
spec:
selector:
matchLabels:
app: nginx
template:
metadata:
labels:
Expand All @@ -12,4 +15,4 @@ spec:
- name: nginx
image: {{.NginxSlimImage}}
ports:
- containerPort: 80
- containerPort: 80
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
5 changes: 4 additions & 1 deletion test/e2e/testing-manifests/statefulset/cassandra/tester.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
spec:
serviceName: "cockroachdb"
replicas: 3
selector:
matchLabels:
app: cockroachdb
template:
metadata:
labels:
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/testing-manifests/statefulset/etcd/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ metadata:
spec:
serviceName: etcd
replicas: 3
selector:
matchLabels:
app: etcd
template:
metadata:
name: etcd
Expand Down
5 changes: 4 additions & 1 deletion test/e2e/testing-manifests/statefulset/etcd/tester.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
spec:
serviceName: "galera"
replicas: 3
selector:
matchLabels:
app: mysql
template:
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
spec:
serviceName: mysql
replicas: 3
selector:
matchLabels:
app: mysql
template:
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
3 changes: 3 additions & 0 deletions test/e2e/testing-manifests/statefulset/redis/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
spec:
serviceName: "redis"
replicas: 3
selector:
matchLabels:
app: redis
template:
metadata:
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
spec:
serviceName: "zk"
replicas: 3
selector:
matchLabels:
app: zk
template:
metadata:
labels:
Expand Down