@@ -308,6 +308,7 @@ func startProcess(ctx context.Context, k8sClient kubernetes.Interface, cfg *rest
308308 exec , err := getExecutor (k8sClient , cfg , podName , namespace , containerName , cmd , true , true )
309309
310310 if err != nil {
311+ log .Println ("error in getting terminal executor " , "err: " , err )
311312 return err
312313 }
313314
@@ -323,6 +324,7 @@ func startProcess(ctx context.Context, k8sClient kubernetes.Interface, cfg *rest
323324 terminalSessions .SetTerminalSessionStartTime (sessionRequest .SessionId )
324325 err = execWithStreamOptions (ctx , exec , streamOptions )
325326 if err != nil {
327+ log .Println ("error in terminal exec with stream opts: " , "err: " , err )
326328 return err
327329 }
328330 return nil
@@ -506,7 +508,7 @@ func (impl *TerminalSessionHandlerImpl) GetTerminalSession(req *TerminalSessionR
506508 namespace : req .Namespace ,
507509 clusterId : strconv .Itoa (req .ClusterId ),
508510 })
509- config , client , err := impl .getClientConfig (req )
511+ config , client , err := impl .getClientSetAndRestConfigForTerminalConn (req )
510512
511513 go func () {
512514 err := impl .saveEphemeralContainerTerminalAccessAudit (req )
@@ -523,7 +525,7 @@ func (impl *TerminalSessionHandlerImpl) GetTerminalSession(req *TerminalSessionR
523525 return http .StatusOK , & TerminalMessage {SessionID : sessionID }, nil
524526}
525527
526- func (impl * TerminalSessionHandlerImpl ) getClientConfig (req * TerminalSessionRequest ) (* rest.Config , * kubernetes.Clientset , error ) {
528+ func (impl * TerminalSessionHandlerImpl ) getClientSetAndRestConfigForTerminalConn (req * TerminalSessionRequest ) (* rest.Config , * kubernetes.Clientset , error ) {
527529 var clusterBean * cluster.ClusterBean
528530 var clusterConfig * k8s.ClusterConfig
529531 var restConfig * rest.Config
@@ -534,6 +536,13 @@ func (impl *TerminalSessionHandlerImpl) getClientConfig(req *TerminalSessionRequ
534536 impl .logger .Errorw ("error in getting rest config" , "err" , err , "clusterId" , req .ClusterId , "externalArgoApplicationName" , req .ExternalArgoApplicationName )
535537 return nil , nil , err
536538 }
539+
540+ _ , clientSet , err := impl .k8sUtil .GetK8sConfigAndClientsByRestConfig (restConfig )
541+ if err != nil {
542+ impl .logger .Errorw ("error in clientSet" , "err" , err )
543+ return nil , nil , err
544+ }
545+ return restConfig , clientSet , nil
537546 } else {
538547 if req .ClusterId != 0 {
539548 clusterBean , err = impl .clusterService .FindById (req .ClusterId )
@@ -561,14 +570,22 @@ func (impl *TerminalSessionHandlerImpl) getClientConfig(req *TerminalSessionRequ
561570 impl .logger .Errorw ("error in getting rest config by cluster" , "err" , err , "clusterName" , clusterConfig .ClusterName )
562571 return nil , nil , err
563572 }
573+
574+ _ , clientSet , err := impl .k8sUtil .GetK8sConfigAndClientsByRestConfig (restConfig )
575+ if err != nil {
576+ impl .logger .Errorw ("error in clientSet" , "err" , err )
577+ return nil , nil , err
578+ }
579+
580+ // we have to get the clientSet before setting the custom transport to nil
581+ // we need re populate the tls config in the restConfig.
582+ // rest config with custom transport will break spdy client
583+ clusterConfig .PopulateTlsConfigurationsInto (restConfig )
584+ restConfig .Transport = nil
585+ return restConfig , clientSet , nil
564586 }
565- _ , clientSet , err := impl .k8sUtil .GetK8sConfigAndClientsByRestConfig (restConfig )
566- if err != nil {
567- impl .logger .Errorw ("error in clientSet" , "err" , err )
568- return nil , nil , err
569- }
570- return restConfig , clientSet , nil
571587}
588+
572589func (impl * TerminalSessionHandlerImpl ) AutoSelectShell (req * TerminalSessionRequest ) (string , error ) {
573590 var err1 error
574591 for _ , testShell := range validShells {
@@ -614,7 +631,7 @@ func getErrorMsg(err string) error {
614631}
615632
616633func (impl * TerminalSessionHandlerImpl ) RunCmdInRemotePod (req * TerminalSessionRequest , cmds []string ) (* bytes.Buffer , * bytes.Buffer , error ) {
617- config , client , err := impl .getClientConfig (req )
634+ config , client , err := impl .getClientSetAndRestConfigForTerminalConn (req )
618635 if err != nil {
619636 impl .logger .Errorw ("error in fetching config" , "err" , err )
620637 return nil , nil , err
0 commit comments