Merge pull request #18077 from deads2k/play-02

plumb through the clusterresourceoverride settings

Author: deads2k

pkg/assets/apiserver/asset_apiserver.go

@@ -32,6 +32,7 @@ import (
 	"github.com/openshift/origin/pkg/cmd/server/crypto"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	oauthutil "github.com/openshift/origin/pkg/oauth/util"
+	overrideapi "github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api"
 	"github.com/openshift/origin/pkg/util/httprequest"
 	oversion "github.com/openshift/origin/pkg/version"
 )
@@ -41,8 +42,9 @@ const (
 )
 
 type ExtraConfig struct {
-	Options   oapi.AssetConfig
-	PublicURL url.URL
+	Options               oapi.AssetConfig
+	LimitRequestOverrides *overrideapi.ClusterResourceOverrideConfig
+	PublicURL             url.URL
 }
 
 type AssetServerConfig struct {
@@ -67,7 +69,7 @@ type CompletedConfig struct {
 	*completedConfig
 }
 
-func NewAssetServerConfig(assetConfig oapi.AssetConfig) (*AssetServerConfig, error) {
+func NewAssetServerConfig(assetConfig oapi.AssetConfig, limitRequestOverrides *overrideapi.ClusterResourceOverrideConfig) (*AssetServerConfig, error) {
 	publicURL, err := url.Parse(assetConfig.PublicURL)
 	if err != nil {
 		glog.Fatal(err)
@@ -107,8 +109,9 @@ func NewAssetServerConfig(assetConfig oapi.AssetConfig) (*AssetServerConfig, err
 	return &AssetServerConfig{
 		GenericConfig: &genericapiserver.RecommendedConfig{Config: *genericConfig},
 		ExtraConfig: ExtraConfig{
-			Options:   assetConfig,
-			PublicURL: *publicURL,
+			Options:               assetConfig,
+			LimitRequestOverrides: limitRequestOverrides,
+			PublicURL:             *publicURL,
 		},
 	}, nil
 }
@@ -128,7 +131,6 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget)
 	if err != nil {
 		return nil, err
 	}
-
 	s := &AssetServer{
 		GenericAPIServer: genericServer,
 		PublicURL:        c.ExtraConfig.PublicURL,
@@ -223,19 +225,20 @@ func (c *completedConfig) addWebConsoleConfig(serverMux *genericmux.PathRecorder
 
 	// Generated web console config and server version
 	config := assets.WebConsoleConfig{
-		APIGroupAddr:      masterURL.Host,
-		APIGroupPrefix:    server.APIGroupPrefix,
-		MasterAddr:        masterURL.Host,
-		MasterPrefix:      api.Prefix,
-		KubernetesAddr:    masterURL.Host,
-		KubernetesPrefix:  server.DefaultLegacyAPIPrefix,
-		OAuthAuthorizeURI: oauthutil.OpenShiftOAuthAuthorizeURL(masterURL.String()),
-		OAuthTokenURI:     oauthutil.OpenShiftOAuthTokenURL(masterURL.String()),
-		OAuthRedirectBase: c.ExtraConfig.Options.PublicURL,
-		OAuthClientID:     OpenShiftWebConsoleClientID,
-		LogoutURI:         c.ExtraConfig.Options.LogoutURL,
-		LoggingURL:        c.ExtraConfig.Options.LoggingPublicURL,
-		MetricsURL:        c.ExtraConfig.Options.MetricsPublicURL,
+		APIGroupAddr:          masterURL.Host,
+		APIGroupPrefix:        server.APIGroupPrefix,
+		MasterAddr:            masterURL.Host,
+		MasterPrefix:          api.Prefix,
+		KubernetesAddr:        masterURL.Host,
+		KubernetesPrefix:      server.DefaultLegacyAPIPrefix,
+		OAuthAuthorizeURI:     oauthutil.OpenShiftOAuthAuthorizeURL(masterURL.String()),
+		OAuthTokenURI:         oauthutil.OpenShiftOAuthTokenURL(masterURL.String()),
+		OAuthRedirectBase:     c.ExtraConfig.Options.PublicURL,
+		OAuthClientID:         OpenShiftWebConsoleClientID,
+		LogoutURI:             c.ExtraConfig.Options.LogoutURL,
+		LoggingURL:            c.ExtraConfig.Options.LoggingPublicURL,
+		MetricsURL:            c.ExtraConfig.Options.MetricsPublicURL,
+		LimitRequestOverrides: c.ExtraConfig.LimitRequestOverrides,
 	}
 	kVersionInfo := kversion.Get()
 	oVersionInfo := oversion.Get()

pkg/cmd/server/origin/asset_apiserver_adapter.go

@@ -0,0 +1,50 @@
+package origin
+
+import (
+	"os"
+
+	configapi "github.com/openshift/origin/pkg/cmd/server/api"
+	"github.com/openshift/origin/pkg/cmd/util/pluginconfig"
+	override "github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride"
+	overrideapi "github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api"
+)
+
+// All this ugly was removed in 3.9
+// GetResourceOverrideConfig looks in two potential places where ClusterResourceOverrideConfig can be specified
+func GetResourceOverrideConfig(masterConfig configapi.MasterConfig) (*overrideapi.ClusterResourceOverrideConfig, error) {
+	overrideConfig, err := checkForOverrideConfig(masterConfig.AdmissionConfig)
+	if err != nil {
+		return nil, err
+	}
+	if overrideConfig != nil {
+		return overrideConfig, nil
+	}
+	if masterConfig.KubernetesMasterConfig == nil { // external kube gets you a nil pointer here
+		return nil, nil
+	}
+	overrideConfig, err = checkForOverrideConfig(masterConfig.KubernetesMasterConfig.AdmissionConfig)
+	if err != nil {
+		return nil, err
+	}
+	return overrideConfig, nil
+}
+
+// checkForOverrideConfig looks for ClusterResourceOverrideConfig plugin cfg in the admission PluginConfig
+func checkForOverrideConfig(ac configapi.AdmissionConfig) (*overrideapi.ClusterResourceOverrideConfig, error) {
+	overridePluginConfigFile, err := pluginconfig.GetPluginConfigFile(ac.PluginConfig, overrideapi.PluginName, "")
+	if err != nil {
+		return nil, err
+	}
+	if overridePluginConfigFile == "" {
+		return nil, nil
+	}
+	configFile, err := os.Open(overridePluginConfigFile)
+	if err != nil {
+		return nil, err
+	}
+	overrideConfig, err := override.ReadConfig(configFile)
+	if err != nil {
+		return nil, err
+	}
+	return overrideConfig, nil
+}

pkg/cmd/server/origin/master.go

@@ -159,7 +159,12 @@ func (c *MasterConfig) newAssetServerHandler(genericConfig *apiserver.Config) (h
 		return http.NotFoundHandler(), nil
 	}
 
-	config, err := assetapiserver.NewAssetServerConfig(*c.Options.AssetConfig)
+	clusterResourceOverrideConfig, err := GetResourceOverrideConfig(c.Options)
+	if err != nil {
+		return nil, err
+	}
+
+	config, err := assetapiserver.NewAssetServerConfig(*c.Options.AssetConfig, clusterResourceOverrideConfig)
 	if err != nil {
 		return nil, err
 	}

pkg/cmd/server/start/start_master.go

@@ -572,7 +572,12 @@ func StartAPI(oc *origin.MasterConfig, controllerPlug plug.Plug) error {
 
 	// if the webconsole is configured to be standalone, go ahead and create and run it
 	if oc.WebConsoleEnabled() && oc.WebConsoleStandalone() {
-		config, err := assetapiserver.NewAssetServerConfig(*oc.Options.AssetConfig)
+		clusterResourceOverrideConfig, err := origin.GetResourceOverrideConfig(oc.Options)
+		if err != nil {
+			return err
+		}
+
+		config, err := assetapiserver.NewAssetServerConfig(*oc.Options.AssetConfig, clusterResourceOverrideConfig)
 		if err != nil {
 			return err
 		}