From fc10e59033580bc7ba360a3c34940dff1fb325b4 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Wed, 27 May 2020 12:59:12 +0000 Subject: executor: add extra kubectl port-forward debug and releasenotes This change documents how the kubectl was not working and it adds a log statement to help debug future issue. Change-Id: Iaf6ca030365d9e4e768bca716568cb2d4289665d --- releasenotes/notes/kubectl-port-forward-b6e5e8033c9b9ede.yaml | 8 ++++++++ zuul/executor/server.py | 1 + 2 files changed, 9 insertions(+) create mode 100644 releasenotes/notes/kubectl-port-forward-b6e5e8033c9b9ede.yaml diff --git a/releasenotes/notes/kubectl-port-forward-b6e5e8033c9b9ede.yaml b/releasenotes/notes/kubectl-port-forward-b6e5e8033c9b9ede.yaml new file mode 100644 index 000000000..90cc01b97 --- /dev/null +++ b/releasenotes/notes/kubectl-port-forward-b6e5e8033c9b9ede.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + In some cases (such as when an older version of kubectl is present on the executor, + or the kubectl on the executor is from OpenShift), streaming logs from Kubernetes or + OpenShift pods did not work. + The log streaming system has been corrected to work with a wider range of kubectl + versions and error logging has been improved. diff --git a/zuul/executor/server.py b/zuul/executor/server.py index 5cb66f759..2b08d5bc7 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -355,6 +355,7 @@ class KubeFwd(object): self.port = m.group(1) else: try: + self.log.error("Could not find the forwarded port: %s", line) fwd.kill() except Exception: pass -- cgit v1.2.1