Skip to content

[release-0.3] COO-572: fix manifest handler path to use static path instead of config #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2024
+5 −1
Merged

[release-0.3] COO-572: fix manifest handler path to use static path instead of config #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/manifest_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
var mlog = logrus.WithField("module", "manifest")

func manifestHandler(cfg *Config) http.HandlerFunc {
baseManifestData, err := os.ReadFile(filepath.Join(cfg.ConfigPath, "plugin-manifest.json"))
baseManifestData, err := os.ReadFile(filepath.Join(cfg.StaticPath, "plugin-manifest.json"))
if err != nil {
mlog.WithError(err).Error("cannot read base manifest file")
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
Expand Down
4 changes: 4 additions & 0 deletions scripts/start-console.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -euo pipefail

CONSOLE_IMAGE=${CONSOLE_IMAGE:="quay.io/openshift/origin-console:latest"}
CONSOLE_PORT=${CONSOLE_PORT:=9000}
CONSOLE_IMAGE_PLATFORM=${CONSOLE_IMAGE_PLATFORM:="linux/amd64"}

echo "Starting local OpenShift console..."

Expand Down Expand Up @@ -42,13 +43,15 @@ if [ -x "$(command -v podman)" ]; then
BRIDGE_PLUGINS="${npm_package_consolePlugin_name}=http://localhost:9001"
podman run --pull always \
--rm --network=host \
--platform $CONSOLE_IMAGE_PLATFORM \
--env-file <(set | grep BRIDGE) \
--env BRIDGE_PLUGIN_PROXY='{"services": [{"consoleAPIPath": "/api/proxy/plugin/distributed-tracing-console-plugin/backend/", "endpoint":"http://localhost:9002","authorize":true}, {"consoleAPIPath": "/api/plugins/distributed-tracing-console-plugin/api/v1/list-tempostacks", "endpoint":"http://localhost:9002/api/v1/list-tempostacks","authorize":true}]}' \
$CONSOLE_IMAGE
else
BRIDGE_PLUGINS="${npm_package_consolePlugin_name}=http://host.containers.internal:9001"
podman run \
--pull always \
--platform $CONSOLE_IMAGE_PLATFORM \
--rm -p "$CONSOLE_PORT":9000 \
--env-file <(set | grep BRIDGE) \
--env BRIDGE_PLUGIN_PROXY='{"services": [{"consoleAPIPath": "/api/proxy/plugin/distributed-tracing-console-plugin/backend/", "endpoint":"http://host.containers.internal:9002","authorize":true}, {"consoleAPIPath": "/api/plugins/distributed-tracing-console-plugin/api/v1/list-tempostacks", "endpoint":"http://host.containers.internal:9002/api/v1/list-tempostacks","authorize":true}]}' \
Expand All @@ -58,6 +61,7 @@ else
BRIDGE_PLUGINS="${npm_package_consolePlugin_name}=http://host.docker.internal:9001"
docker run \
--pull always \
--platform $CONSOLE_IMAGE_PLATFORM \
--rm -p "$CONSOLE_PORT":9000 \
--env-file <(set | grep BRIDGE) \
--env BRIDGE_PLUGIN_PROXY='{"services": [{"consoleAPIPath": "/api/proxy/plugin/distributed-tracing-console-plugin/backend/", "endpoint":"https://host.docker.internal:9002","authorize":true},{"consoleAPIPath": "/api/plugins/distributed-tracing-console-plugin/api/v1/list-tempostacks", "endpoint":"https://host.docker.internal:9002/api/v1/list-tempostacks","authorize":true}]}' \
Expand Down