Add subpath/route-prefix support

Tiltfile

@@ -180,5 +180,5 @@ else:
       ignore=["ui", "build", ".parcel-cache"],
       dockerfile='cmd/clusters-service/Dockerfile',
       build_args={'GITHUB_BUILD_TOKEN': os.getenv('GITHUB_TOKEN'),'image_tag': 'tilt'},
-      entrypoint= ["/clusters-service", "--log-level=debug"]
+      entrypoint= ["/clusters-service", "--log-level=debug"],
    )

charts/mccp/templates/clusters-service/deployment.yaml

@@ -50,6 +50,11 @@ spec:
             {{- range .Values.clustersService.args }}
             - {{ . }}
             {{- end }}
+            {{- with .Values.additionalArgs }}
+            {{- range . }}
+            - {{ . | quote }}
+            {{- end }}
+            {{- end }}
             {{ if .Values.explorer.cleaner.disabled }}
             - --explorer-cleaner-disabled=true
             {{- end }}

charts/mccp/values.yaml

@@ -160,6 +160,9 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
+# -- Additional arguments to pass in to the gitops-server
+additionalArgs: []
+
 envVars:
   - name: WEAVE_GITOPS_FEATURE_TENANCY
     value: "true"

cmd/clusters-service/app/options.go

@@ -40,6 +40,7 @@ type Options struct {
 	CAPIClustersNamespace     string
 	CAPIEnabled               bool
 	EntitlementSecretKey      client.ObjectKey
+	RoutePrefix               string
 	HtmlRootPath              string
 	ClientGetter              kube.ClientGetter
 	AuthMethods               map[auth.AuthMethod]bool
@@ -298,3 +299,9 @@ func WithExplorerEnabledFor(enabledFor []string) Option {
 		o.ExplorerEnabledFor = append(o.ExplorerEnabledFor, enabledFor...)
 	}
 }
+
+func WithRoutePrefix(routePrefix string) Option {
+	return func(o *Options) {
+		o.RoutePrefix = routePrefix
+	}
+}

cmd/clusters-service/app/server.go

@@ -127,6 +127,7 @@ type Params struct {
 	HelmRepoName                      string                    `mapstructure:"helm-repo-name"`
 	ProfileCacheLocation              string                    `mapstructure:"profile-cache-location"`
 	HtmlRootPath                      string                    `mapstructure:"html-root-path"`
+	RoutePrefix                       string                    `mapstructure:"route-prefix"`
 	OIDC                              OIDCAuthenticationOptions `mapstructure:",squash"`
 	GitProviderType                   string                    `mapstructure:"git-provider-type"`
 	GitProviderHostname               string                    `mapstructure:"git-provider-hostname"`
@@ -218,6 +219,7 @@ func NewAPIServerCommand() *cobra.Command {
 	cmdFlags.String("helm-repo-namespace", os.Getenv("RUNTIME_NAMESPACE"), "the namespace of the Helm Repository resource to scan for profiles")
 	cmdFlags.String("helm-repo-name", "weaveworks-charts", "the name of the Helm Repository resource to scan for profiles")
 	cmdFlags.String("profile-cache-location", "/tmp/helm-cache", "the location where the cache Profile data lives")
+	cmdFlags.String("route-prefix", "", "Mount the UI and API endpoint under a path prefix, e.g. /weave-gitops-enterprise")
 	cmdFlags.String("html-root-path", "/html", "Where to serve static assets from")
 	cmdFlags.String("git-provider-type", "", "")
 	cmdFlags.String("git-provider-hostname", "", "")
@@ -588,6 +590,7 @@ func StartServer(ctx context.Context, p Params, logOptions flux_logger.Options)
 		WithMonitoring(p.MonitoringEnabled, p.MonitoringBindAddress, p.MetricsEnabled, p.ProfilingEnabled, log),
 		WithExplorerCleanerDisabled(p.ExplorerCleanerDisabled),
 		WithExplorerEnabledFor(p.ExplorerEnabledFor),
+		WithRoutePrefix(p.RoutePrefix),
 	)
 }
 
