summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-05-27 17:54:12 +0000
committerGerrit Code Review <review@openstack.org>2020-05-27 17:54:12 +0000
commit03a3610924cc124063b47ca1c47d265a5a8e47a0 (patch)
tree2268b3f9ad5c9f440f396ed524a602d3f51af7e7
parent5b7bc4f2ab1ca0f57a65d4e6855e67d2ceb49911 (diff)
parentfc10e59033580bc7ba360a3c34940dff1fb325b4 (diff)
downloadzuul-03a3610924cc124063b47ca1c47d265a5a8e47a0.tar.gz
Merge "executor: add extra kubectl port-forward debug and releasenotes"
-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