mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-03 11:45:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update k8s.io dependencies to 0.24.0

Browse Source 
* This also required an update to use github.com/bombsimon/logrusr/v3
* 'WithClusterName' removed as per the k8s doc reasoning:
* https://github.com/kubernetes/apimachinery/blob/release-1.24/pkg/apis/meta/v1/types.go\#L257-L259
* ('ClusterName was a legacy field that was always cleared by the system and never used')
* Test was updated accordingly

Signed-off-by: Kira Boyle <kira@replicated.com>
This commit is contained in:
Kira Boyle
2022-06-15 14:38:57 -07:00
committed by Wenkai Yin(尹文开)
parent 11a7c796eb
commit b146a880c6
6 changed files with 174 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cmd/server/server.go
View File

@@ -27,9 +27,7 @@ import (
"strings"
"time"
"github.com/vmware-tanzu/velero/pkg/uploader"
"github.com/bombsimon/logrusr"
logrusr "github.com/bombsimon/logrusr/v3"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/sirupsen/logrus"
@@ -47,6 +45,8 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"github.com/vmware-tanzu/velero/pkg/uploader"
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
snapshotv1client "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned"
snapshotv1informers "github.com/kubernetes-csi/external-snapshotter/client/v4/informers/externalversions"
@@ -326,7 +326,7 @@ func newServer(f client.Factory, config serverConfig, logger *logrus.Logger) (*s
corev1api.AddToScheme(scheme)
snapshotv1api.AddToScheme(scheme)
ctrl.SetLogger(logrusr.NewLogger(logger))
ctrl.SetLogger(logrusr.New(logger))
mgr, err := ctrl.NewManager(clientConfig, ctrl.Options{
Scheme: scheme,