Merge branch 'devel' into ekans-arbok

docs/source/user_guide/configuration_options.rst

@@ -824,6 +824,7 @@ Work Kubernetes
     work-kubernetes:
       - worktype: cat
 
+
 ^^^^^^^^^^^^
 Work Signing
 ^^^^^^^^^^^^

pkg/controlsvc/controlsvc_test.go

@@ -103,6 +103,10 @@ func TestRunControlSvc(t *testing.T) {
 	mockNetceptor := mock_controlsvc.NewMockNetceptorForControlsvc(ctrl)
 	mockUnix := mock_controlsvc.NewMockUtiler(ctrl)
 	mockNet := mock_controlsvc.NewMockNeter(ctrl)
+	mockTLS := mock_controlsvc.NewMockTlser(ctrl)
+	mockListener := mock_controlsvc.NewMockListener(ctrl)
+
+	logger := logger.NewReceptorLogger("")
 
 	runControlSvcTestCases := []struct {
 		name          string
@@ -158,6 +162,21 @@ func TestRunControlSvc(t *testing.T) {
 				"tcpListen":  "",
 			},
 		},
+		{
+			name:          "tcp listener set",
+			expectedError: "",
+			expectedCalls: func() {
+				mockNet.EXPECT().Listen(gomock.Any(), gomock.Any()).Return(mockListener, nil)
+				mockTLS.EXPECT().NewListener(gomock.Any(), gomock.Any()).Return(mockListener)
+				mockNetceptor.EXPECT().GetLogger().Return(logger).AnyTimes()
+				mockListener.EXPECT().Accept().Return(nil, errors.New("normal close")).AnyTimes()
+			},
+			listeners: map[string]string{
+				"service":    "",
+				"unixSocket": "",
+				"tcpListen":  "tcp:1",
+			},
+		},
 	}
 
 	for _, testCase := range runControlSvcTestCases {
@@ -166,10 +185,11 @@ func TestRunControlSvc(t *testing.T) {
 			s := controlsvc.New(false, mockNetceptor)
 			s.SetServerUtils(mockUnix)
 			s.SetServerNet(mockNet)
+			s.SetServerTLS(mockTLS)
 
 			err := s.RunControlSvc(context.Background(), testCase.listeners["service"], &tls.Config{}, testCase.listeners["unixSocket"], os.FileMode(0o600), testCase.listeners["tcpListen"], &tls.Config{})
 
-			if err.Error() != testCase.expectedError {
+			if err != nil && err.Error() != testCase.expectedError {
 				t.Errorf("expected error %s, got %v", testCase.expectedError, err)
 			}
 		})

pkg/workceptor/kubernetes.go

@@ -817,6 +817,7 @@ func (kw *KubeUnit) runWorkUsingLogger() {
 					// this is probably not possible...
 					errMsg := fmt.Sprintf("Error reading stdin: %s", stdin.Error())
 					kw.GetWorkceptor().nc.GetLogger().Error(errMsg)
+					kw.GetWorkceptor().nc.GetLogger().Error("Pod status at time of error %s", kw.pod.Status.String())
 					kw.UpdateBasicStatus(WorkStateFailed, errMsg, stdout.Size())
 
 					close(stdinErrChan) // signal STDOUT goroutine to stop

pkg/workceptor/python.go

@@ -5,6 +5,7 @@ package workceptor
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"os/exec"
 
@@ -22,6 +23,7 @@ type pythonUnit struct {
 
 // Start launches a job with given parameters.
 func (pw *pythonUnit) Start() error {
+	pw.UpdateBasicStatus(WorkStatePending, "[DEPRECATION WARNING] This option is not currently being used. This feature will be removed from receptor in a future release.", 0)
 	pw.UpdateBasicStatus(WorkStatePending, "Launching Python runner", 0)
 	config := make(map[string]interface{})
 	for k, v := range pw.config {
@@ -73,7 +75,9 @@ func (cfg WorkPythonCfg) NewWorker(_ BaseWorkUnitForWorkUnit, w *Workceptor, uni
 func (cfg WorkPythonCfg) Run() error {
 	err := MainInstance.RegisterWorker(cfg.WorkType, cfg.NewWorker, false)
 
-	return err
+	errWithDeprecation := errors.Join(err, errors.New("[DEPRECATION WARNING] This option is not currently being used. This feature will be removed from receptor in a future release"))
+
+	return errWithDeprecation
 }
 
 func init() {
@@ -82,5 +86,6 @@ func init() {
 		return
 	}
 	cmdline.RegisterConfigTypeForApp("receptor-workers",
-		"work-python", "Run a worker using a Python plugin", WorkPythonCfg{}, cmdline.Section(workersSection))
+		"work-python", "Run a worker using a Python plugin\n[DEPRECATION WARNING] This option is not currently being used. This feature will be removed from receptor in a future release.", workPythonCfg{}, cmdline.Section(workersSection))
+
 }