summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Cacqueray <tdecacqu@redhat.com>2020-05-27 12:59:12 +0000
committerTristan Cacqueray <tdecacqu@redhat.com>2020-05-27 16:56:13 +0000
commitfc10e59033580bc7ba360a3c34940dff1fb325b4 (patch)
treec1fbc9205f19aef2a54ee41907112706fc7d34b1
parentccfeb49fcc5c06416461d03bace1f239924059f5 (diff)
downloadzuul-fc10e59033580bc7ba360a3c34940dff1fb325b4.tar.gz
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
-rw-r--r--releasenotes/notes/kubectl-port-forward-b6e5e8033c9b9ede.yaml8
-rw-r--r--zuul/executor/server.py1
2 files changed, 9 insertions, 0 deletions
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