Skip to content

Commit

Permalink
Fix tests?
Browse files Browse the repository at this point in the history
  • Loading branch information
micw523 committed Oct 23, 2018
1 parent ff00250 commit 443ae4e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
4 changes: 2 additions & 2 deletions kubernetes/e2e_test/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ def test_app_yaml(self):
deployment_name = []
for item in deployments:
deployment_name.append(item.metadata.name)
self.assertIn("redis-master", deployment_name)
self.assertIn("nginx-app", deployment_name)
resp = k8s_api.delete_namespaced_deployment(
name="redis-master", namespace="default",
name="nginx-app", namespace="default",
body={})

def test_extension_yaml(self):
Expand Down
26 changes: 9 additions & 17 deletions kubernetes/e2e_test/test_yaml/app.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: redis-master
name: nginx-app
labels:
app: redis
app: nginx
spec:
replicas: 3
selector:
matchLabels:
app: redis
role: master
tier: backend
replicas: 1
app: nginx
template:
metadata:
labels:
app: redis
role: master
tier: backend
app: nginx
spec:
containers:
- name: master
image: k8s.gcr.io/redis:e2e # or just image: redis
resources:
requests:
cpu: 100m
memory: 100Mi
- name: nginx
image: nginx:1.7.9
ports:
- containerPort: 6379
- containerPort: 80

0 comments on commit 443ae4e

Please sign in to comment.