mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-16 04:06:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace golang.org/x/net/context with context package to fix linter issues.

Browse Source 
Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
This commit is contained in:
Xun Jiang
2025-12-24 14:49:10 +08:00
parent 8e35a190c2
commit 77b68121ae
40 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -44,7 +44,6 @@ require (
github.com/vmware-tanzu/crash-diagnostics v0.3.7
go.uber.org/zap v1.27.0
golang.org/x/mod v0.29.0
golang.org/x/net v0.47.0
golang.org/x/oauth2 v0.30.0
golang.org/x/text v0.31.0
google.golang.org/api v0.241.0
@@ -184,6 +183,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.45.0 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/sys v0.38.0 // indirect
golang.org/x/term v0.37.0 // indirect
hack/build-image/Dockerfile
+1 -1
View File
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM --platform=$TARGETPLATFORM golang:1.24.9-bookworm
FROM --platform=$TARGETPLATFORM golang:1.24.11-bookworm
ARG GOPROXY
pkg/plugin/framework/backup_item_action.go
+2 -1
View File
@@ -17,8 +17,9 @@ limitations under the License.
package framework
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/backup_item_action_client.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package framework
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
pkg/plugin/framework/backup_item_action_server.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package framework
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
pkg/plugin/framework/backupitemaction/v2/backup_item_action.go
+2 -1
View File
@@ -17,8 +17,9 @@ limitations under the License.
package v2
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package v2
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package v2
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/protobuf/types/known/emptypb"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
pkg/plugin/framework/delete_item_action.go
+2 -1
View File
@@ -17,8 +17,9 @@ limitations under the License.
package framework
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/delete_item_action_client.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package framework
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/delete_item_action_server.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package framework
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
pkg/plugin/framework/itemblockaction/v1/item_block_action.go
+2 -1
View File
@@ -17,8 +17,9 @@ limitations under the License.
package v1
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package v1
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package v1
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
pkg/plugin/framework/object_store.go
+2 -1
View File
@@ -17,8 +17,9 @@ limitations under the License.
package framework
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/object_store_client.go
+1 -1
View File
@@ -17,11 +17,11 @@ limitations under the License.
package framework
import (
"context"
"io"
"time"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/object_store_server.go
+1 -1
View File
@@ -17,11 +17,11 @@ limitations under the License.
package framework
import (
"context"
"io"
"time"
"github.com/pkg/errors"
"golang.org/x/net/context"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
proto "github.com/vmware-tanzu/velero/pkg/plugin/generated"
pkg/plugin/framework/plugin_lister.go
+2 -1
View File
@@ -17,9 +17,10 @@ limitations under the License.
package framework
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/restore_item_action.go
+2 -1
View File
@@ -17,8 +17,9 @@ limitations under the License.
package framework
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/restore_item_action_client.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package framework
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
pkg/plugin/framework/restore_item_action_server.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package framework
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go
+2 -1
View File
@@ -17,8 +17,9 @@ limitations under the License.
package v2
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package v2
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package v2
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/emptypb"
"google.golang.org/protobuf/types/known/timestamppb"
pkg/plugin/framework/volume_snapshotter.go
+2 -1
View File
@@ -17,8 +17,9 @@ limitations under the License.
package framework
import (
"context"
plugin "github.com/hashicorp/go-plugin"
"golang.org/x/net/context"
"google.golang.org/grpc"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/plugin/framework/volume_snapshotter_client.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package framework
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"google.golang.org/grpc"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
pkg/plugin/framework/volume_snapshotter_server.go
+1 -1
View File
@@ -17,10 +17,10 @@ limitations under the License.
package framework
import (
"context"
"encoding/json"
"github.com/pkg/errors"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/vmware-tanzu/velero/pkg/plugin/framework/common"
pkg/util/kube/periodical_enqueue_source_test.go
+1 -1
View File
@@ -17,12 +17,12 @@ limitations under the License.
package kube
import (
"context"
"testing"
"time"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
test/util/eks/eks.go
+1 -1
View File
@@ -17,12 +17,12 @@ limitations under the License.
package k8s
import (
"context"
"fmt"
"os/exec"
"strings"
"time"
"golang.org/x/net/context"
"k8s.io/apimachinery/pkg/util/wait"
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
test/util/k8s/clusterrolebinding.go
+1 -2
View File
@@ -17,12 +17,11 @@ limitations under the License.
package k8s
import (
"context"
"fmt"
"os/exec"
"strings"
"golang.org/x/net/context"
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
)
test/util/k8s/common.go
+1 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package k8s
import (
"context"
"fmt"
"os"
"os/exec"
@@ -24,7 +25,6 @@ import (
"time"
"github.com/pkg/errors"
"golang.org/x/net/context"
corev1api "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
test/util/k8s/configmap.go
+1 -1
View File
@@ -17,12 +17,12 @@ limitations under the License.
package k8s
import (
"context"
"fmt"
"time"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
corev1api "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
test/util/k8s/crd.go
+1 -1
View File
@@ -17,13 +17,13 @@ limitations under the License.
package k8s
import (
"context"
"fmt"
"os/exec"
"strings"
"time"
"github.com/pkg/errors"
"golang.org/x/net/context"
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
)
test/util/k8s/deployment.go
+1 -1
View File
@@ -17,11 +17,11 @@ limitations under the License.
package k8s
import (
"context"
"fmt"
"path"
"time"
"golang.org/x/net/context"
appsv1api "k8s.io/api/apps/v1"
corev1api "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
test/util/k8s/secret.go
+1 -1
View File
@@ -17,12 +17,12 @@ limitations under the License.
package k8s
import (
"context"
"fmt"
"time"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
corev1api "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
test/util/k8s/statefulset.go
+1 -1
View File
@@ -17,11 +17,11 @@ limitations under the License.
package k8s
import (
"context"
"fmt"
"os/exec"
"github.com/pkg/errors"
"golang.org/x/net/context"
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
)
test/util/kibishii/kibishii_utils.go
+1 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package kibishii
import (
"context"
"fmt"
"html/template"
"os"
@@ -28,7 +29,6 @@ import (
. "github.com/onsi/ginkgo/v2"
"github.com/pkg/errors"
"golang.org/x/net/context"
appsv1api "k8s.io/api/apps/v1"
corev1api "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/wait"
test/util/providers/aws_utils.go
+1 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package providers
import (
"context"
"crypto/tls"
"crypto/x509"
"fmt"
@@ -35,7 +36,6 @@ import (
"github.com/aws/aws-sdk-go-v2/service/s3"
s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/pkg/errors"
"golang.org/x/net/context"
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
"github.com/vmware-tanzu/velero/test"
test/util/providers/azure_utils.go
+1 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package providers
import (
"context"
"fmt"
"io"
"log"
@@ -36,7 +37,6 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container"
"github.com/joho/godotenv"
"github.com/pkg/errors"
"golang.org/x/net/context"
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
. "github.com/vmware-tanzu/velero/test"
test/util/providers/gcloud_utils.go
+1 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package providers
import (
"context"
"encoding/json"
"fmt"
"io"
@@ -25,7 +26,6 @@ import (
"cloud.google.com/go/storage"
"github.com/pkg/errors"
"golang.org/x/net/context"
"golang.org/x/oauth2/google"
"google.golang.org/api/compute/v1"
"google.golang.org/api/iterator"