make runtime-config kube-compatible

Author: liggitt

pkg/cmd/server/apis/config/helpers.go

@@ -475,10 +475,11 @@ func GetKubeAPIServerFlagAPIEnablement(flagValue []string) map[schema.GroupVersi
 	versions := map[schema.GroupVersion]bool{}
 	for _, val := range flagValue {
 		// skip bad flags
-		if !strings.HasPrefix(val, "apis/") {
+		if strings.HasPrefix(val, "api/") {
 			continue
 		}
-		tokens := strings.Split(val[len("apis/"):], "=")
+		val = strings.TrimPrefix(val, "apis/")
+		tokens := strings.Split(val, "=")
 		if len(tokens) != 2 {
 			continue
 		}

pkg/cmd/server/apis/config/helpers_test.go

@@ -15,14 +15,14 @@ func TestGetKubeAPIServerFlagAPIEnablement(t *testing.T) {
 	}{
 		{
 			name:      "skip bad",
-			flagValue: []string{"api/legacy=true", "apis/foobar/is/bad=true", "apis/foo/v1=true=true", "apis/good/v1=false"},
+			flagValue: []string{"api/legacy=true", "foobar/is/bad=true", "foo/v1=true=true", "good/v1=false"},
 			expected: map[schema.GroupVersion]bool{
 				{Group: "good", Version: "v1"}: false,
 			},
 		},
 		{
 			name:      "good",
-			flagValue: []string{"apis/good/v2=true", "apis/good/v1=false"},
+			flagValue: []string{"good/v2=true", "good/v1=false"},
 			expected: map[schema.GroupVersion]bool{
 				{Group: "good", Version: "v1"}: false,
 				{Group: "good", Version: "v2"}: true,
@@ -51,20 +51,20 @@ func TestGetEnabledAPIVersionsForGroup(t *testing.T) {
 		{
 			name:      "enable unknown from flag",
 			apiGroup:  "good",
-			flagValue: []string{"apis/good/v2=true", "apis/good/v1=false"},
+			flagValue: []string{"good/v2=true", "good/v1=false"},
 			expected:  []string{"v2"},
 		},
 		{
 			name:                     "enable from flag, disabled by disable",
 			apiGroup:                 "good",
 			disabledAPIGroupVersions: map[string][]string{"good": {"v2"}},
-			flagValue:                []string{"apis/good/v2=true", "apis/good/v1=false"},
+			flagValue:                []string{"good/v2=true", "good/v1=false"},
 			expected:                 []string{},
 		},
 		{
 			name:      "enable by default, disable by flag",
 			apiGroup:  "batch",
-			flagValue: []string{"apis/batch/v1=false"},
+			flagValue: []string{"batch/v1=false"},
 			expected:  []string{"v1beta1", "v2alpha1"},
 		},
 		{
@@ -75,7 +75,7 @@ func TestGetEnabledAPIVersionsForGroup(t *testing.T) {
 		{
 			name:      "enable settings",
 			apiGroup:  "settings.k8s.io",
-			flagValue: []string{"apis/settings.k8s.io/v1alpha1=true"},
+			flagValue: []string{"settings.k8s.io/v1alpha1=true"},
 			expected:  []string{"v1alpha1"},
 		},
 	}
@@ -108,20 +108,20 @@ func TestGetDisabledAPIVersionsForGroup(t *testing.T) {
 		{
 			name:      "enable unknown from flag",
 			apiGroup:  "good",
-			flagValue: []string{"apis/good/v2=true", "apis/good/v1=false"},
+			flagValue: []string{"good/v2=true", "good/v1=false"},
 			expected:  []string{"v1"},
 		},
 		{
 			name:                     "enable from flag, disabled by disable",
 			apiGroup:                 "good",
 			disabledAPIGroupVersions: map[string][]string{"good": {"v2"}},
-			flagValue:                []string{"apis/good/v2=true", "apis/good/v1=false"},
+			flagValue:                []string{"good/v2=true", "good/v1=false"},
 			expected:                 []string{"v1", "v2"},
 		},
 		{
 			name:      "enable by default, disable by flag",
 			apiGroup:  "batch",
-			flagValue: []string{"apis/batch/v1=false"},
+			flagValue: []string{"batch/v1=false"},
 			expected:  []string{"v1"},
 		},
 		{

pkg/cmd/server/apis/config/validation/master.go

@@ -652,6 +652,12 @@ func ValidateAPIServerExtendedArguments(config configapi.ExtendedArguments, fldP
 
 	validationResults.AddErrors(ValidateExtendedArguments(config, apiserveroptions.NewServerRunOptions().AddFlags, fldPath)...)
 
+	for i, key := range config["runtime-config"] {
+		if strings.HasPrefix(key, "apis/") {
+			validationResults.AddWarnings(field.Invalid(fldPath.Key("runtime-config").Index(i), key, "remove the apis/ prefix"))
+		}
+	}
+
 	if len(config["admission-control"]) > 0 {
 		validationResults.AddWarnings(field.Invalid(fldPath.Key("admission-control"), config["admission-control"], "specified admission ordering is being phased out.  Convert to DefaultAdmissionConfig in admissionConfig.pluginConfig."))
 	}

pkg/cmd/server/kubernetes/master/master_config.go

@@ -176,6 +176,10 @@ func BuildKubeAPIserverOptions(masterConfig configapi.MasterConfig) (*kapiserver
 	for k, v := range masterConfig.KubernetesMasterConfig.APIServerArguments {
 		args[k] = v
 	}
+	// fixup 'apis/' prefixed args
+	for i, key := range args["runtime-config"] {
+		args["runtime-config"][i] = strings.TrimPrefix(key, "apis/")
+	}
 	if masterConfig.AuditConfig.Enabled {
 		if existing, ok := args["feature-gates"]; ok {
 			args["feature-gates"] = []string{existing[0] + ",AdvancedAuditing=true"}