Use k8s 1.34 client libs

/cherry-pick

Signed-off-by: Tamal Saha <[email protected]>

Author: tamalsaha

Makefile

@@ -46,7 +46,7 @@ else
 	endif
 endif
 
-RESTIC_VER       := 0.17.3
+RESTIC_VER       := 0.18.1
 
 ###
 ### These variables should not need tweaking.

go.mod

@@ -70,7 +70,7 @@ type BackupSessionController struct {
 	InvokerName string
 	Namespace   string
 	// Backup Session
-	bsQueue    *queue.Worker
+	bsQueue    *queue.Worker[any]
 	bsInformer cache.SharedIndexInformer
 	bsLister   v1beta1.BackupSessionLister
 
@@ -134,7 +134,7 @@ func (c *BackupSessionController) runBackupSessionController(invokerRef *core.Ob
 
 func (c *BackupSessionController) initBackupSessionWatcher() error {
 	c.bsInformer = c.StashInformerFactory.Stash().V1beta1().BackupSessions().Informer()
-	c.bsQueue = queue.New(api_v1beta1.ResourceKindBackupSession, c.MaxNumRequeues, c.NumThreads, c.processBackupSession)
+	c.bsQueue = queue.New[any](api_v1beta1.ResourceKindBackupSession, c.MaxNumRequeues, c.NumThreads, c.processBackupSession)
 	_, _ = c.bsInformer.AddEventHandler(queue.NewFilteredHandler(cache.ResourceEventHandlerFuncs{
 		AddFunc: func(obj any) {
 			if backupsession, ok := obj.(*api_v1beta1.BackupSession); ok && c.selectedByLabels(backupsession) {
@@ -164,7 +164,8 @@ func (c *BackupSessionController) initBackupSessionWatcher() error {
 // syncToStdout is the business logic of the controller. In this controller it simply prints
 // information about the deployment to stdout. In case an error happened, it has to simply return the error.
 // The retry logic should not be part of the business logic.
-func (c *BackupSessionController) processBackupSession(key string) error {
+func (c *BackupSessionController) processBackupSession(v any) error {
+	key := v.(string)
 	obj, exists, err := c.bsInformer.GetIndexer().GetByKey(key)
 	if err != nil {
 		klog.Errorf("Fetching object with key %s from store failed with %v", key, err)

go.sum

@@ -31,8 +31,8 @@ import (
 	"stash.appscode.dev/stash/pkg/status"
 	"stash.appscode.dev/stash/pkg/volumesnapshot"
 
-	vsapi "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
-	vscs "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned"
+	vsapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
+	vscs "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned"
 	"github.com/spf13/cobra"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"

pkg/backup/backupsession.go

@@ -31,7 +31,7 @@ import (
 	"stash.appscode.dev/stash/pkg/status"
 	"stash.appscode.dev/stash/pkg/util"
 
-	vscs "github.com/kubernetes-csi/external-snapshotter/client/v7/clientset/versioned"
+	vscs "github.com/kubernetes-csi/external-snapshotter/client/v8/clientset/versioned"
 	"github.com/spf13/cobra"
 	"gomodules.xyz/pointer"
 	core "k8s.io/api/core/v1"

pkg/cmds/create_volumesnapshot.go

@@ -45,8 +45,8 @@ func NewRootCmd() *cobra.Command {
 	}
 
 	rootCmd.AddCommand(v.NewCmdVersion())
-	stopCh := genericapiserver.SetupSignalHandler()
-	rootCmd.AddCommand(NewCmdRun(os.Stdout, os.Stderr, stopCh))
+	ctx := genericapiserver.SetupSignalContext()
+	rootCmd.AddCommand(NewCmdRun(ctx, os.Stdout, os.Stderr))
 
 	rootCmd.AddCommand(NewCmdSnapshots())
 	rootCmd.AddCommand(NewCmdForget())

pkg/cmds/restore_volumesnapshot.go

@@ -17,6 +17,7 @@ limitations under the License.
 package cmds
 
 import (
+	"context"
 	"io"
 
 	"stash.appscode.dev/stash/pkg/cmds/server"
@@ -26,7 +27,7 @@ import (
 	"k8s.io/klog/v2"
 )
 
-func NewCmdRun(out, errOut io.Writer, stopCh <-chan struct{}) *cobra.Command {
+func NewCmdRun(ctx context.Context, out, errOut io.Writer) *cobra.Command {
 	o := server.NewStashOptions(out, errOut)
 
 	cmd := &cobra.Command{
@@ -43,7 +44,7 @@ func NewCmdRun(out, errOut io.Writer, stopCh <-chan struct{}) *cobra.Command {
 			if err := o.Validate(args); err != nil {
 				return err
 			}
-			if err := o.Run(stopCh); err != nil {
+			if err := o.Run(ctx); err != nil {
 				return err
 			}
 			return nil

pkg/cmds/root.go

@@ -17,6 +17,7 @@ limitations under the License.
 package server
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"net"
@@ -30,10 +31,9 @@ import (
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	openapinamer "k8s.io/apiserver/pkg/endpoints/openapi"
-	"k8s.io/apiserver/pkg/features"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	genericoptions "k8s.io/apiserver/pkg/server/options"
-	"k8s.io/apiserver/pkg/util/feature"
+	basecompatibility "k8s.io/component-base/compatibility"
 	"kmodules.xyz/client-go/tools/clientcmd"
 )
 
@@ -48,7 +48,6 @@ type StashOptions struct {
 }
 
 func NewStashOptions(out, errOut io.Writer) *StashOptions {
-	_ = feature.DefaultMutableFeatureGate.Set(fmt.Sprintf("%s=false", features.APIPriorityAndFairness))
 	o := &StashOptions{
 		// TODO we will nil out the etcd storage options.  This requires a later level of k8s.io/apiserver
 		RecommendedOptions: genericoptions.NewRecommendedOptions(
@@ -109,6 +108,8 @@ func (o StashOptions) Config() (*server.StashConfig, error) {
 		"/apis/admission.stash.appscode.com/v1beta1/backupconfigurationvalidators",
 	}
 
+	serverConfig.EffectiveVersion = basecompatibility.NewEffectiveVersionFromString("v1.0.0", "", "")
+
 	serverConfig.OpenAPIConfig = genericapiserver.DefaultOpenAPIConfig(v1alpha1.GetOpenAPIDefinitions, openapinamer.NewDefinitionNamer(server.Scheme))
 	serverConfig.OpenAPIConfig.Info.Title = "stash-webhook-server"
 	serverConfig.OpenAPIConfig.Info.Version = v1alpha1.SchemeGroupVersion.Version
@@ -131,7 +132,7 @@ func (o StashOptions) Config() (*server.StashConfig, error) {
 	return config, nil
 }
 
-func (o StashOptions) Run(stopCh <-chan struct{}) error {
+func (o StashOptions) Run(ctx context.Context) error {
 	config, err := o.Config()
 	if err != nil {
 		return err
@@ -144,7 +145,7 @@ func (o StashOptions) Run(stopCh <-chan struct{}) error {
 
 	// Start periodic license verification
 	//nolint:errcheck
-	go licenseEnforcer.VerifyLicensePeriodically(config.ExtraConfig.ClientConfig, o.ExtraOptions.LicenseFile, stopCh)
+	go licenseEnforcer.VerifyLicensePeriodically(config.ExtraConfig.ClientConfig, o.ExtraOptions.LicenseFile, ctx.Done())
 
-	return s.Run(stopCh)
+	return s.Run(ctx)
 }

pkg/cmds/run.go

@@ -112,7 +112,7 @@ func (c *StashController) validateBackupConfiguration(bc *api_v1beta1.BackupConf
 
 func (c *StashController) initBackupConfigurationWatcher() {
 	c.bcInformer = c.stashInformerFactory.Stash().V1beta1().BackupConfigurations().Informer()
-	c.bcQueue = queue.New(api_v1beta1.ResourceKindBackupConfiguration, c.MaxNumRequeues, c.NumThreads, c.runBackupConfigurationProcessor)
+	c.bcQueue = queue.New[any](api_v1beta1.ResourceKindBackupConfiguration, c.MaxNumRequeues, c.NumThreads, c.runBackupConfigurationProcessor)
 	if c.auditor != nil {
 		c.auditor.ForGVK(c.bcInformer, api_v1beta1.SchemeGroupVersion.WithKind(api_v1beta1.ResourceKindBackupConfiguration))
 	}
@@ -130,7 +130,8 @@ func (c *StashController) initBackupConfigurationWatcher() {
 // syncToStdout is the business logic of the controller. In this controller it simply prints
 // information about the deployment to stdout. In case an error happened, it has to simply return the error.
 // The retry logic should not be part of the business logic.
-func (c *StashController) runBackupConfigurationProcessor(key string) error {
+func (c *StashController) runBackupConfigurationProcessor(v any) error {
+	key := v.(string)
 	obj, exists, err := c.bcInformer.GetIndexer().GetByKey(key)
 	if err != nil {
 		klog.ErrorS(err, "Failed to fetch object from indexer",