@@ -14,6 +14,7 @@ import (

 	"strings"

 	"github.com/openshift/origin/pkg/quota/admission/clusterresourceoverride/api"

+	html_template "html/template"

 	utilruntime "k8s.io/kubernetes/pkg/util/runtime"

 )

@@ -154,6 +155,22 @@ type WebConsoleVersion struct {

 	OpenShiftVersion  string

 }

+var extensionPropertiesTemplate = html_template.Must(html_template.New("webConsoleExtensionProperties").Parse(`

+window.OPENSHIFT_EXTENSION_PROPERTIES = {

+  {{ $values := .ExtensionPropertyValues }}

+  {{ range $i, $key := .ExtensionPropertyKeys }}

+  {{ if $i }},{{ end }}

+  {{ $value := index $values $i }}

+  "{{ $key }}": "{{ $value }}"

+  {{ end }}

+};

+`))

+

+type WebConsoleExtensionProperties struct {

+	ExtensionPropertyKeys   []html_template.JSStr

+	ExtensionPropertyValues []html_template.JSStr

+}

+

 var configTemplate = template.Must(template.New("webConsoleConfig").Parse(`

 window.OPENSHIFT_CONFIG = {

   apis: {

@@ -226,7 +243,7 @@ type WebConsoleConfig struct {

 	LimitRequestOverrides *api.ClusterResourceOverrideConfig

 }

-func GeneratedConfigHandler(config WebConsoleConfig, version WebConsoleVersion) (http.Handler, error) {

+func GeneratedConfigHandler(config WebConsoleConfig, version WebConsoleVersion, extensionProps WebConsoleExtensionProperties) (http.Handler, error) {

 	var buffer bytes.Buffer

 	if err := configTemplate.Execute(&buffer, config); err != nil {

 		return nil, err

@@ -234,6 +251,12 @@ func GeneratedConfigHandler(config WebConsoleConfig, version WebConsoleVersion)

 	if err := versionTemplate.Execute(&buffer, version); err != nil {

 		return nil, err

 	}

+

+	// We include the extension properties in config.js and not extensions.js because we

+	// want them treated with the same caching behavior as the rest of the values in config.js

+	if err := extensionPropertiesTemplate.Execute(&buffer, extensionProps); err != nil {

+		return nil, err

+	}

 	content := buffer.Bytes()

 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

@@ -17,7 +17,7 @@ func stubHandler(response string) http.Handler {

 }

 func TestWebConsoleConfigTemplate(t *testing.T) {

-	handler, err := GeneratedConfigHandler(WebConsoleConfig{}, WebConsoleVersion{})

+	handler, err := GeneratedConfigHandler(WebConsoleConfig{}, WebConsoleVersion{}, WebConsoleExtensionProperties{})

 	if err != nil {

 		t.Fatalf("expected a handler, got error %v", err)

 	}

@@ -565,6 +565,10 @@ type AssetConfig struct {

 	// Console loads

 	ExtensionScripts []string

+	// ExtensionProperties are key(string) and value(string) pairs that will be injected into the console under

+	// the global variable OPENSHIFT_EXTENSION_PROPERTIES

+	ExtensionProperties map[string]string

+

 	// ExtensionStylesheets are file paths on the asset server files to load as stylesheets when

 	// the Web Console loads

 	ExtensionStylesheets []string

@@ -53,6 +53,7 @@ var map_AssetConfig = map[string]string{

 	"loggingPublicURL":     "LoggingPublicURL is the public endpoint for logging (optional)",

 	"metricsPublicURL":     "MetricsPublicURL is the public endpoint for metrics (optional)",

 	"extensionScripts":     "ExtensionScripts are file paths on the asset server files to load as scripts when the Web Console loads",

+	"extensionProperties":  "ExtensionProperties are key(string) and value(string) pairs that will be injected into the console under the global variable OPENSHIFT_EXTENSION_PROPERTIES",

 	"extensionStylesheets": "ExtensionStylesheets are file paths on the asset server files to load as stylesheets when the Web Console loads",

 	"extensions":           "Extensions are files to serve from the asset server filesystem under a subcontext",

 	"extensionDevelopment": "ExtensionDevelopment when true tells the asset server to reload extension scripts and stylesheets for every request rather than only at startup. It lets you develop extensions without having to restart the server for every change.",

@@ -542,6 +542,10 @@ type AssetConfig struct {

 	// Console loads

 	ExtensionScripts []string `json:"extensionScripts"`

+	// ExtensionProperties are key(string) and value(string) pairs that will be injected into the console under

+	// the global variable OPENSHIFT_EXTENSION_PROPERTIES

+	ExtensionProperties map[string]string `json:"extensionProperties"`

+

 	// ExtensionStylesheets are file paths on the asset server files to load as stylesheets when

 	// the Web Console loads

 	ExtensionStylesheets []string `json:"extensionStylesheets"`

@@ -82,6 +82,7 @@ apiLevels: null

 apiVersion: v1

 assetConfig:

   extensionDevelopment: false

+  extensionProperties: null

   extensionScripts: null

   extensionStylesheets: null

   extensions:

@@ -3,6 +3,7 @@ package origin

 import (

 	"crypto/tls"

 	"fmt"

+	"html/template"

 	"net/http"

 	"net/url"

 	"path"

@@ -141,6 +142,18 @@ func (c *AssetConfig) buildAssetHandler() (http.Handler, error) {

 	return handler, nil

 }

+// Have to convert to arrays because go templates are limited and we need to be able to know

+// if we are on the last index for trailing commas in JSON

+func extensionPropertyArrays(extensionProperties map[string]string) ([]template.JSStr, []template.JSStr) {

+	extensionKeys := []template.JSStr{}

+	extensionValues := []template.JSStr{}

+	for key, value := range extensionProperties {

+		extensionKeys = append(extensionKeys, template.JSStr(key))

+		extensionValues = append(extensionValues, template.JSStr(value))

+	}

+	return extensionKeys, extensionValues

+}

+

 func (c *AssetConfig) addHandlers(mux *http.ServeMux) error {

 	assetHandler, err := c.buildAssetHandler()

 	if err != nil {

@@ -220,8 +233,14 @@ func (c *AssetConfig) addHandlers(mux *http.ServeMux) error {

 		KubernetesVersion: kVersionInfo.GitVersion,

 		OpenShiftVersion:  oVersionInfo.GitVersion,

 	}

+

+	extensionPropertyKeys, extensionPropertyValues := extensionPropertyArrays(c.Options.ExtensionProperties)

+	extensionProps := assets.WebConsoleExtensionProperties{

+		ExtensionPropertyKeys:   extensionPropertyKeys,

+		ExtensionPropertyValues: extensionPropertyValues,

+	}

 	configPath := path.Join(publicURL.Path, "config.js")

-	configHandler, err := assets.GeneratedConfigHandler(config, versionInfo)

+	configHandler, err := assets.GeneratedConfigHandler(config, versionInfo, extensionProps)

 	if err != nil {

 		return err

 	}