Resolve conflicts

Signed-off-by: Md. Ishtiaq Islam <[email protected]>
kubestash · Jan 1, 2024 · 34c6f94 · 34c6f94
1 parent fb89896
commit 34c6f94
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 67 deletions.
diff --git a/pkg/clone.go b/pkg/clone.go
@@ -31,14 +31,7 @@ func NewCmdClone(clientGetter genericclioptions.RESTClientGetter) *cobra.Command
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			flags.EnsureRequiredFlags(cmd, "to-namespace")
 
-<<<<<<< HEAD
-			cfg, err := clientGetter.ToRESTConfig()
-			if err != nil {
-				return fmt.Errorf("failed to read kubeconfig. Reason: %v", err)
-			}
-=======
 			var err error
->>>>>>> f5312de (Update uncached client + Add session list in trigger backup)
 
 			srcNamespace, _, err = clientGetter.ToRawKubeConfigLoader().Namespace()
 			if err != nil {

diff --git a/pkg/copy.go b/pkg/copy.go
@@ -32,14 +32,7 @@ func NewCmdCopy(clientGetter genericclioptions.RESTClientGetter) *cobra.Command
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			flags.EnsureRequiredFlags(cmd, "to-namespace")
 
-<<<<<<< HEAD
-			cfg, err := clientGetter.ToRESTConfig()
-			if err != nil {
-				return fmt.Errorf("failed to read kubeconfig. Reason: %v", err)
-			}
-=======
 			var err error
->>>>>>> f5312de (Update uncached client + Add session list in trigger backup)
 
 			srcNamespace, _, err = clientGetter.ToRawKubeConfigLoader().Namespace()
 			if err != nil {

diff --git a/pkg/debug.go b/pkg/debug.go
@@ -28,14 +28,7 @@ func NewCmdDebug(clientGetter genericclioptions.RESTClientGetter) *cobra.Command
 		Short:             `Debug common KubeStash issues`,
 		DisableAutoGenTag: true,
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-<<<<<<< HEAD
-			cfg, err := clientGetter.ToRESTConfig()
-			if err != nil {
-				return fmt.Errorf("failed to read kubeconfig. Reason: %v", err)
-			}
-=======
 			var err error
->>>>>>> f5312de (Update uncached client + Add session list in trigger backup)
 
 			srcNamespace, _, err = clientGetter.ToRawKubeConfigLoader().Namespace()
 			if err != nil {

diff --git a/pkg/pause.go b/pkg/pause.go
@@ -33,14 +33,7 @@ func NewCmdPause(clientGetter genericclioptions.RESTClientGetter) *cobra.Command
 		RunE: func(cmd *cobra.Command, args []string) error {
 			backupConfigName := args[0]
 
-<<<<<<< HEAD
-			cfg, err := clientGetter.ToRESTConfig()
-			if err != nil {
-				return fmt.Errorf("failed to read kubeconfig. Reason: %v", err)
-			}
-=======
 			var err error
->>>>>>> f5312de (Update uncached client + Add session list in trigger backup)
 
 			srcNamespace, _, err = clientGetter.ToRawKubeConfigLoader().Namespace()
 			if err != nil {

diff --git a/pkg/resume.go b/pkg/resume.go
@@ -33,14 +33,7 @@ func NewCmdResume(clientGetter genericclioptions.RESTClientGetter) *cobra.Comman
 		RunE: func(cmd *cobra.Command, args []string) error {
 			backupConfigName := args[0]
 
-<<<<<<< HEAD
-			cfg, err := clientGetter.ToRESTConfig()
-			if err != nil {
-				return fmt.Errorf("failed to read kubeconfig. Reason: %v", err)
-			}
-=======
 			var err error
->>>>>>> f5312de (Update uncached client + Add session list in trigger backup)
 
 			srcNamespace, _, err = clientGetter.ToRawKubeConfigLoader().Namespace()
 			if err != nil {

diff --git a/pkg/trigger.go b/pkg/trigger.go
@@ -45,14 +45,7 @@ func NewCmdTriggerBackup(clientGetter genericclioptions.RESTClientGetter) *cobra
 		RunE: func(cmd *cobra.Command, args []string) error {
 			backupConfigName := args[0]
 
-<<<<<<< HEAD
-			cfg, err := clientGetter.ToRESTConfig()
-			if err != nil {
-				return fmt.Errorf("failed to read kubeconfig. Reason: %v", err)
-			}
-=======
 			var err error
->>>>>>> f5312de (Update uncached client + Add session list in trigger backup)
 
 			klient, err = pkg.NewUncachedClient()
 			if err != nil {

diff --git a/pkg/util.go b/pkg/util.go
@@ -60,31 +60,6 @@ func init() {
 	imgRestic.Tag = ResticTag
 }
 
-<<<<<<< HEAD
-func newRuntimeClient(config *restclient.Config) (client.Client, error) {
-	scheme := runtime.NewScheme()
-	utilruntime.Must(coreapi.AddToScheme(scheme))
-	utilruntime.Must(storageapi.AddToScheme(scheme))
-	utilruntime.Must(core.AddToScheme(scheme))
-	utilruntime.Must(vsapi.AddToScheme(scheme))
-
-	hc, err := rest.HTTPClientFor(config)
-	if err != nil {
-		return nil, err
-	}
-	mapper, err := apiutil.NewDynamicRESTMapper(config, hc)
-	if err != nil {
-		return nil, err
-	}
-
-	return client.New(config, client.Options{
-		Scheme: scheme,
-		Mapper: mapper,
-	})
-}
-
-=======
->>>>>>> f5312de (Update uncached client + Add session list in trigger backup)
 func getSecret(ref kmapi.ObjectReference) (*core.Secret, error) {
 	secret := &core.Secret{
 		ObjectMeta: metav1.ObjectMeta{