stop adding beta admission config to default master configs

deads2k · deads2k · commit 714f198c9352 · 2017-11-27T10:09:51.000-05:00
diff --git a/pkg/cmd/server/start/master_args.go b/pkg/cmd/server/start/master_args.go
@@ -13,7 +13,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/kubernetes/pkg/master/ports"
 	"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
@@ -24,8 +23,6 @@ import (
 	configapiv1 "github.com/openshift/origin/pkg/cmd/server/api/v1"
 	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
-	imagepolicyapi "github.com/openshift/origin/pkg/image/admission/imagepolicy/api"
-	"github.com/openshift/origin/pkg/oc/bootstrap"
 	"github.com/spf13/cobra"
 )
 
@@ -362,23 +359,6 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig
 		config.ServiceAccountConfig.PublicKeyFiles = []string{}
 	}
 
-	// embed a default policy for generated config
-	defaultImagePolicy, err := bootstrap.Asset("pkg/image/admission/imagepolicy/api/v1/default-policy.yaml")
-	if err != nil {
-		return nil, fmt.Errorf("unable to find default image admission policy: %v", err)
-	}
-	// TODO: this should not be necessary, runtime.Unknown#MarshalJSON should handle YAML content type correctly
-	defaultImagePolicy, err = yaml.ToJSON(defaultImagePolicy)
-	if err != nil {
-		return nil, err
-	}
-	if config.AdmissionConfig.PluginConfig == nil {
-		config.AdmissionConfig.PluginConfig = make(map[string]configapi.AdmissionPluginConfig)
-	}
-	config.AdmissionConfig.PluginConfig[imagepolicyapi.PluginName] = configapi.AdmissionPluginConfig{
-		Configuration: &runtime.Unknown{Raw: defaultImagePolicy},
-	}
-
 	internal, err := applyDefaults(config, configapiv1.SchemeGroupVersion)
 	if err != nil {
 		return nil, err
