Skip to content

Commit

Permalink
Merge pull request kubernetes#3451 from justinsb/fix_integration_test
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue. .

Fix integration test
  • Loading branch information
Kubernetes Submit Queue authored Sep 25, 2017
2 parents bab73b1 + 8c3d4c5 commit aa72c12
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ spec:
name: varetcdata
- mountPath: /var/log/etcd.log
name: varlogetcd
- mountPath: /etc/hosts
name: hosts
readOnly: true
hostNetwork: true
volumes:
- hostPath:
Expand All @@ -86,4 +89,7 @@ spec:
- hostPath:
path: /var/log/etcd.log
name: varlogetcd
- hostPath:
path: /etc/hosts
name: hosts
status: {}
6 changes: 6 additions & 0 deletions protokube/tests/integration/build_etcd_manifest/main/tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ spec:
name: varetcdata
- mountPath: /var/log/etcd.log
name: varlogetcd
- mountPath: /etc/hosts
name: hosts
readOnly: true
- mountPath: /srv/kubernetes
name: srvkubernetes
readOnly: true
Expand All @@ -105,6 +108,9 @@ spec:
- hostPath:
path: /var/log/etcd.log
name: varlogetcd
- hostPath:
path: /etc/hosts
name: hosts
- hostPath:
path: /srv/kubernetes
name: srvkubernetes
Expand Down

0 comments on commit aa72c12

Please sign in to comment.