diff --git a/releasenotes/notes/kubectl-port-forward-b6e5e8033c9b9ede.yaml b/releasenotes/notes/kubectl-port-forward-b6e5e8033c9b9ede.yaml
new file mode 100644
index 0000000000..90cc01b97f
--- /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 5cb66f759e..2b08d5bc75 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