diff --git a/examples/update-demo/kitten-rc.yaml b/examples/update-demo/kitten-rc.yaml index 25b672925bb..5644987eae3 100644 --- a/examples/update-demo/kitten-rc.yaml +++ b/examples/update-demo/kitten-rc.yaml @@ -3,7 +3,7 @@ kind: ReplicationController metadata: name: update-demo-kitten spec: - replicas: 1 + replicas: 4 selector: name: update-demo version: kitten diff --git a/examples/update-demo/local/index.html b/examples/update-demo/local/index.html index f0d897e4aa8..47a1965b758 100644 --- a/examples/update-demo/local/index.html +++ b/examples/update-demo/local/index.html @@ -22,9 +22,9 @@ limitations under the License.
- + ID: {{server.podName}}
- Host: {{server.host}}
+ Host: {{server.host}}
Status: {{server.status}}
Image: {{server.dockerImage}}
Labels: diff --git a/examples/update-demo/local/script.js b/examples/update-demo/local/script.js index ec9cde6a955..d6edb74f73b 100644 --- a/examples/update-demo/local/script.js +++ b/examples/update-demo/local/script.js @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -var base = "http://localhost:8001/api/v1/"; +var base = "/api/v1/"; var updateImage = function($http, server) { $http.get(base + "proxy/namespaces/default/pods/" + server.podName + "/data.json") @@ -33,7 +33,7 @@ var updateServer = function($http, server) { .success(function(data) { console.log(data); 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.dockerImage = data.status.containerStatuses[0].image; updateImage($http, server); diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index c69785fb6c5..538eeac4b9f 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -102,7 +102,7 @@ var _ = Describe("Kubectl client", func() { By("rolling-update to new replication controller") runKubectl("rolling-update", "update-demo-nautilus", "--update-period=1s", "-f", kittenPath, fmt.Sprintf("--namespace=%v", ns)) // TODO: revisit the expected replicas once #9645 is resolved - validateController(c, kittenImage, 1, "update-demo", updateDemoSelector, getUDData("kitten.jpg", ns), ns) + validateController(c, kittenImage, 4, "update-demo", updateDemoSelector, getUDData("kitten.jpg", ns), ns) // Everything will hopefully be cleaned up when the namespace is deleted. }) })