@@ -747,7 +750,11 @@ func RunInProcessGateway(ctx context.Context, addr string, setters ...Option) er
 
 	// UI
 	args.Log.Info("Attaching FileServer", "HtmlRootPath", args.HtmlRootPath)
-	staticAssets := http.StripPrefix("/", http.FileServer(&spaFileSystem{http.Dir(args.HtmlRootPath)}))
+
+	assetFS := os.DirFS(args.HtmlRootPath)
+	assertFSHandler := http.FileServer(http.FS(assetFS))
+	redirectHandler := core.IndexHTMLHandler(assetFS, args.Log, args.RoutePrefix)
+	assetHandler := core.AssetHandler(assertFSHandler, redirectHandler)
 
 	mux := http.NewServeMux()
 
@@ -859,10 +866,14 @@ func RunInProcessGateway(ctx context.Context, addr string, setters ...Option) er
 
 	mux.Handle("/v1/", commonMiddleware(grpcHttpHandler))
 
-	staticAssetsWithGz := gziphandler.GzipHandler(staticAssets)
+	staticAssetsWithGz := gziphandler.GzipHandler(assetHandler)
 
 	mux.Handle("/", staticAssetsWithGz)
 
+	if args.RoutePrefix != "" {
+		mux = core.WithRoutePrefix(mux, args.RoutePrefix)
+	}
+
 	handler := http.Handler(mux)
 	handler = args.SessionManager.LoadAndSave(handler)
 
@@ -1028,18 +1039,6 @@ func defaultOptions() *Options {
 	}
 }
 
-type spaFileSystem struct {
-	root http.FileSystem
-}
-
-func (fs *spaFileSystem) Open(name string) (http.File, error) {
-	f, err := fs.root.Open(name)
-	if os.IsNotExist(err) {
-		return fs.root.Open("index.html")
-	}
-	return f, err
-}
-
 func makeCostEstimator(ctx context.Context, log logr.Logger, p Params) (estimation.Estimator, error) {
 	var pricer estimation.Pricer
 	if p.CostEstimationFilename != "" {

cmd/gitops/app/root/cmd.go

@@ -134,7 +134,7 @@ func Command(client *adapters.HTTPClient) *cobra.Command {
 	rootCmd.AddCommand(delete.Command(options, client))
 	rootCmd.AddCommand(upgrade.Cmd)
 	rootCmd.AddCommand(docs.Cmd)
-	rootCmd.AddCommand(check.Cmd)
+	rootCmd.AddCommand(check.GetCommand(options))
 	rootCmd.AddCommand(set.SetCommand(options))
 	rootCmd.AddCommand(generate.Command())
 	rootCmd.AddCommand(bootstrap.Command(options))

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.8.4
-	github.com/weaveworks/weave-gitops v0.37.0
+	github.com/weaveworks/weave-gitops v0.37.1-0.20231204151309-6cbe63a273ff
 	github.com/weaveworks/weave-gitops-enterprise-credentials v0.0.2
 	github.com/weaveworks/weave-gitops-enterprise/common v0.0.0
 	gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -73,7 +73,7 @@ require (
 	go.mozilla.org/sops/v3 v3.7.3
 	golang.org/x/crypto v0.14.0
 	golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb
-	golang.org/x/oauth2 v0.11.0
+	golang.org/x/oauth2 v0.13.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
 	google.golang.org/grpc v1.59.0
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
@@ -249,7 +249,7 @@ require (
 	github.com/cheshir/ttlcache v1.0.1-0.20220504185148-8ceeff21b789
 	github.com/clbanning/mxj/v2 v2.7.0 // indirect
 	github.com/containerd/containerd v1.7.0 // indirect
-	github.com/coreos/go-oidc/v3 v3.1.0 // indirect
+	github.com/coreos/go-oidc/v3 v3.4.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.4
 	github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -366,7 +366,7 @@ require (
 	golang.org/x/text v0.13.0
 	golang.org/x/time v0.3.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect