flags(ingress): enable ingressv1, flip flag semantics

As requested in review [1]

[1] Kong#826 (comment)

Author: mflendrich

cli/ingress-controller/flag_test.go

@@ -133,9 +133,6 @@ func TestDefaults(t *testing.T) {
 		LogLevel:  "info",
 		LogFormat: "text",
 
-		AllowIngressExtensionsV1beta1: true,
-		AllowIngressNetworkingV1beta1: true,
-
 		EnableProfiling: true,
 
 		ShowVersion:      false,
@@ -185,9 +182,9 @@ func TestOverrideViaCLIFlags(t *testing.T) {
 		"--apiserver-host", "kube-apiserver.internal",
 		"--kubeconfig", "/path/to/kubeconfig",
 
-		"--allow-ingress-extensionsv1beta1=false",
-		"--allow-ingress-networkingv1beta1=false",
-		"--allow-ingress-networkingv1=true",
+		"--disable-ingress-extensionsv1beta1",
+		"--disable-ingress-networkingv1beta1",
+		"--disable-ingress-networkingv1",
 
 		"--log-format", "json",
 
@@ -228,7 +225,9 @@ func TestOverrideViaCLIFlags(t *testing.T) {
 		APIServerHost:      "kube-apiserver.internal",
 		KubeConfigFilePath: "/path/to/kubeconfig",
 
-		AllowIngressNetworkingV1: true,
+		DisableIngressNetworkingV1:      true,
+		DisableIngressNetworkingV1beta1: true,
+		DisableIngressExtensionsV1beta1: true,
 
 		LogLevel:  "info",
 		LogFormat: "json",
@@ -261,9 +260,9 @@ func TestOverrideViaEnvVars(t *testing.T) {
 
 		"CONTROLLER_KONG_CUSTOM_ENTITIES_SECRET": "foons/barsecretname",
 
-		"CONTROLLER_ALLOW_INGRESS_EXTENSIONSV1BETA1": "false",
-		"CONTROLLER_ALLOW_INGRESS_NETWORKINGV1BETA1": "false",
-		"CONTROLLER_ALLOW_INGRESS_NETWORKINGV1":      "true",
+		"CONTROLLER_DISABLE_INGRESS_EXTENSIONSV1BETA1": "true",
+		"CONTROLLER_DISABLE_INGRESS_NETWORKINGV1BETA1": "true",
+		"CONTROLLER_DISABLE_INGRESS_NETWORKINGV1":      "true",
 	}
 	for k, v := range envs {
 		os.Setenv(k, v)
@@ -303,7 +302,9 @@ func TestOverrideViaEnvVars(t *testing.T) {
 		APIServerHost:      "",
 		KubeConfigFilePath: "",
 
-		AllowIngressNetworkingV1: true,
+		DisableIngressNetworkingV1:      true,
+		DisableIngressNetworkingV1beta1: true,
+		DisableIngressExtensionsV1beta1: true,
 
 		LogLevel:  "panic",
 		LogFormat: "text",
@@ -364,9 +365,6 @@ func TestDeprecatedFlags(t *testing.T) {
 		APIServerHost:      "",
 		KubeConfigFilePath: "",
 
-		AllowIngressExtensionsV1beta1: true,
-		AllowIngressNetworkingV1beta1: true,
-
 		LogLevel:  "info",
 		LogFormat: "text",
 
@@ -431,9 +429,6 @@ func TestDeprecatedFlagPrecedences(t *testing.T) {
 		APIServerHost:      "",
 		KubeConfigFilePath: "",
 
-		AllowIngressExtensionsV1beta1: true,
-		AllowIngressNetworkingV1beta1: true,
-
 		LogLevel:  "info",
 		LogFormat: "text",
 

cli/ingress-controller/flags.go

@@ -84,9 +84,9 @@ type cliConfig struct {
 	KubeConfigFilePath string
 
 	// Allowed Ingress resource versions
-	AllowIngressExtensionsV1beta1 bool
-	AllowIngressNetworkingV1beta1 bool
-	AllowIngressNetworkingV1      bool
+	DisableIngressExtensionsV1beta1 bool
+	DisableIngressNetworkingV1beta1 bool
+	DisableIngressNetworkingV1      bool
 
 	// Performance
 	EnableProfiling bool
@@ -232,14 +232,14 @@ Kubernetes cluster and local discovery is attempted.`)
 		"authorization and master location information.")
 
 	// Allowed Ingress resource versions
-	flags.Bool("allow-ingress-extensionsv1beta1", true,
-		`If disabled, the ingress controller won't try extensions/v1beta1 when negotiating the newest supported
+	flags.Bool("disable-ingress-extensionsv1beta1", false,
+		`If set, the ingress controller won't try extensions/v1beta1 when negotiating the newest supported
 Ingress API with Kubernetes.`)
-	flags.Bool("allow-ingress-networkingv1beta1", true,
-		`If disabled, the ingress controller won't try networking.k8s.io/v1beta1 when negotiating the newest supported
+	flags.Bool("disable-ingress-networkingv1beta1", false,
+		`If set, the ingress controller won't try networking.k8s.io/v1beta1 when negotiating the newest supported
 Ingress API with Kubernetes.`)
-	flags.Bool("allow-ingress-networkingv1", false,
-		`If disabled, the ingress controller won't try networking/v1 when negotiating the newest supported
+	flags.Bool("disable-ingress-networkingv1", false,
+		`If set, the ingress controller won't try networking/v1 when negotiating the newest supported
 Ingress API with Kubernetes.`)
 
 	// Misc
@@ -366,10 +366,10 @@ func parseFlags() (cliConfig, error) {
 	config.APIServerHost = viper.GetString("apiserver-host")
 	config.KubeConfigFilePath = viper.GetString("kubeconfig")
 
-	// Allowed Ingress resource versions
-	config.AllowIngressExtensionsV1beta1 = viper.GetBool("allow-ingress-extensionsv1beta1")
-	config.AllowIngressNetworkingV1beta1 = viper.GetBool("allow-ingress-networkingv1beta1")
-	config.AllowIngressNetworkingV1 = viper.GetBool("allow-ingress-networkingv1")
+	// Disabled Ingress resource versions
+	config.DisableIngressExtensionsV1beta1 = viper.GetBool("disable-ingress-extensionsv1beta1")
+	config.DisableIngressNetworkingV1beta1 = viper.GetBool("disable-ingress-networkingv1beta1")
+	config.DisableIngressNetworkingV1 = viper.GetBool("disable-ingress-networkingv1")
 
 	// Misc
 	config.EnableProfiling = viper.GetBool("profiling")

cli/ingress-controller/main.go

@@ -345,13 +345,13 @@ func main() {
 	}
 
 	var preferredIngressAPIs []utils.IngressAPI
-	if cliConfig.AllowIngressNetworkingV1 {
+	if !cliConfig.DisableIngressNetworkingV1 {
 		preferredIngressAPIs = append(preferredIngressAPIs, utils.NetworkingV1)
 	}
-	if cliConfig.AllowIngressNetworkingV1beta1 {
+	if !cliConfig.DisableIngressNetworkingV1beta1 {
 		preferredIngressAPIs = append(preferredIngressAPIs, utils.NetworkingV1beta1)
 	}
-	if cliConfig.AllowIngressExtensionsV1beta1 {
+	if !cliConfig.DisableIngressExtensionsV1beta1 {
 		preferredIngressAPIs = append(preferredIngressAPIs, utils.ExtensionsV1beta1)
 	}
 	controllerConfig.IngressAPI, err = utils.NegotiateResourceAPI(kubeClient, "Ingress", preferredIngressAPIs)