Merge branch '2.0.0' of https://github.com/shuffle/shuffle into 2.0.0
This commit is contained in:
@@ -10,7 +10,7 @@ require (
|
||||
github.com/docker/docker v26.1.0+incompatible
|
||||
github.com/docker/go-connections v0.5.0
|
||||
github.com/satori/go.uuid v1.2.0
|
||||
github.com/shuffle/shuffle-shared v0.6.27
|
||||
github.com/shuffle/shuffle-shared v0.6.29
|
||||
k8s.io/api v0.30.0
|
||||
k8s.io/apimachinery v0.30.0
|
||||
k8s.io/client-go v0.30.0
|
||||
|
||||
@@ -2050,9 +2050,7 @@ func handlePipeline(incRequest shuffle.ExecutionRequest) error {
|
||||
if err != nil {
|
||||
log.Printf("[ERROR] Failed Deleting Pipeline %s", err)
|
||||
return err
|
||||
} else {
|
||||
log.Printf("[INFO] successfully deleted the Pipeline: %s", pipelineId)
|
||||
}
|
||||
}
|
||||
} else if incRequest.Type == "PIPELINE_STOP" {
|
||||
log.Printf("[INFO] Should stop the pipeline %#v", identifier)
|
||||
pipelineId, err := searchPipeline(identifier)
|
||||
@@ -2260,7 +2258,7 @@ func createPipeline(command, identifier string) (string, error) {
|
||||
|
||||
if err != nil {
|
||||
if strings.Contains(fmt.Sprintf("%s", err), "no existing pipeline found") {
|
||||
log.Printf("[INFO] No existing pipeline found with name: %s. Creating a new one!", identifier)
|
||||
log.Printf("[INFO] No existing pipeline found with id: %s. Creating a new one!", identifier)
|
||||
} else {
|
||||
log.Printf("[ERROR] Failed to search for existing pipeline but continuing anyway : %s", err)
|
||||
}
|
||||
@@ -2286,7 +2284,6 @@ func createPipeline(command, identifier string) (string, error) {
|
||||
command = command[:startIndex] + baseUrl + command[endIndex:]
|
||||
}
|
||||
}
|
||||
|
||||
requestBody := map[string]interface{}{
|
||||
"definition": command,
|
||||
"name": identifier,
|
||||
|
||||
Reference in New Issue
Block a user