diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 294138429..d00fc3d0f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -16,6 +16,8 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v2 + with: + version: v1.52 lint-receptorctl: name: lint-receptorctl runs-on: ubuntu-latest diff --git a/pkg/controlsvc/controlsvc.go b/pkg/controlsvc/controlsvc.go index 16aa28bf7..3c5cae445 100644 --- a/pkg/controlsvc/controlsvc.go +++ b/pkg/controlsvc/controlsvc.go @@ -236,7 +236,7 @@ func (s *Server) RunControlSession(conn net.Conn) { cc, err = ct.InitFromJSON(jsonData) } if err == nil { - ctx, cancel := context.WithCancel(s.nc.Context()) + ctx, cancel := context.WithCancel(context.Background()) defer cancel() cfr, err = cc.ControlFunc(ctx, s.nc, cfo) } @@ -435,7 +435,7 @@ func (cfg cmdlineConfigUnix) Run() error { return err } } - err = MainInstance.RunControlSvc(netceptor.MainInstance.Context(), cfg.Service, tlscfg, cfg.Filename, + err = MainInstance.RunControlSvc(context.Background(), cfg.Service, tlscfg, cfg.Filename, os.FileMode(cfg.Permissions), cfg.TCPListen, tcptls) if err != nil { return err diff --git a/pkg/netceptor/conn.go b/pkg/netceptor/conn.go index daa481a7b..1f2ec1397 100644 --- a/pkg/netceptor/conn.go +++ b/pkg/netceptor/conn.go @@ -271,7 +271,7 @@ type Conn struct { // Dial returns a stream connection compatible with Go's net.Conn. func (s *Netceptor) Dial(node string, service string, tlscfg *tls.Config) (*Conn, error) { - return s.DialContext(s.Context(), node, service, tlscfg) + return s.DialContext(context.Background(), node, service, tlscfg) } // DialContext is like Dial but uses a context to allow timeout or cancellation. diff --git a/pkg/types/main.go b/pkg/types/main.go index df5786dd0..229e77709 100644 --- a/pkg/types/main.go +++ b/pkg/types/main.go @@ -58,7 +58,7 @@ func (cfg NodeCfg) Init() error { } } - workceptor.MainInstance, err = workceptor.New(netceptor.MainInstance.Context(), netceptor.MainInstance, cfg.DataDir) + workceptor.MainInstance, err = workceptor.New(context.Background(), netceptor.MainInstance, cfg.DataDir) if err != nil { return err } diff --git a/pkg/workceptor/kubernetes.go b/pkg/workceptor/kubernetes.go index a19d51bc5..04ad7d505 100644 --- a/pkg/workceptor/kubernetes.go +++ b/pkg/workceptor/kubernetes.go @@ -1316,7 +1316,7 @@ func (kw *kubeUnit) Restart() error { if err != nil { kw.w.nc.Logger.Warning("Pod %s could not be deleted: %s", ked.PodName, err.Error()) } else { - err := kw.clientset.CoreV1().Pods(ked.KubeNamespace).Delete(kw.ctx, ked.PodName, metav1.DeleteOptions{}) + err := kw.clientset.CoreV1().Pods(ked.KubeNamespace).Delete(context.Background(), ked.PodName, metav1.DeleteOptions{}) if err != nil { kw.w.nc.Logger.Warning("Pod %s could not be deleted: %s", ked.PodName, err.Error()) } @@ -1341,7 +1341,7 @@ func (kw *kubeUnit) Cancel() error { kw.cancel() kw.UpdateBasicStatus(WorkStateCanceled, "Canceled", -1) if kw.pod != nil { - err := kw.clientset.CoreV1().Pods(kw.pod.Namespace).Delete(kw.ctx, kw.pod.Name, metav1.DeleteOptions{}) + err := kw.clientset.CoreV1().Pods(kw.pod.Namespace).Delete(context.Background(), kw.pod.Name, metav1.DeleteOptions{}) if err != nil { kw.w.nc.Logger.Error("Error deleting pod %s: %s", kw.pod.Name, err) }