From ba5a22e429f910db8fba5d1f5ee048b0d6dc9745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Ingebrigtsen=20=C3=98vergaard?= Date: Fri, 28 Jul 2017 15:18:04 +0200 Subject: [PATCH] Backport k8s client library changes from spinnaker-k8s-helper --- k8s/client.py | 5 +++++ k8s/models/ingress.py | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/k8s/client.py b/k8s/client.py index 732ae75..8fbf75d 100644 --- a/k8s/client.py +++ b/k8s/client.py @@ -63,6 +63,11 @@ def put(self, url, body, timeout=DEFAULT_TIMEOUT_SECONDS): def _call(self, method, url, body=None, timeout=DEFAULT_TIMEOUT_SECONDS, **kwargs): self.init_session() resp = self._session.request(method, config.api_server + url, json=body, timeout=timeout, **kwargs) + if config.debug: + message = ['{:d} for url: {:s}'.format(resp.status_code, resp.url)] + Client._add_request(message, resp.request) + Client._add_response(message, resp) + LOG.debug("\n".join(message)) self._raise_on_status(resp) return resp diff --git a/k8s/models/ingress.py b/k8s/models/ingress.py index ae62473..8137808 100644 --- a/k8s/models/ingress.py +++ b/k8s/models/ingress.py @@ -28,9 +28,15 @@ class IngressRule(Model): http = Field(HTTPIngressRuleValue) +class IngressTLS(Model): + hosts = ListField(six.text_type) + secretName = Field(six.text_type) + + class IngressSpec(Model): backend = Field(IngressBackend) rules = ListField(IngressRule) + tls = ListField(IngressTLS) class Ingress(Model):