github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update update-demo to work for v1, and don't use localhost domain name

Browse Source
This commit is contained in:
Isaac Hollander McCreery
2015-06-23 08:55:28 -07:00
parent 19991d5315
commit e55654f0bf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/update-demo/kitten-rc.yaml
View File

@@ -3,7 +3,7 @@ kind: ReplicationController
metadata: metadata:
name: update-demo-kitten name: update-demo-kitten
spec: spec:
replicas: 1 replicas: 4
selector: selector:
name: update-demo name: update-demo
version: kitten version: kitten

4
examples/update-demo/local/index.html
View File

@@ -22,9 +22,9 @@ limitations under the License.
</head> </head>
<body ng-controller="ButtonsCtrl"> <body ng-controller="ButtonsCtrl">
<div ng-repeat="server in servers" class="pod"> <div ng-repeat="server in servers" class="pod">
<img src="http://localhost:8001/api/v1/proxy/namespaces/default/pods/{{server.podName}}/{{server.image}}" height="100px" width="100px" /> <img src="/api/v1/proxy/namespaces/default/pods/{{server.podName}}/{{server.image}}" height="100px" width="100px" />
<b>ID:</b> {{server.podName}}<br> <b>ID:</b> {{server.podName}}<br>
<b>Host:</b> <a href="http://localhost:8001/api/v1/proxy/namespaces/default/pods/{{server.podName}}/data.json">{{server.host}}</a><br> <b>Host:</b> <a href="/api/v1/proxy/namespaces/default/pods/{{server.podName}}/data.json">{{server.host}}</a><br>
<b>Status:</b> {{server.status}}<br> <b>Status:</b> {{server.status}}<br>
<b>Image:</b> {{server.dockerImage}}<br> <b>Image:</b> {{server.dockerImage}}<br>
<b>Labels:</b> <b>Labels:</b>

4
examples/update-demo/local/script.js
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
var base = "http://localhost:8001/api/v1/"; var base = "/api/v1/";
var updateImage = function($http, server) { var updateImage = function($http, server) {
$http.get(base + "proxy/namespaces/default/pods/" + server.podName + "/data.json") $http.get(base + "proxy/namespaces/default/pods/" + server.podName + "/data.json")
@@ -33,7 +33,7 @@ var updateServer = function($http, server) {
.success(function(data) { .success(function(data) {
console.log(data); console.log(data);
server.labels = data.metadata.labels; server.labels = data.metadata.labels;
server.host = data.spec.host.split('.')[0]; server.host = data.status.hostIP.split('.')[0];
server.status = data.status.phase; server.status = data.status.phase;
server.dockerImage = data.status.containerStatuses[0].image; server.dockerImage = data.status.containerStatuses[0].image;
updateImage($http, server); updateImage($http, server);