Add back --disable-taint, default hostame for nodename (#87)

* Add back --disable-taint, default `hostame` for nodename Add back --disable-taint that disables the node taint. And fix --nodenam to default to hostname, to prevent everything being 'systemk' Signed-off-by: Miek Gieben <[email protected]> * Update cmd/flag.go * Update cmd/flag.go * Update cmd/flag.go
virtual-kubelet · Feb 2, 2021 · 61192e6 · 61192e6
1 parent 7ef2a3c
commit 61192e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/cmd/flag.go b/cmd/flag.go
@@ -33,7 +33,7 @@ var log = vklogv2.New(nil)
 func installFlags(flags *pflag.FlagSet, c *provider.Opts) {
 	flags.StringVar(&c.KubeConfigPath, "kubeconfig", "", "cluster client configuration")
 	flags.StringVar(&c.KubeClusterDomain, "cluster-domain", provider.DefaultKubeClusterDomain, "cluster domain")
-	flags.StringVar(&c.NodeName, "nodename", "systemk", "value to be set as the Node name and label node.k8s.io/hostname")
+	flags.StringVar(&c.NodeName, "nodename", "", "value to be set as the Node name and label node.k8s.io/hostname")
 	flags.StringVar(&c.ListenAddress, "addr", provider.DefaultListenAddr, "address to bind for serving requests from the Kubernetes API server")
 	flags.StringVar(&c.MetricsAddr, "metrics-addr", provider.DefaultMetricsAddr, "address to listen for metrics/stats requests")
 	flags.IntVar(&c.PodSyncWorkers, "pod-sync-workers", provider.DefaultPodSyncWorkers, `number of pod synchronization workers`)
@@ -48,6 +48,7 @@ func installFlags(flags *pflag.FlagSet, c *provider.Opts) {
 	flags.IPVar(&c.NodeExternalIP, "external-ip", net.IPv4zero, "IP address to advertise as Node ExternalIP, 0.0.0.0 means auto-detect")
 	flags.StringSliceVarP(&c.AllowedHostPaths, "dir", "d", provider.DefaultAllowedPaths, "only allow mounts below these directories")
 	flags.BoolVarP(&c.UserMode, "user", "u", false, "rely on the user's systemd")
+	flags.BoolVarP(&c.DisableTaint, "disable-taint", "", false, "disable the node taint")
 
 	// Since klog is the logger implementation, install its flags.
 	// But prepend "klog." to the flag name for clear separation.

diff --git a/internal/provider/node.go b/internal/provider/node.go
@@ -29,6 +29,16 @@ func (p *p) ConfigureNode(ctx context.Context, opts *Opts) (*v1.Node, error) {
 	}
 
 	machineID, _ := util.GetMachineID()
+	taints := []v1.Taint{}
+	if !opts.DisableTaint {
+		taints = []v1.Taint{
+			{
+				Key:    DefaultTaintKey,
+				Value:  DefaultTaintValue,
+				Effect: corev1.TaintEffectNoSchedule,
+			},
+		}
+	}
 
 	return &v1.Node{
 		ObjectMeta: metav1.ObjectMeta{
@@ -41,13 +51,7 @@ func (p *p) ConfigureNode(ctx context.Context, opts *Opts) (*v1.Node, error) {
 			},
 		},
 		Spec: v1.NodeSpec{
-			Taints: []v1.Taint{
-				{
-					Key:    DefaultTaintKey,
-					Value:  DefaultTaintValue,
-					Effect: corev1.TaintEffectNoSchedule,
-				},
-			},
+			Taints: taints,
 		},
 		Status: v1.NodeStatus{
 			Addresses:   nodeAddresses,