Merge pull request #46 from deliveroo/revert-45-CPR-569/add-cleanup-p…

…ods-command Revert "CPR-569: New command to delete all finished pods"
deliveroo · Jun 22, 2020 · 08e61d7 · 08e61d7
2 parents 0655d7a + aa98113
commit 08e61d7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 98 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.6-test
+0.21.3
diff --git a/cli/cleanup/cmd.go b/cli/cleanup/cmd.go
diff --git a/cli/cleanup/pods.go b/cli/cleanup/pods.go
diff --git a/cli/pipeline/template.go b/cli/pipeline/template.go
@@ -3,10 +3,8 @@ package pipeline
 import (
 	"bytes"
 	"fmt"
-	"strconv"
 	"strings"
 	"text/template"
-	"time"
 )
 
 type PodSecret struct {
@@ -193,8 +191,7 @@ func NewPodDefinition(pipelineDefinition *PipelineDefinition, pipelineDefinition
 	stepName := sanitizeName(pipelineDefinitionStep.Step)
 	branchName := sanitizeName(pipelineDefinitionStep.Branch)
 	stepVersion := sanitizeName(pipelineDefinitionStep.Version)
-	timestamp := strconv.Itoa(int(time.Now().UTC().Unix()))
-	podName := fmt.Sprintf("%s-%s-%s-%s-%s", sanitizeName(pipelineDefinition.Pipeline), sanitizeName(pipelineDefinitionStep.Version), stepName, branchName, timestamp[len(timestamp)-4:])
+	podName := fmt.Sprintf("%s-%s-%s-%s", sanitizeName(pipelineDefinition.Pipeline), sanitizeName(pipelineDefinitionStep.Version), stepName, branchName)
 
 	return &PodDefinition{
 		PodName:         podName,

diff --git a/cli/root.go b/cli/root.go
@@ -17,7 +17,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/deliveroo/paddle/cli/cleanup"
 	"github.com/deliveroo/paddle/cli/data"
 	"github.com/deliveroo/paddle/cli/pipeline"
 	"github.com/deliveroo/paddle/cli/steps"
@@ -59,7 +58,6 @@ func init() {
 	RootCmd.AddCommand(data.DataCmd)
 	RootCmd.AddCommand(pipeline.PipelineCmd)
 	RootCmd.AddCommand(steps.StepsCmd)
-	RootCmd.AddCommand(cleanup.CleanUpCmd)
 }
 
 // initConfig reads in config file and ENV variables if set.