Merge pull request #11582 from linkerd/alpeb/stable-2.14.3

Changes for stable-2.14.3 This stable release fixes an issue in the Destination controller that was forbidding to route traffic to opaque ports on unmeshed pods. Also, it increases the log level from debug to warning when the outbound proxy faces this type of events. * Fixed `GetProfiles` error in the Destination controller when address is opaque and unmeshed ([#11556], fixes[#11555]) * Started logging at warning level in the proxy when the controller clients receive an error ([#2499]) [#11556]: #11556 [#11555]: #11555 [#2499]: linkerd/linkerd2-proxy#2499
linkerd · Nov 7, 2023 · c5ad763 · c5ad763
2 parents 2f25cde + 6492459
commit c5ad763
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 14 deletions.
diff --git a/.proxy-version b/.proxy-version
@@ -1 +1 @@
-v2.210.1
+v2.210.2
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,21 @@
 # Changes
 
+## stable-2.14.3
+
+This stable release fixes an issue in the Destination controller that was
+forbidding to route traffic to opaque ports on unmeshed pods. Also, it increases
+the log level from debug to warning when the outbound proxy faces this type of
+events.
+
+* Fixed `GetProfiles` error in the Destination controller when address is opaque
+  and unmeshed ([#11556], fixes[#11555])
+* Started logging at warning level in the proxy when the controller clients
+  receive an error ([#2499])
+
+[#11556]: https://github.com/linkerd/linkerd2/pull/11556
+[#11555]: https://github.com/linkerd/linkerd2/pull/11555
+[#2499]: https://github.com/linkerd/linkerd2-proxy/pull/2499
+
 ## stable-2.14.2
 
 This stable release fixes issues in the proxy and Destination controller which

diff --git a/charts/linkerd-control-plane/Chart.yaml b/charts/linkerd-control-plane/Chart.yaml
@@ -16,7 +16,7 @@ dependencies:
 - name: partials
   version: 0.1.0
   repository: file://../partials
-version: 1.16.3
+version: 1.16.4
 icon: https://linkerd.io/images/logo-only-200h.png
 maintainers:
   - name: Linkerd authors

diff --git a/charts/linkerd-control-plane/README.md b/charts/linkerd-control-plane/README.md
@@ -3,7 +3,7 @@
 Linkerd gives you observability, reliability, and security
 for your microservices — with no code change required.
 
-![Version: 1.16.3](https://img.shields.io/badge/Version-1.16.3-informational?style=flat-square)
+![Version: 1.16.4](https://img.shields.io/badge/Version-1.16.4-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)
 

diff --git a/controller/api/destination/endpoint_profile_translator.go b/controller/api/destination/endpoint_profile_translator.go
@@ -64,11 +64,11 @@ func (ept *endpointProfileTranslator) Update(address *watcher.Address) (bool, er
 		} else if endpoint.ProtocolHint.OpaqueTransport == nil {
 			port, err := getInboundPort(&address.Pod.Spec)
 			if err != nil {
-				return false, err
-			}
-
-			endpoint.ProtocolHint.OpaqueTransport = &pb.ProtocolHint_OpaqueTransport{
-				InboundPort: port,
+				ept.log.Error(err)
+			} else {
+				endpoint.ProtocolHint.OpaqueTransport = &pb.ProtocolHint_OpaqueTransport{
+					InboundPort: port,
+				}
 			}
 		}
 

diff --git a/controller/api/destination/server_test.go b/controller/api/destination/server_test.go
@@ -353,6 +353,23 @@ func TestGetProfiles(t *testing.T) {
 		}
 	})
 
+	t.Run("Return profile with no opaque transport when pod does not have label and port is opaque", func(t *testing.T) {
+		server := makeServer(t)
+		defer server.clusterStore.UnregisterGauges()
+
+		// port 3306 is in the default opaque port list
+		stream := profileStream(t, server, podIP2, 3306, "")
+		defer stream.Cancel()
+		profile := assertSingleProfile(t, stream.Updates())
+		if profile.Endpoint == nil {
+			t.Fatalf("Expected response to have endpoint field")
+		}
+
+		if profile.Endpoint.GetProtocolHint().GetOpaqueTransport() != nil {
+			t.Fatalf("Expected no opaque transport but found one")
+		}
+	})
+
 	t.Run("Return profile with no protocol hint when pod does not have label", func(t *testing.T) {
 		server := makeServer(t)
 		defer server.clusterStore.UnregisterGauges()

diff --git a/jaeger/charts/linkerd-jaeger/Chart.yaml b/jaeger/charts/linkerd-jaeger/Chart.yaml
@@ -11,7 +11,7 @@ kubeVersion: ">=1.21.0-0"
 name: linkerd-jaeger
 sources:
 - https://github.com/linkerd/linkerd2/
-version: 30.12.3
+version: 30.12.4
 icon: https://linkerd.io/images/logo-only-200h.png
 maintainers:
   - name: Linkerd authors

diff --git a/jaeger/charts/linkerd-jaeger/README.md b/jaeger/charts/linkerd-jaeger/README.md
@@ -3,7 +3,7 @@
 The Linkerd-Jaeger extension adds distributed tracing to Linkerd using
 OpenCensus and Jaeger.
 
-![Version: 30.12.3](https://img.shields.io/badge/Version-30.12.3-informational?style=flat-square)
+![Version: 30.12.4](https://img.shields.io/badge/Version-30.12.4-informational?style=flat-square)
 
 ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)
 

diff --git a/multicluster/charts/linkerd-multicluster/Chart.yaml b/multicluster/charts/linkerd-multicluster/Chart.yaml
@@ -11,7 +11,7 @@ kubeVersion: ">=1.21.0-0"
 name: "linkerd-multicluster"
 sources:
 - https://github.com/linkerd/linkerd2/
-version: 30.11.3
+version: 30.11.4
 icon: https://linkerd.io/images/logo-only-200h.png
 maintainers:
   - name: Linkerd authors

diff --git a/multicluster/charts/linkerd-multicluster/README.md b/multicluster/charts/linkerd-multicluster/README.md
@@ -3,7 +3,7 @@
 The Linkerd-Multicluster extension contains resources to support multicluster
 linking to remote clusters
 
-![Version: 30.11.3](https://img.shields.io/badge/Version-30.11.3-informational?style=flat-square)
+![Version: 30.11.4](https://img.shields.io/badge/Version-30.11.4-informational?style=flat-square)
 
 ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)
 

diff --git a/viz/charts/linkerd-viz/Chart.yaml b/viz/charts/linkerd-viz/Chart.yaml
@@ -11,7 +11,7 @@ kubeVersion: ">=1.21.0-0"
 name: "linkerd-viz"
 sources:
 - https://github.com/linkerd/linkerd2/
-version: 30.12.3
+version: 30.12.4
 icon: https://linkerd.io/images/logo-only-200h.png
 maintainers:
   - name: Linkerd authors

diff --git a/viz/charts/linkerd-viz/README.md b/viz/charts/linkerd-viz/README.md
@@ -3,7 +3,7 @@
 The Linkerd-Viz extension contains observability and visualization
 components for Linkerd.
 
-![Version: 30.12.3](https://img.shields.io/badge/Version-30.12.3-informational?style=flat-square)
+![Version: 30.12.4](https://img.shields.io/badge/Version-30.12.4-informational?style=flat-square)
 
 ![AppVersion: edge-XX.X.X](https://img.shields.io/badge/AppVersion-edge--XX.X.X-informational?style=flat-square)