openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "metadata.resourceVersion: Invalid value"

This commit is contained in:
Jenkins 2017-10-09 12:17:01 +00:00 committed by Gerrit Code Review
parent 49689a553b 05a25af13f
commit 6153afe812
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kuryr_kubernetes/k8s_client.py
View File

@ -115,12 +115,10 @@ class K8sClient(object):
url, header = self._get_url_and_header(path)
while itertools.count(1):
data = jsonutils.dumps({
"metadata": {
"annotations": annotations,
"resourceVersion": resource_version,
}
}, sort_keys=True)
metadata = {"annotations": annotations}
if resource_version:
metadata['resourceVersion'] = resource_version
data = jsonutils.dumps({"metadata": metadata}, sort_keys=True)
response = requests.patch(url, data=data,
headers=header, cert=self.cert,
verify=self.verify_server)
@ -142,6 +140,11 @@ class K8sClient(object):
LOG.debug("Annotations for %(path)s already present: "
"%(names)s", {'path': path,
'names': retrieved_annotations})
LOG.error("Exception response, headers: %(headers)s, "
"content: %(content)s, text: %(text)s"
% {'headers': response.headers,
'content': response.content, 'text': response.text})
raise exc.K8sClientException(response.text)
def watch(self, path):