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

Updating scripts to use v1 instead of v1beta3

Browse Source
This commit is contained in:
nikhiljindal
2015-06-30 23:36:39 -07:00
parent 09df440b79
commit 2e9e46dd08
26 changed files with 53 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/juju/charms/trusty/kubernetes/hooks/hooks.py
View File

@@ -216,7 +216,7 @@ def register_machine(apiserver, retry=False):
response, result = registration_request.register(parsed.hostname,
parsed.port,
'/api/v1beta3/nodes')
'/api/v1/nodes')
print(response)

6
cluster/juju/charms/trusty/kubernetes/unit_tests/lib/test_registrator.py
View File

@@ -37,12 +37,12 @@ class TestRegistrator():
@patch('json.loads')
@patch('httplib.HTTPConnection')
def test_register(self, httplibmock, jsonmock):
result = self.r.register('foo', 80, '/v1beta3/test')
result = self.r.register('foo', 80, '/v1/test')
httplibmock.assert_called_with('foo', 80)
requestmock = httplibmock().request
requestmock.assert_called_with(
"POST", "/v1beta3/test",
"POST", "/v1/test",
json.dumps(self.r.data),
{"Content-type": "application/json",
"Accept": "application/json"})
@@ -50,7 +50,7 @@ class TestRegistrator():
def test_command_succeeded(self):
response = MagicMock()
result = json.loads('{"status": "Failure", "kind": "Status", "code": 409, "apiVersion": "v1beta2", "reason": "AlreadyExists", "details": {"kind": "minion", "id": "10.200.147.200"}, "message": "minion \\"10.200.147.200\\" already exists", "creationTimestamp": null}')
result = json.loads('{"status": "Failure", "kind": "Status", "code": 409, "apiVersion": "v1", "reason": "AlreadyExists", "details": {"kind": "node", "name": "10.200.147.200"}, "message": "node \\"10.200.147.200\\" already exists", "creationTimestamp": null}')
response.status = 200
self.r.command_succeeded(response, result)
response.status = 500