From 98c055d985495916ad84fc385c989c5cfc602a72 Mon Sep 17 00:00:00 2001
From: enzo <e.radnai@hotmail.fr>
Date: Tue, 25 Jan 2022 11:48:47 +0100
Subject: [PATCH] fix: switch to UTC on every check

---
 charts/pleco/Chart.yaml      | 4 ++--
 charts/pleco/values.yaml     | 2 +-
 cmd/version.go               | 2 +-
 pkg/common/minio.go          | 2 +-
 pkg/do/volumes_root.go       | 2 +-
 pkg/scaleway/cr_root.go      | 2 +-
 pkg/scaleway/volumes_root.go | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/pleco/Chart.yaml b/charts/pleco/Chart.yaml
index eb15b8b..d03bd35 100644
--- a/charts/pleco/Chart.yaml
+++ b/charts/pleco/Chart.yaml
@@ -3,6 +3,6 @@ name: pleco
 description: Automatically removes Cloud managed services and Kubernetes resources based on tags with TTL
 type: application
 home: https://github.com/Qovery/pleco
-version: 0.9.35
-appVersion: 0.9.35
+version: 0.9.36
+appVersion: 0.9.36
 icon: https://github.com/Qovery/pleco/raw/main/assets/pleco_logo.png
diff --git a/charts/pleco/values.yaml b/charts/pleco/values.yaml
index cfe6513..c247e6e 100644
--- a/charts/pleco/values.yaml
+++ b/charts/pleco/values.yaml
@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   repository: qoveryrd/pleco
   pullPolicy: IfNotPresent
-  plecoImageTag: "0.9.35"
+  plecoImageTag: "0.9.36"
 
 cloudProvider: ""
 
diff --git a/cmd/version.go b/cmd/version.go
index 8fabee4..021d0da 100644
--- a/cmd/version.go
+++ b/cmd/version.go
@@ -19,5 +19,5 @@ func init() {
 }
 
 func GetCurrentVersion() string {
-	return "0.9.35" // ci-version-check
+	return "0.9.36" // ci-version-check
 }
diff --git a/pkg/common/minio.go b/pkg/common/minio.go
index 728c503..d7e9832 100644
--- a/pkg/common/minio.go
+++ b/pkg/common/minio.go
@@ -55,7 +55,7 @@ func GetExpiredBuckets(bucketApi *minio.Client, tagName string, region string) [
 
 	expiredBuckets := []MinioBucket{}
 	for _, bucket := range buckets {
-		if bucket.CreationDate.Add(2*time.Hour).Before(time.Now()) {
+		if bucket.CreationDate.UTC().Add(2 * time.Hour).Before(time.Now().UTC()) {
 			expiredBuckets = append(expiredBuckets, bucket)
 		}
 	}
diff --git a/pkg/do/volumes_root.go b/pkg/do/volumes_root.go
index d63e321..0d38392 100644
--- a/pkg/do/volumes_root.go
+++ b/pkg/do/volumes_root.go
@@ -60,7 +60,7 @@ func getDetachedVolumes(client *godo.Client, region string) []DOVolume {
 
 	detachedVolumes := []DOVolume{}
 	for _, volume := range volumes {
-		if volume.CreationDate.Add(volumeTimeout() * time.Hour).Before(time.Now()) {
+		if volume.CreationDate.UTC().Add(volumeTimeout() * time.Hour).Before(time.Now().UTC()) {
 			detachedVolumes = append(detachedVolumes, volume)
 		}
 	}
diff --git a/pkg/scaleway/cr_root.go b/pkg/scaleway/cr_root.go
index fbcb847..6da19fd 100644
--- a/pkg/scaleway/cr_root.go
+++ b/pkg/scaleway/cr_root.go
@@ -41,7 +41,7 @@ func getEmptyRegistries(registryAPI *registry.API) ([]*registry.Namespace, strin
 
 	emptyRegistries := []*registry.Namespace{}
 	for _, reg := range registries {
-		if reg.ImageCount == 0 && reg.CreatedAt.Add(time.Hour).After(time.Now()) {
+		if reg.ImageCount == 0 && reg.CreatedAt.UTC().Add(time.Hour).After(time.Now().UTC()) {
 			emptyRegistries = append(emptyRegistries, reg)
 		}
 	}
diff --git a/pkg/scaleway/volumes_root.go b/pkg/scaleway/volumes_root.go
index 9c647d9..d317ea8 100644
--- a/pkg/scaleway/volumes_root.go
+++ b/pkg/scaleway/volumes_root.go
@@ -66,7 +66,7 @@ func getDetachedVolumes(volumeAPI *instance.API, zone string) []ScalewayVolume {
 
 	detachedVolumes := []ScalewayVolume{}
 	for _, volume := range volumes {
-		if volume.UpdatedAt.Add(volumeTimeout()*time.Hour).Before(time.Now()) && volume.ServerId == "null" {
+		if volume.UpdatedAt.UTC().Add(volumeTimeout()*time.Hour).Before(time.Now().UTC()) && volume.ServerId == "null" {
 			detachedVolumes = append(detachedVolumes, volume)
 		}
 	}