Fixing broken apiserver feature gate logic for 1.9.3 (#1593)

* Fixing broken apiserver feature gate logic for 1.9.3

* Making if statements cleaner

Author: Luke Humphreys

core/controlplane/config/config.go

@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 	"unicode/utf8"
 
@@ -362,12 +363,9 @@ func (c *Cluster) ControllerFeatureGates() model.FeatureGates {
 	//From kube 1.11 PodPriority and ExpandPersistentVolumes have become enabled by default,
 	//so making sure it is not enabled if user has explicitly set them to false
 	//https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#changelog-since-v1110
-	if !c.Experimental.Admission.Priority.Enabled {
-		gates["PodPriority"] = "false"
-	}
-	if !c.Experimental.Admission.PersistentVolumeClaimResize.Enabled {
-		gates["ExpandPersistentVolumes"] = "false"
-	}
+	gates["PodPriority"] = strconv.FormatBool(c.Experimental.Admission.Priority.Enabled)
+	gates["ExpandPersistentVolumes"] = strconv.FormatBool(c.Experimental.Admission.PersistentVolumeClaimResize.Enabled)
+
 	return gates
 }
 

core/nodepool/config/config.go

@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+	"strconv"
 	"strings"
 
 	"github.com/go-yaml/yaml"
@@ -300,12 +301,9 @@ func (c ProvidedConfig) FeatureGates() model.FeatureGates {
 	//From kube 1.11 PodPriority and ExpandPersistentVolumes have become enabled by default,
 	//so making sure it is not enabled if user has explicitly set them to false
 	//https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#changelog-since-v1110
-	if !c.Experimental.Admission.Priority.Enabled {
-		gates["PodPriority"] = "false"
-	}
-	if !c.Experimental.Admission.PersistentVolumeClaimResize.Enabled {
-		gates["ExpandPersistentVolumes"] = "false"
-	}
+	gates["PodPriority"] = strconv.FormatBool(c.Experimental.Admission.Priority.Enabled)
+	gates["ExpandPersistentVolumes"] = strconv.FormatBool(c.Experimental.Admission.PersistentVolumeClaimResize.Enabled)
+
 	return gates
 }