summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-10-11 14:56:57 +0200
committerJacob Vosmaer <jacob@gitlab.com>2016-10-11 14:56:57 +0200
commit641880f354e7e575b1743f8b32de842f100e59c9 (patch)
tree922aa8e1d28c7c6e8d7b4530f8f3236b780c2706
parent69fd3c0a3811b1b45b64dcadc139e058c3f3d7b1 (diff)
downloadgitlab-ce-641880f354e7e575b1743f8b32de842f100e59c9.tar.gz
Pass Openshift project/app to workhorse
-rw-r--r--app/controllers/projects/deployments_controller.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index 5c88a9fd543..321f8324866 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -8,9 +8,11 @@ class Projects::DeploymentsController < Projects::ApplicationController
def terminal_websocket_authorize
Gitlab::Workhorse.verify_api_request!(request.headers)
- if true # extra access checks, config flags can go here
+ openshift_project = project.variables.find('CI_PROJECT_NAME').to_s
+ openshift_app = project.variables.find('APP').to_s
+ if openshift_project.present? && openshift_app.present?
set_workhorse_internal_api_content_type
- render json: {} # Kubernetes namespace/pod/container should go here
+ render json: {openshift_app: openshift_app, openshift_project: openshift_project}
else
render text: 'Not found', status: 404
end