Remove the obsolete namespacenattingtable API

liqotech · Jul 29, 2021 · e9e0055 · e9e0055
1 parent 9c56586
commit e9e0055
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 258 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -96,7 +96,7 @@ linters:
   # - testpackage
     - typecheck
     - unconvert
-  # - unparam
+    - unparam
     - unused
     - varcheck
     - whitespace

diff --git a/apis/virtualKubelet/v1alpha1/namespaceNattingTableClient.go b/apis/virtualKubelet/v1alpha1/namespaceNattingTableClient.go
diff --git a/apis/virtualKubelet/v1alpha1/namespacenattingtable_types.go b/apis/virtualKubelet/v1alpha1/namespacenattingtable_types.go
diff --git a/apis/virtualKubelet/v1alpha1/zz_generated.deepcopy.go b/apis/virtualKubelet/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/virtual-kubelet/register.go b/cmd/virtual-kubelet/register.go
@@ -17,7 +17,6 @@ func registerKubernetes(ctx context.Context, s *provider.Store) error {
 			cfg.InternalIP,
 			cfg.DaemonPort,
 			cfg.HomeKubeConfig,
-			cfg.RemoteKubeConfig,
 			cfg.InformerResyncPeriod,
 			cfg.LiqoIpamServer,
 		)

diff --git a/cmd/virtual-kubelet/root/flag.go b/cmd/virtual-kubelet/root/flag.go
@@ -26,7 +26,6 @@ func InstallFlags(flags *pflag.FlagSet, c *Opts) {
 	flags.StringVar(&c.KubeClusterDomain, "cluster-domain", c.KubeClusterDomain, "kubernetes cluster-domain (default is 'cluster.local')")
 	flags.StringVar(&c.NodeName, "nodename", c.NodeName, "kubernetes node name")
 	flags.StringVar(&c.Provider, "provider", c.Provider, "cloud provider")
-	flags.StringVar(&c.ForeignKubeconfig, "foreign-kubeconfig", c.ForeignKubeconfig, "cloud provider kubeconfig")
 	flags.StringVar(&c.MetricsAddr, "metrics-addr", c.MetricsAddr, "address to listen for metrics/stats requests")
 
 	flags.IntVar(&c.PodSyncWorkers, "pod-sync-workers", c.PodSyncWorkers, `set the number of pod synchronization workers`)

diff --git a/cmd/virtual-kubelet/root/opts.go b/cmd/virtual-kubelet/root/opts.go
@@ -56,8 +56,7 @@ type Opts struct {
 
 	Provider string
 
-	HomeKubeconfig    string
-	ForeignKubeconfig string
+	HomeKubeconfig string
 
 	MetricsAddr string
 

diff --git a/cmd/virtual-kubelet/root/root.go b/cmd/virtual-kubelet/root/root.go
@@ -68,10 +68,6 @@ func runRootCommand(ctx context.Context, s *provider.Store, c *Opts) error {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	if c.ForeignKubeconfig == "" {
-		return errors.New("provider kubeconfig is mandatory")
-	}
-
 	if c.ForeignClusterID == "" {
 		return errors.New("cluster id is mandatory")
 	}
@@ -128,7 +124,6 @@ func runRootCommand(ctx context.Context, s *provider.Store, c *Opts) error {
 		KubeClusterDomain:    c.KubeClusterDomain,
 		RemoteClusterID:      c.ForeignClusterID,
 		HomeClusterID:        c.HomeClusterID,
-		RemoteKubeConfig:     c.ForeignKubeconfig,
 		InformerResyncPeriod: c.InformerResyncPeriod,
 		LiqoIpamServer:       c.LiqoIpamServer,
 	}

diff --git a/pkg/virtualKubelet/provider/pods.go b/pkg/virtualKubelet/provider/pods.go
@@ -64,7 +64,7 @@ func (p *LiqoProvider) CreatePod(ctx context.Context, homePod *corev1.Pod) error
 		`{"metadata":{"labels":{"%s":"%s"},"finalizers":["%s"]}}`,
 		liqoconst.LocalPodLabelKey, liqoconst.LocalPodLabelValue, virtualKubelet.HomePodFinalizer))
 
-	_, err = p.nntClient.Client().CoreV1().Pods(homePod.Namespace).Patch(context.TODO(),
+	_, err = p.homeClient.CoreV1().Pods(homePod.Namespace).Patch(context.TODO(),
 		homePod.Name,
 		types.StrategicMergePatchType,
 		homePodPatch,
@@ -249,7 +249,7 @@ func (p *LiqoProvider) RunInContainer(ctx context.Context, homeNamespace, homePo
 			TTY:       true,
 		}, scheme.ParameterCodec)
 
-	exec, err := remotecommandclient.NewSPDYExecutor(p.restConfig, "POST", req.URL())
+	exec, err := remotecommandclient.NewSPDYExecutor(p.foreignRestConfig, "POST", req.URL())
 	if err != nil {
 		return fmt.Errorf("could not make remote command: %v", err)
 	}