feat(kubernetes): support for kubeconfig flag and from env (#2374)

Author: emosbaugh

cmd/installer/cli/cidr.go

@@ -10,18 +10,14 @@ import (
 	"github.com/spf13/pflag"
 )
 
-func addCIDRFlags(flagSet *pflag.FlagSet) error {
-	flagSet.String("pod-cidr", k0sv1beta1.DefaultNetwork().PodCIDR, "IP address range for Pods")
-	if err := flagSet.MarkHidden("pod-cidr"); err != nil {
-		return err
-	}
-	flagSet.String("service-cidr", k0sv1beta1.DefaultNetwork().ServiceCIDR, "IP address range for Services")
-	if err := flagSet.MarkHidden("service-cidr"); err != nil {
-		return err
-	}
+func mustAddCIDRFlags(flagSet *pflag.FlagSet) {
 	flagSet.String("cidr", ecv1beta1.DefaultNetworkCIDR, "CIDR block of available private IP addresses (/16 or larger)")
 
-	return nil
+	flagSet.String("pod-cidr", k0sv1beta1.DefaultNetwork().PodCIDR, "IP address range for Pods")
+	mustMarkFlagHidden(flagSet, "pod-cidr")
+
+	flagSet.String("service-cidr", k0sv1beta1.DefaultNetwork().ServiceCIDR, "IP address range for Services")
+	mustMarkFlagHidden(flagSet, "service-cidr")
 }
 
 func validateCIDRFlags(cmd *cobra.Command) error {

cmd/installer/cli/cidr_test.go

@@ -83,7 +83,7 @@ func Test_getCIDRConfig(t *testing.T) {
 			req := require.New(t)
 
 			cmd := &cobra.Command{}
-			addCIDRFlags(cmd.Flags())
+			mustAddCIDRFlags(cmd.Flags())
 
 			test.setFlags(cmd.Flags())
 

cmd/installer/cli/flags.go

@@ -100,6 +100,20 @@ func mustSetFlagTarget(flags *pflag.FlagSet, name string, target string) {
 	}
 }
 
+func mustMarkFlagHidden(flags *pflag.FlagSet, name string) {
+	err := flags.MarkHidden(name)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func mustMarkFlagDeprecated(flags *pflag.FlagSet, name string, deprecationMessage string) {
+	err := flags.MarkDeprecated(name, deprecationMessage)
+	if err != nil {
+		panic(err)
+	}
+}
+
 func filterFlagSetByTarget(flags *pflag.FlagSet, target string) *pflag.FlagSet {
 	if flags == nil {
 		return nil