Skip to content

Commit

Permalink
Merge pull request kubernetes#4322 from bprashanth/nginx_port_collision
Browse files Browse the repository at this point in the history
Modify nginx port to avoid collision with api server
  • Loading branch information
yujuhong committed Feb 18, 2015
2 parents 860c1cc + ec29873 commit 418f336
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions api/examples/pod.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
"image": "dockerfile/nginx",
"ports": [{
"containerPort": 80,
"hostPort": 8080
"hostPort": 8081
}],
"livenessProbe": {
"enabled": true,
"type": "http",
"initialDelaySeconds": 30,
"httpGet": {
"path": "/index.html",
"port": "8080"
"port": "8081"
}
}
}]
Expand Down
7 changes: 5 additions & 2 deletions docs/getting-started-guides/gce.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ Where pod.json contains something like:
"image": "dockerfile/nginx",
"ports": [{
"containerPort": 80,
"hostPort": 8080
"hostPort": 8081
}],
"livenessProbe": {
"enabled": true,
"type": "http",
"initialDelaySeconds": 30,
"httpGet": {
"path": "/index.html",
"port": "8080"
"port": "8081"
}
}
}]
Expand All @@ -128,6 +128,9 @@ and delete the pod you just created:
cluster/kubectl.sh delete pods php
```

Since this pod is scheduled on a minion running in GCE, you will have to enable incoming tcp traffic via the port specified in the
pod manifest before you see the nginx welcome page. After doing so, it should be visible at http://<external ip of minion running nginx>:<port from manifest>.

Look in `examples/` for more examples

### Tearing down the cluster
Expand Down

0 comments on commit 418f336

Please sign in to comment.