scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11895 from derekwaynecarr/vagrant_confornamce_tickbox

Browse Source 
Vagrant passes conformance tests at HEAD
This commit is contained in:
Mike Danese
2015-07-30 10:35:34 -07:00
parent 1a613c43fe 01ec50deb4
commit 452bdcae2d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/getting-started-guides/README.md
View File

@@ -134,7 +134,7 @@ Here are all the solutions mentioned above in table form.
IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level IaaS Provider | Config. Mgmt | OS | Networking | Docs | Conforms | Support Level
-------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ---------------------------- -------------------- | ------------ | ------ | ---------- | --------------------------------------------- | ---------| ----------------------------
GKE | | | GCE | [docs](https://cloud.google.com/container-engine) | | Commercial GKE | | | GCE | [docs](https://cloud.google.com/container-engine) | | Commercial
Vagrant | Saltstack | Fedora | OVS | [docs](vagrant.md) | | Project Vagrant | Saltstack | Fedora | OVS | [docs](vagrant.md) | [✓][2] | Project
GCE | Saltstack | Debian | GCE | [docs](gce.md) | [✓][1] | Project GCE | Saltstack | Debian | GCE | [docs](gce.md) | [✓][1] | Project
Azure | CoreOS | CoreOS | Weave | [docs](coreos/azure/README.md) | | Community ([@errordeveloper](https://github.com/errordeveloper), [@squillace](https://github.com/squillace), [@chanezon](https://github.com/chanezon), [@crossorigin](https://github.com/crossorigin)) Azure | CoreOS | CoreOS | Weave | [docs](coreos/azure/README.md) | | Community ([@errordeveloper](https://github.com/errordeveloper), [@squillace](https://github.com/squillace), [@chanezon](https://github.com/chanezon), [@crossorigin](https://github.com/crossorigin))
Docker Single Node | custom | N/A | local | [docs](docker.md) | | Project (@brendandburns) Docker Single Node | custom | N/A | local | [docs](docker.md) | | Project (@brendandburns)
@@ -189,6 +189,8 @@ Definition of columns:
<!-- reference style links below here --> <!-- reference style links below here -->
<!-- GCE conformance test result --> <!-- GCE conformance test result -->
[1]: https://gist.github.com/erictune/4cabc010906afbcc5061 [1]: https://gist.github.com/erictune/4cabc010906afbcc5061
<!-- Vagrant conformance test result -->
[2]: https://gist.github.com/derekwaynecarr/505e56036cdf010bf6b6
<!-- BEGIN MUNGE: GENERATED_ANALYTICS --> <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

2
test/e2e/service.go
View File

@@ -231,6 +231,8 @@ var _ = Describe("Services", func() {
}) })
It("should be able to up and down services", func() { It("should be able to up and down services", func() {
// this test uses NodeSSHHosts that does not work if a Node only reports LegacyHostIP
SkipUnlessProviderIs("gce", "gke", "aws")
ns := namespaces[0] ns := namespaces[0]
numPods, servicePort := 3, 80 numPods, servicePort := 3, 80