From e53b34b2b15c5ae69a8f659b1fc4bbf0a68e03e8 Mon Sep 17 00:00:00 2001 From: Sergii Kabashniuk Date: Wed, 26 Sep 2018 14:01:02 +0300 Subject: [PATCH] Setup default value for CHE_WORKSPACE_PLUGIN__REGISTRY__URL (#11354) Setup default value for CHE_WORKSPACE_PLUGIN__REGISTRY__URL --- .../src/main/webapp/WEB-INF/classes/che/che.properties | 2 +- deploy/kubernetes/kubectl/che-kubernetes.yaml | 2 +- deploy/openshift/deploy_che.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties index 7a0bfed177..759bc39b0a 100644 --- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties +++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties @@ -513,7 +513,7 @@ che.workspace.plugin_broker.pull_policy=Always # Workspace tooling plugins registry endpoint. Should be a valid HTTP URL. # Example: http://che-plugin-registry-eclipse-che.192.168.65.2.nip.io # In case Che plugins tooling is not needed value 'NULL' should be used -che.workspace.plugin_registry_url=NULL +che.workspace.plugin_registry_url=https://che-plugin-registry.openshift.io # Configures in which way secure servers will be protected with authentication. # Suitable values: diff --git a/deploy/kubernetes/kubectl/che-kubernetes.yaml b/deploy/kubernetes/kubectl/che-kubernetes.yaml index c890a069be..1147a7b7c2 100644 --- a/deploy/kubernetes/kubectl/che-kubernetes.yaml +++ b/deploy/kubernetes/kubectl/che-kubernetes.yaml @@ -69,7 +69,7 @@ items: CHE_LOGS_APPENDERS_IMPL: "plaintext" CHE_INFRA_KUBERNETES_INGRESS_DOMAIN: "192.168.99.100.nip.io" CHE_INFRA_KUBERNETES_SERVER__STRATEGY: "default-host" - CHE_WORKSPACE_PLUGIN__REGISTRY__URL: "NULL" + CHE_WORKSPACE_PLUGIN__REGISTRY__URL: "https://che-plugin-registry.openshift.io" - apiVersion: extensions/v1beta1 kind: Ingress metadata: diff --git a/deploy/openshift/deploy_che.sh b/deploy/openshift/deploy_che.sh index 225a035da3..52dd2877f5 100755 --- a/deploy/openshift/deploy_che.sh +++ b/deploy/openshift/deploy_che.sh @@ -154,7 +154,7 @@ export PLUGIN_REGISTRY_IMAGE=${PLUGIN_REGISTRY_IMAGE:-${DEFAULT_PLUGIN_REGISTRY_ DEFAULT_PLUGIN_REGISTRY_IMAGE_PULL_POLICY="Always" export PLUGIN_REGISTRY_IMAGE_PULL_POLICY=${PLUGIN_REGISTRY_IMAGE_PULL_POLICY:-${DEFAULT_PLUGIN_REGISTRY_IMAGE_PULL_POLICY}} -DEFAULT_PLUGIN__REGISTRY__URL="NULL" +DEFAULT_PLUGIN__REGISTRY__URL="https://che-plugin-registry.openshift.io" export PLUGIN__REGISTRY__URL=${PLUGIN__REGISTRY__URL:-${DEFAULT_PLUGIN__REGISTRY__URL}} if [ "${ENABLE_SSL}" == "true" ]; then