From d1896a695f5eb87569f35209b18b25d5c1bfa95f Mon Sep 17 00:00:00 2001 From: "Dlugolecki, Jakub" Date: Tue, 15 Nov 2016 08:23:19 +0100 Subject: [PATCH] Change ScheduledJob POD name suffix from hash to Unix Epoch --- pkg/controller/cronjob/BUILD | 1 - pkg/controller/cronjob/utils.go | 9 +++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkg/controller/cronjob/BUILD b/pkg/controller/cronjob/BUILD index 8b8bffde7b..28c985fa3c 100644 --- a/pkg/controller/cronjob/BUILD +++ b/pkg/controller/cronjob/BUILD @@ -32,7 +32,6 @@ go_library( "//pkg/runtime:go_default_library", "//pkg/types:go_default_library", "//pkg/util/errors:go_default_library", - "//pkg/util/hash:go_default_library", "//pkg/util/metrics:go_default_library", "//pkg/util/runtime:go_default_library", "//pkg/util/wait:go_default_library", diff --git a/pkg/controller/cronjob/utils.go b/pkg/controller/cronjob/utils.go index 500f239243..ebdfd199ee 100644 --- a/pkg/controller/cronjob/utils.go +++ b/pkg/controller/cronjob/utils.go @@ -19,7 +19,6 @@ package cronjob import ( "encoding/json" "fmt" - "hash/adler32" "time" "github.com/golang/glog" @@ -30,7 +29,6 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" - hashutil "k8s.io/kubernetes/pkg/util/hash" ) // Utilities for dealing with Jobs and CronJobs and time. @@ -200,10 +198,9 @@ func getJobFromTemplate(sj *batch.CronJob, scheduledTime time.Time) (*batch.Job, return job, nil } -func getTimeHash(scheduledTime time.Time) uint32 { - timeHasher := adler32.New() - hashutil.DeepHashObject(timeHasher, scheduledTime) - return timeHasher.Sum32() +// Return Unix Epoch Time +func getTimeHash(scheduledTime time.Time) int64 { + return scheduledTime.Unix() } // makeCreatedByRefJson makes a json string with an object reference for use in "created-by" annotation value