Skip to content

Commit 593224a

Browse files
dfarrell07skitt
authored andcommitted
Replace deprecated golang.org/x/net/context
Use standard library context package instead of the deprecated golang.org/x/net/context in all files. Signed-off-by: Daniel Farrell <[email protected]>
1 parent 6820f0d commit 593224a

File tree

7 files changed

+13
-7
lines changed

7 files changed

+13
-7
lines changed

pkg/lighthouse/ensure.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ limitations under the License.
1919
package lighthouse
2020

2121
import (
22+
"context"
23+
2224
"github.com/submariner-io/admiral/pkg/names"
2325
"github.com/submariner-io/admiral/pkg/reporter"
2426
"github.com/submariner-io/subctl/pkg/lighthouse/serviceaccount"
2527
"github.com/submariner-io/subctl/pkg/operator/ocp"
2628
lighthouseagent "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-agent"
2729
lighthousecoredns "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-coredns"
28-
"golang.org/x/net/context"
2930
"k8s.io/client-go/dynamic"
3031
"k8s.io/client-go/kubernetes"
3132
)

pkg/lighthouse/serviceaccount/ensure.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ limitations under the License.
1919
package serviceaccount
2020

2121
import (
22+
"context"
23+
2224
"github.com/submariner-io/subctl/pkg/apply"
2325
"github.com/submariner-io/subctl/pkg/clusterrole"
2426
"github.com/submariner-io/subctl/pkg/clusterrolebinding"
@@ -27,7 +29,6 @@ import (
2729
"github.com/submariner-io/subctl/pkg/serviceaccount"
2830
lighthouseagent "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-agent"
2931
lighthousecoredns "github.com/submariner-io/submariner-operator/config/rbac/lighthouse-coredns"
30-
"golang.org/x/net/context"
3132
"k8s.io/client-go/kubernetes"
3233
)
3334

pkg/operator/ensure.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ limitations under the License.
1919
package operator
2020

2121
import (
22+
"context"
23+
2224
"github.com/submariner-io/admiral/pkg/names"
2325
"github.com/submariner-io/admiral/pkg/reporter"
2426
"github.com/submariner-io/subctl/pkg/client"
@@ -31,7 +33,6 @@ import (
3133
"github.com/submariner-io/subctl/pkg/submariner"
3234
submarineroperator "github.com/submariner-io/submariner-operator/config/rbac/submariner-operator"
3335
"github.com/submariner-io/submariner-operator/pkg/crd"
34-
"golang.org/x/net/context"
3536
"golang.org/x/net/http/httpproxy"
3637
)
3738

pkg/operator/ensure_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ limitations under the License.
1919
package operator_test
2020

2121
import (
22+
"context"
2223
"testing"
2324

2425
. "github.com/onsi/ginkgo/v2"
@@ -29,7 +30,6 @@ import (
2930
"github.com/submariner-io/subctl/pkg/client"
3031
clientfake "github.com/submariner-io/subctl/pkg/client/fake"
3132
"github.com/submariner-io/subctl/pkg/operator"
32-
"golang.org/x/net/context"
3333
"golang.org/x/net/http/httpproxy"
3434
appsv1 "k8s.io/api/apps/v1"
3535
corev1 "k8s.io/api/core/v1"

pkg/operator/serviceaccount/ensure.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ limitations under the License.
1919
package serviceaccount
2020

2121
import (
22+
"context"
23+
2224
"github.com/pkg/errors"
2325
"github.com/submariner-io/subctl/pkg/clusterrole"
2426
"github.com/submariner-io/subctl/pkg/clusterrolebinding"
2527
"github.com/submariner-io/subctl/pkg/role"
2628
"github.com/submariner-io/subctl/pkg/rolebinding"
2729
"github.com/submariner-io/subctl/pkg/serviceaccount"
2830
submarineroperator "github.com/submariner-io/submariner-operator/config/rbac/submariner-operator"
29-
"golang.org/x/net/context"
3031
"k8s.io/client-go/kubernetes"
3132
)
3233

pkg/submariner/ensure.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ limitations under the License.
1919
package submariner
2020

2121
import (
22+
"context"
23+
2224
"github.com/submariner-io/admiral/pkg/names"
2325
"github.com/submariner-io/admiral/pkg/reporter"
2426
"github.com/submariner-io/subctl/pkg/operator/ocp"
@@ -27,7 +29,6 @@ import (
2729
submarinergateway "github.com/submariner-io/submariner-operator/config/rbac/submariner-gateway"
2830
submarinerglobalnet "github.com/submariner-io/submariner-operator/config/rbac/submariner-globalnet"
2931
submarinerrouteagent "github.com/submariner-io/submariner-operator/config/rbac/submariner-route-agent"
30-
"golang.org/x/net/context"
3132
"k8s.io/client-go/dynamic"
3233
"k8s.io/client-go/kubernetes"
3334
)

pkg/submariner/serviceaccount/ensure.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ limitations under the License.
1919
package serviceaccount
2020

2121
import (
22+
"context"
23+
2224
"github.com/submariner-io/admiral/pkg/resource"
2325
"github.com/submariner-io/subctl/pkg/apply"
2426
"github.com/submariner-io/subctl/pkg/clusterrole"
@@ -31,7 +33,6 @@ import (
3133
submarinergateway "github.com/submariner-io/submariner-operator/config/rbac/submariner-gateway"
3234
submarinerglobalnet "github.com/submariner-io/submariner-operator/config/rbac/submariner-globalnet"
3335
submarinerrouteagent "github.com/submariner-io/submariner-operator/config/rbac/submariner-route-agent"
34-
"golang.org/x/net/context"
3536
"k8s.io/client-go/kubernetes"
3637
)
3738

0 commit comments

Comments
 (0)