diff --git a/pkg/registry/apis/provisioning/controller/finalizers.go b/pkg/registry/apis/provisioning/controller/finalizers.go index f2d136fa98c..554baa86ca9 100644 --- a/pkg/registry/apis/provisioning/controller/finalizers.go +++ b/pkg/registry/apis/provisioning/controller/finalizers.go @@ -1,10 +1,10 @@ package controller import ( + "context" "sort" "strings" - "golang.org/x/net/context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/services/authz/rbac/store/store.go b/pkg/services/authz/rbac/store/store.go index 124ba38331b..89abbe31d12 100644 --- a/pkg/services/authz/rbac/store/store.go +++ b/pkg/services/authz/rbac/store/store.go @@ -1,10 +1,9 @@ package store import ( + "context" "fmt" - "golang.org/x/net/context" - claims "github.com/grafana/authlib/types" "github.com/grafana/grafana/pkg/infra/tracing" diff --git a/pkg/services/ngalert/accesscontrol/accesscontrol.go b/pkg/services/ngalert/accesscontrol/accesscontrol.go index 72f3663a18d..783ba69fe39 100644 --- a/pkg/services/ngalert/accesscontrol/accesscontrol.go +++ b/pkg/services/ngalert/accesscontrol/accesscontrol.go @@ -1,7 +1,7 @@ package accesscontrol import ( - "golang.org/x/net/context" + "context" "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/services/accesscontrol" diff --git a/pkg/services/ngalert/accesscontrol/rules.go b/pkg/services/ngalert/accesscontrol/rules.go index fdbd243c62a..8ef978b6385 100644 --- a/pkg/services/ngalert/accesscontrol/rules.go +++ b/pkg/services/ngalert/accesscontrol/rules.go @@ -1,11 +1,10 @@ package accesscontrol import ( + "context" "fmt" "slices" - "golang.org/x/net/context" - "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/expr" "github.com/grafana/grafana/pkg/services/accesscontrol" diff --git a/pkg/storage/legacysql/dualwrite/utils.go b/pkg/storage/legacysql/dualwrite/utils.go index 12d1877a391..4bdb7e841cf 100644 --- a/pkg/storage/legacysql/dualwrite/utils.go +++ b/pkg/storage/legacysql/dualwrite/utils.go @@ -1,7 +1,8 @@ package dualwrite import ( - "golang.org/x/net/context" + "context" + "k8s.io/apimachinery/pkg/runtime/schema" dashboard "github.com/grafana/grafana/apps/dashboard/pkg/apis/dashboard/v1beta1"