Skip to content

Commit

Permalink
Fix single-host mode
Browse files Browse the repository at this point in the history
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
  • Loading branch information
tolusha committed Oct 1, 2020
1 parent 0470b4e commit e204f2d
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
21 changes: 18 additions & 3 deletions pkg/deploy/expose/expose.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,28 @@ func Expose(deployContext *deploy.DeployContext, cheHost string, endpointName st
exposureStrategy := util.GetServerExposureStrategy(deployContext.CheCluster, deploy.DefaultServerExposureStrategy)
var domain string
var endpoint string
var pathPrefix string
var stripPrefix bool

if endpointName == "keycloak" {
pathPrefix = "auth"
stripPrefix = false
} else {
pathPrefix = endpointName
stripPrefix = true
}
if exposureStrategy == "multi-host" {
// this won't get used on openshift, because there we're intentionally let Openshift decide on the domain name
domain = endpointName + "-" + deployContext.CheCluster.Namespace + "." + deployContext.CheCluster.Spec.K8s.IngressDomain
endpoint = domain
} else {
domain = cheHost
endpoint = domain + "/" + endpointName
if endpointName == "keycloak" {
// legacy
endpoint = domain
} else {
endpoint = domain + "/" + pathPrefix
}
}

gatewayConfig := "che-gateway-route-" + endpointName
Expand All @@ -26,7 +41,7 @@ func Expose(deployContext *deploy.DeployContext, cheHost string, endpointName st

if !util.IsOpenShift {
if useGateway {
cfg := gateway.GetGatewayRouteConfig(deployContext, gatewayConfig, "/"+endpointName, 10, "http://"+endpointName+":8080", true)
cfg := gateway.GetGatewayRouteConfig(deployContext, gatewayConfig, "/"+pathPrefix, 10, "http://"+endpointName+":8080", stripPrefix)
clusterCfg, err := deploy.SyncConfigMapToCluster(deployContext, &cfg)
if !util.IsTestMode() {
if clusterCfg == nil {
Expand Down Expand Up @@ -56,7 +71,7 @@ func Expose(deployContext *deploy.DeployContext, cheHost string, endpointName st
}
} else {
if useGateway {
cfg := gateway.GetGatewayRouteConfig(deployContext, gatewayConfig, "/"+endpointName, 10, "http://"+endpointName+":8080", true)
cfg := gateway.GetGatewayRouteConfig(deployContext, gatewayConfig, "/"+pathPrefix, 10, "http://"+endpointName+":8080", stripPrefix)
clusterCfg, err := deploy.SyncConfigMapToCluster(deployContext, &cfg)
if !util.IsTestMode() {
if clusterCfg == nil {
Expand Down
3 changes: 2 additions & 1 deletion pkg/deploy/server/che_configmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ package server
import (
"encoding/json"
"fmt"
"github.com/eclipse/che-operator/pkg/deploy"
"os"
"strconv"

"github.com/eclipse/che-operator/pkg/deploy"

"github.com/eclipse/che-operator/pkg/util"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
Expand Down

0 comments on commit e204f2d

Please sign in to comment.