zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-05 21:56:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

update curl template to take http method

Browse Source
This commit is contained in:
rushtehrani
2020-05-05 20:40:18 -07:00
parent 7082e53328
commit 80476af59c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/workflow_execution.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/onepanelio/core/pkg/util/ptr" "github.com/onepanelio/core/pkg/util/ptr"
"io" "io"
"io/ioutil" "io/ioutil"
"net/http"
"regexp" "regexp"
"strconv" "strconv"
"strings" "strings"
@@ -508,6 +509,7 @@ func (c *Client) CronStartWorkflowExecutionStatisticInsert(namespace, name strin
"namespace": namespace, "namespace": namespace,
"phase": wfv1.NodePending, "phase": wfv1.NodePending,
"cron_workflow_id": cronWorkflow.ID, "cron_workflow_id": cronWorkflow.ID,
"parameters": "[]",
} }
_, err = sb.Insert("workflow_executions"). _, err = sb.Insert("workflow_executions").
@@ -1277,7 +1279,7 @@ func (c *Client) GetWorkflowExecutionStatisticsForTemplates(workflowTemplates ..
Will build a template that makes a CURL request to the onepanel-core API, Will build a template that makes a CURL request to the onepanel-core API,
with statistics about the workflow that was just executed. with statistics about the workflow that was just executed.
*/ */
func getCURLNodeTemplate(name, curlPath, curlBody string) (template *wfv1.Template, err error) { func getCURLNodeTemplate(name, curlMethod, curlPath, curlBody string) (template *wfv1.Template, err error) {
host := env.GetEnv("ONEPANEL_CORE_SERVICE_HOST", "onepanel-core.onepanel.svc.cluster.local") host := env.GetEnv("ONEPANEL_CORE_SERVICE_HOST", "onepanel-core.onepanel.svc.cluster.local")
if host == "" { if host == "" {
err = errors.New("ONEPANEL_CORE_SERVICE_HOST is empty.") err = errors.New("ONEPANEL_CORE_SERVICE_HOST is empty.")
@@ -1296,7 +1298,8 @@ func getCURLNodeTemplate(name, curlPath, curlBody string) (template *wfv1.Templa
Image: "curlimages/curl", Image: "curlimages/curl",
Command: []string{"sh", "-c"}, Command: []string{"sh", "-c"},
Args: []string{ Args: []string{
"SERVICE_ACCOUNT_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) && curl -s -o /dev/null -w '%{http_code}' '" + endpoint + "' -H \"Content-Type: application/json\" -H 'Connection: keep-alive' -H 'Accept: application/json' " + "SERVICE_ACCOUNT_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) " +
"&& curl -X " + curlMethod + " -s -o /dev/null -w '%{http_code}' '" + endpoint + "' -H \"Content-Type: application/json\" -H 'Connection: keep-alive' -H 'Accept: application/json' " +
"-H 'Authorization: Bearer '\"$SERVICE_ACCOUNT_TOKEN\"'' " + "-H 'Authorization: Bearer '\"$SERVICE_ACCOUNT_TOKEN\"'' " +
"--data '" + curlBody + "' --compressed", "--data '" + curlBody + "' --compressed",
}, },
@@ -1315,7 +1318,7 @@ func injectExitHandlerWorkflowExecutionStatistic(wf *wfv1.Workflow, namespace st
if err != nil { if err != nil {
return err return err
} }
statsTemplate, err := getCURLNodeTemplate("sys-send-exit-stats", curlPath, string(statisticsBytes)) statsTemplate, err := getCURLNodeTemplate("sys-send-exit-stats", http.MethodPost, curlPath, string(statisticsBytes))
if err != nil { if err != nil {
return err return err
} }
@@ -1361,7 +1364,7 @@ func injectInitHandlerWorkflowExecutionStatistic(wf *wfv1.Workflow, namespace st
if err != nil { if err != nil {
return err return err
} }
containerTemplate, err := getCURLNodeTemplate("sys-send-init-stats", curlPath, string(statisticsBytes)) containerTemplate, err := getCURLNodeTemplate("sys-send-init-stats", http.MethodPost, curlPath, string(statisticsBytes))
if err != nil { if err != nil {
return err return err
} }