Merge pull request #3668 from telepresenceio/thallgren/bw-regression

Fix backward incompatibility regression.
telepresenceio · Aug 19, 2024 · 1aed25a · 1aed25a
2 parents ea72611 + 564074a
commit 1aed25a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/pkg/client/userd/daemon/grpc.go b/pkg/client/userd/daemon/grpc.go
@@ -345,7 +345,18 @@ func (s *service) List(c context.Context, lr *rpc.ListRequest) (result *rpc.Work
 func (s *service) GetKnownWorkloadKinds(ctx context.Context, _ *empty.Empty) (result *manager.KnownWorkloadKinds, err error) {
 	err = s.WithSession(ctx, "GetKnownWorkloadKinds", func(ctx context.Context, session userd.Session) error {
 		result, err = session.ManagerClient().GetKnownWorkloadKinds(ctx, session.SessionInfo())
-		return err
+		if err != nil {
+			if status.Code(err) != codes.Unimplemented {
+				return err
+			}
+			// Talking to an older traffic-manager, use legacy default types
+			result = &manager.KnownWorkloadKinds{Kinds: []manager.WorkloadInfo_Kind{
+				manager.WorkloadInfo_DEPLOYMENT,
+				manager.WorkloadInfo_REPLICASET,
+				manager.WorkloadInfo_STATEFULSET,
+			}}
+		}
+		return nil
 	})
 	return result, err
 }

diff --git a/pkg/client/userd/trafficmgr/session.go b/pkg/client/userd/trafficmgr/session.go
@@ -441,7 +441,15 @@ func connectMgr(
 
 	knownWorkloadKinds, err := mClient.GetKnownWorkloadKinds(ctx, si)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get known workload kinds: %w", err)
+		if status.Code(err) != codes.Unimplemented {
+			return nil, fmt.Errorf("failed to get known workload kinds: %w", err)
+		}
+		// Talking to an older traffic-manager, use legacy default types
+		knownWorkloadKinds = &manager.KnownWorkloadKinds{Kinds: []manager.WorkloadInfo_Kind{
+			manager.WorkloadInfo_DEPLOYMENT,
+			manager.WorkloadInfo_REPLICASET,
+			manager.WorkloadInfo_STATEFULSET,
+		}}
 	}
 
 	sess := &session{