Revise flag names.

Author: tamalsaha

cmds/check.go

@@ -13,15 +13,15 @@ func newCheckCmd() *cobra.Command {
 		Short: "Validate kloader configuration",
 		Run: func(cmd *cobra.Command, args []string) {
 			if configMap != "" {
-				mounter := controller.NewConfigMapMounter(getRestConfig(), configMap, mountDir, bashFile)
+				mounter := controller.NewConfigMapMounter(getRestConfig(), configMap, mountDir, bashFile, resyncPeriod)
 				obj, err := mounter.KubeClient.CoreV1().ConfigMaps(mounter.Source.Namespace).
 					Get(mounter.Source.Name, metav1.GetOptions{})
 				if err != nil {
 					log.Fatalln("Failed to get ConfigMap, Cause", err)
 				}
 				mounter.Mount(obj)
 			} else if secret != "" {
-				mounter := controller.NewSecretMounter(getRestConfig(), secret, mountDir, bashFile)
+				mounter := controller.NewSecretMounter(getRestConfig(), secret, mountDir, bashFile, resyncPeriod)
 				obj, err := mounter.KubeClient.CoreV1().Secrets(mounter.Source.Namespace).
 					Get(mounter.Source.Name, metav1.GetOptions{})
 				if err != nil {

cmds/run.go

@@ -15,10 +15,10 @@ func newRunCmd() *cobra.Command {
 		Short: "Run and hold kloader",
 		Run: func(cmd *cobra.Command, args []string) {
 			if configMap != "" {
-				mounter := controller.NewConfigMapMounter(getRestConfig(), configMap, mountDir, bashFile)
+				mounter := controller.NewConfigMapMounter(getRestConfig(), configMap, mountDir, bashFile, resyncPeriod)
 				mounter.Run()
 			} else if secret != "" {
-				mounter := controller.NewSecretMounter(getRestConfig(), secret, mountDir, bashFile)
+				mounter := controller.NewSecretMounter(getRestConfig(), secret, mountDir, bashFile, resyncPeriod)
 				mounter.Run()
 			}
 			hold.Hold()
@@ -41,7 +41,7 @@ func getRestConfig() *rest.Config {
 		log.Fatalln("MountDir is required, but not provided")
 	}
 
-	config, err := clientcmd.BuildConfigFromFlags(kubeMaster, kubeConfig)
+	config, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
 	if err != nil {
 		log.Fatalln("Failed to create KubeConfig")
 	}

cmds/util.go

@@ -1,18 +1,23 @@
 package cmds
 
 import (
+	"time"
+
 	"github.com/spf13/cobra"
 )
 
 var (
-	configMap, secret, mountDir, bashFile, kubeMaster, kubeConfig string
+	configMap, secret, mountDir, bashFile string
+	masterURL, kubeconfigPath             string
+	resyncPeriod                          time.Duration = 5 * time.Minute
 )
 
 func addFlags(cmd *cobra.Command) {
-	cmd.PersistentFlags().StringVarP(&configMap, "config-map", "c", "", "Configmap name that needs to be mount")
-	cmd.PersistentFlags().StringVarP(&secret, "secret", "s", "", "Secret name that needs to be mount")
-	cmd.PersistentFlags().StringVarP(&mountDir, "mount-location", "m", "", "Volume location where the file will be mounted")
-	cmd.PersistentFlags().StringVarP(&bashFile, "boot-cmd", "b", "", "Bash script that will be run on every change of the file")
-	cmd.PersistentFlags().StringVar(&kubeMaster, "k8s-master", "", "The address of the Kubernetes API server (overrides any value in kubeconfig)")
-	cmd.PersistentFlags().StringVar(&kubeConfig, "k8s-config", "", "Path to kubeconfig file with authorization information (the master location is set by the master flag).")
+	cmd.Flags().StringVarP(&configMap, "configmap", "c", "", "Configmap name that needs to be mount")
+	cmd.Flags().StringVarP(&secret, "secret", "s", "", "Secret name that needs to be mount")
+	cmd.Flags().StringVarP(&mountDir, "mount-location", "m", "", "Volume location where the file will be mounted")
+	cmd.Flags().StringVarP(&bashFile, "boot-cmd", "b", "", "Bash script that will be run on every change of the file")
+	cmd.Flags().StringVar(&masterURL, "master", masterURL, "The address of the Kubernetes API server (overrides any value in kubeconfig)")
+	cmd.Flags().StringVar(&kubeconfigPath, "kubeconfig", kubeconfigPath, "Path to kubeconfig file with authorization information (the master location is set by the master flag).")
+	cmd.Flags().DurationVar(&resyncPeriod, "resync-period", resyncPeriod, "If non-zero, will re-list this often. Otherwise, re-list will be delayed aslong as possible (until the upstream source closes the watch or times out.")
 }

controller/mount_configmap.go

@@ -34,7 +34,7 @@ type configMapMounter struct {
 	informer cache.SharedIndexInformer
 }
 
-func NewConfigMapMounter(kubeConfig *rest.Config, configMap, mountDir, cmd string) *configMapMounter {
+func NewConfigMapMounter(kubeConfig *rest.Config, configMap, mountDir, cmd string, resyncPeriod time.Duration) *configMapMounter {
 	configMapParts := strings.SplitN(strings.TrimSpace(configMap), ".", 2)
 	source := &apiv1.ObjectReference{
 		Name: configMapParts[0],
@@ -62,7 +62,7 @@ func NewConfigMapMounter(kubeConfig *rest.Config, configMap, mountDir, cmd strin
 			},
 		},
 		&apiv1.ConfigMap{},
-		time.Minute*5,
+		resyncPeriod,
 		cache.Indexers{},
 	)
 

controller/mount_secret.go

@@ -32,7 +32,7 @@ type secretMounter struct {
 	informer cache.SharedIndexInformer
 }
 
-func NewSecretMounter(kubeConfig *rest.Config, secret, mountDir, cmd string) *secretMounter {
+func NewSecretMounter(kubeConfig *rest.Config, secret, mountDir, cmd string, resyncPeriod time.Duration) *secretMounter {
 	secretParts := strings.SplitN(strings.TrimSpace(secret), ".", 2)
 	source := &apiv1.ObjectReference{
 		Name: secretParts[0],
@@ -60,7 +60,7 @@ func NewSecretMounter(kubeConfig *rest.Config, secret, mountDir, cmd string) *se
 			},
 		},
 		&apiv1.Secret{},
-		time.Minute*5,
+		resyncPeriod,
 		cache.Indexers{},
 	)
 

docs/reference/kloader_check.md

@@ -14,13 +14,14 @@ kloader check [flags]
 ### Options
 
 ```
-  -b, --boot-cmd string         Bash script that will be run on every change of the file
-  -c, --config-map string       Configmap name that needs to be mount
-  -h, --help                    help for check
-      --k8s-config string       Path to kubeconfig file with authorization information (the master location is set by the master flag).
-      --k8s-master string       The address of the Kubernetes API server (overrides any value in kubeconfig)
-  -m, --mount-location string   Volume location where the file will be mounted
-  -s, --secret string           Secret name that needs to be mount
+  -b, --boot-cmd string          Bash script that will be run on every change of the file
+  -c, --configmap string         Configmap name that needs to be mount
+  -h, --help                     help for check
+      --kubeconfig string        Path to kubeconfig file with authorization information (the master location is set by the master flag).
+      --master string            The address of the Kubernetes API server (overrides any value in kubeconfig)
+  -m, --mount-location string    Volume location where the file will be mounted
+      --resync-period duration   If non-zero, will re-list this often. Otherwise, re-list will be delayed aslong as possible (until the upstream source closes the watch or times out. (default 5m0s)
+  -s, --secret string            Secret name that needs to be mount
 ```
 
 ### Options inherited from parent commands

docs/reference/kloader_run.md

@@ -14,13 +14,14 @@ kloader run [flags]
 ### Options
 
 ```
-  -b, --boot-cmd string         Bash script that will be run on every change of the file
-  -c, --config-map string       Configmap name that needs to be mount
-  -h, --help                    help for run
-      --k8s-config string       Path to kubeconfig file with authorization information (the master location is set by the master flag).
-      --k8s-master string       The address of the Kubernetes API server (overrides any value in kubeconfig)
-  -m, --mount-location string   Volume location where the file will be mounted
-  -s, --secret string           Secret name that needs to be mount
+  -b, --boot-cmd string          Bash script that will be run on every change of the file
+  -c, --configmap string         Configmap name that needs to be mount
+  -h, --help                     help for run
+      --kubeconfig string        Path to kubeconfig file with authorization information (the master location is set by the master flag).
+      --master string            The address of the Kubernetes API server (overrides any value in kubeconfig)
+  -m, --mount-location string    Volume location where the file will be mounted
+      --resync-period duration   If non-zero, will re-list this often. Otherwise, re-list will be delayed aslong as possible (until the upstream source closes the watch or times out. (default 5m0s)
+  -s, --secret string            Secret name that needs to be mount
 ```
 
 ### Options inherited from parent commands