fix setting images using env variables (#137)

* fix setting images using env variables

* Set vars via viper (environment)

Co-authored-by: Robert Bost <[email protected]>

Author: bwilczynski

README.md

@@ -68,7 +68,7 @@ To compile a static tcpdump binary:
     REMOTE_TCPDUMP_FILE: Optional. if specified, ksniff will use the specified path as the remote path to upload static tcpdump to.
 
 #### Air gapped environments
-Use `--image` and `--tcpdump-image` flags to override the default container images and use your own e.g (docker):
+Use `--image` and `--tcpdump-image` flags (or KUBECTL_PLUGINS_LOCAL_FLAG_IMAGE and KUBECTL_PLUGINS_LOCAL_FLAG_TCPDUMP_IMAGE environment variables) to override the default container images and use your own e.g (docker):
 
     kubectl plugin sniff <POD_NAME> [-n <NAMESPACE_NAME>] [-c <CONTAINER_NAME>] --image <PRIVATE_REPO>/docker --tcpdump-image <PRIVATE_REPO>/tcpdump
 

pkg/cmd/sniff.go

@@ -171,9 +171,13 @@ func (o *Ksniff) Complete(cmd *cobra.Command, args []string) error {
 	o.settings.UserSpecifiedVerboseMode = viper.GetBool("verbose")
 	o.settings.UserSpecifiedPrivilegedMode = viper.GetBool("privileged")
 	o.settings.UserSpecifiedKubeContext = viper.GetString("context")
-	o.settings.UseDefaultImage = !cmd.Flag("image").Changed
-	o.settings.UseDefaultTCPDumpImage = !cmd.Flag("tcpdump-image").Changed
-	o.settings.UseDefaultSocketPath = !cmd.Flag("socket").Changed
+	o.settings.Image = viper.GetString("image")
+	o.settings.TCPDumpImage = viper.GetString("tcpdump-image")
+	o.settings.SocketPath = viper.GetString("socket")
+
+	o.settings.UseDefaultImage = !viper.IsSet("image")
+	o.settings.UseDefaultTCPDumpImage = !viper.IsSet("tcpdump-image")
+	o.settings.UseDefaultSocketPath = !viper.IsSet("socket")
 
 	var err error