diff --git a/hack/dev-apply.sh b/hack/dev-apply.sh index 39c5c32b..3d6f00af 100755 --- a/hack/dev-apply.sh +++ b/hack/dev-apply.sh @@ -10,13 +10,17 @@ echo $ROOT_DIR OPENAI_API_KEY=${OPENAI_API_KEY:-sk-dummy-OPENAI_API_KEY} MCP_BASIC_KEY=${MCP_BASIC_KEY:-sk-dummy-MCP_BASIC_KEY} MCP_PAPERSCORE_KEY=${MCP_PAPERSCORE_KEY:-sk-dummy-MCP_PAPERSCORE_KEY} +GHCR_DOCKER_CONFIG=${GHCR_DOCKER_CONFIG:-dummy-ghcr-docker-config} +CLOUDFLARE_TUNNEL_TOKEN=${CLOUDFLARE_TUNNEL_TOKEN:-dummy-cloudflare-tunnel-token} helm template $ROOT_DIR/helm-chart \ --create-namespace \ --values $ROOT_DIR/helm-chart/values.yaml \ --values $ROOT_DIR/hack/values-dev.yaml \ - --set openai_api_key=$OPENAI_API_KEY \ - --set mcp_basic_key=$MCP_BASIC_KEY \ - --set mcp_paperscore_key=$MCP_PAPERSCORE_KEY | + --set-string openai_api_key=$OPENAI_API_KEY \ + --set-string mcp_basic_key=$MCP_BASIC_KEY \ + --set-string mcp_paperscore_key=$MCP_PAPERSCORE_KEY \ + --set-string ghcr_docker_config=$GHCR_DOCKER_CONFIG \ + --set-string cloudflare_tunnel_token=$CLOUDFLARE_TUNNEL_TOKEN | kubectl apply -f - kubectl --namespace paperdebugger-dev rollout restart deployment/paperdebugger diff --git a/hack/prd.sh b/hack/prd.sh index c9c925ec..54ae92f4 100755 --- a/hack/prd.sh +++ b/hack/prd.sh @@ -10,13 +10,17 @@ MCP_BASIC_KEY=${MCP_BASIC_KEY:-sk-dummy-MCP_BASIC_KEY} MCP_PAPERSCORE_KEY=${MCP_PAPERSCORE_KEY:-sk-dummy-MCP_PAPERSCORE_KEY} PAPERDEBUGGER_IMAGE=${PAPERDEBUGGER_IMAGE:-ghcr.io/paperdebugger/sharelatex-paperdebugger:latest} MONGO_URI=${MONGO_URI:-} +GHCR_DOCKER_CONFIG=${GHCR_DOCKER_CONFIG:-dummy-ghcr-docker-config} +CLOUDFLARE_TUNNEL_TOKEN=${CLOUDFLARE_TUNNEL_TOKEN:-dummy-cloudflare-tunnel-token} helm template $ROOT_DIR/helm-chart \ --create-namespace \ --values $ROOT_DIR/helm-chart/values.yaml \ --values $ROOT_DIR/hack/values-prd.yaml \ - --set openai_api_key=$OPENAI_API_KEY \ - --set mcp_basic_key=$MCP_BASIC_KEY \ - --set mcp_paperscore_key=$MCP_PAPERSCORE_KEY \ - --set paperdebugger.image=$PAPERDEBUGGER_IMAGE \ - --set mongo.uri=$MONGO_URI + --set-string openai_api_key=$OPENAI_API_KEY \ + --set-string mcp_basic_key=$MCP_BASIC_KEY \ + --set-string mcp_paperscore_key=$MCP_PAPERSCORE_KEY \ + --set-string paperdebugger.image=$PAPERDEBUGGER_IMAGE \ + --set-string mongo.uri=$MONGO_URI \ + --set-string ghcr_docker_config=$GHCR_DOCKER_CONFIG \ + --set-string cloudflare_tunnel_token=$CLOUDFLARE_TUNNEL_TOKEN diff --git a/hack/stg.sh b/hack/stg.sh index 900a63b3..64a5aafa 100755 --- a/hack/stg.sh +++ b/hack/stg.sh @@ -10,13 +10,17 @@ MCP_BASIC_KEY=${MCP_BASIC_KEY:-sk-dummy-MCP_BASIC_KEY} MCP_PAPERSCORE_KEY=${MCP_PAPERSCORE_KEY:-sk-dummy-MCP_PAPERSCORE_KEY} PAPERDEBUGGER_IMAGE=${PAPERDEBUGGER_IMAGE:-ghcr.io/paperdebugger/sharelatex-paperdebugger:latest} MONGO_URI=${MONGO_URI:-} +GHCR_DOCKER_CONFIG=${GHCR_DOCKER_CONFIG:-dummy-ghcr-docker-config} +CLOUDFLARE_TUNNEL_TOKEN=${CLOUDFLARE_TUNNEL_TOKEN:-dummy-cloudflare-tunnel-token} helm template $ROOT_DIR/helm-chart \ --create-namespace \ --values $ROOT_DIR/helm-chart/values.yaml \ --values $ROOT_DIR/hack/values-stg.yaml \ - --set openai_api_key=$OPENAI_API_KEY \ - --set mcp_basic_key=$MCP_BASIC_KEY \ - --set mcp_paperscore_key=$MCP_PAPERSCORE_KEY \ - --set paperdebugger.image=$PAPERDEBUGGER_IMAGE \ - --set mongo.uri=$MONGO_URI + --set-string openai_api_key=$OPENAI_API_KEY \ + --set-string mcp_basic_key=$MCP_BASIC_KEY \ + --set-string mcp_paperscore_key=$MCP_PAPERSCORE_KEY \ + --set-string paperdebugger.image=$PAPERDEBUGGER_IMAGE \ + --set-string mongo.uri=$MONGO_URI \ + --set-string ghcr_docker_config=$GHCR_DOCKER_CONFIG \ + --set-string cloudflare_tunnel_token=$CLOUDFLARE_TUNNEL_TOKEN diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 534cd96d..d862064f 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -1,6 +1,8 @@ namespace: paperdebugger-dev openai_api_key: sk-dummy-OPENAI_API_KEY jwt_signing_key: paperdebugger +ghcr_docker_config: dummy-ghcr-docker-config +cloudflare_tunnel_token: dummy-cloudflare-tunnel-token paperdebugger: image: ghcr.io/paperdebugger/sharelatex-paperdebugger:latest