diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-06 10:46:03 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-06 10:46:03 +0100 |
| commit | 5ced761ebdcb0579377e338c2e321e4ba0373336 (patch) | |
| tree | d67cc381586fa755fc16809565c4174c6ca28bf0 /app | |
| parent | f71df9f536cc99f5e1626dae7dfe0ab15f7bd258 (diff) | |
| parent | 638c616296b37b528c1b56f63a818301a502f7aa (diff) | |
| download | gitlab-ce-5ced761ebdcb0579377e338c2e321e4ba0373336.tar.gz | |
Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
* 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' of https://gitlab.com/gitlab-org/gitlab-ce:
Use utc for time comparision
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/wait_for_cluster_creation_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/wait_for_cluster_creation_worker.rb b/app/workers/wait_for_cluster_creation_worker.rb index eab340070e1..5aa3bbdaa9d 100644 --- a/app/workers/wait_for_cluster_creation_worker.rb +++ b/app/workers/wait_for_cluster_creation_worker.rb @@ -11,7 +11,7 @@ class WaitForClusterCreationWorker Ci::FetchGcpOperationService.new.execute(cluster) do |operation| case operation.status when 'RUNNING' - if TIMEOUT < Time.zone.now - operation.start_time.to_time + if TIMEOUT < Time.now.utc - operation.start_time.to_time.utc return cluster.make_errored!("Cluster creation time exceeds timeout; #{TIMEOUT}") end |