From 0351372738dd8955178fc82d38e179b8db3b24b1 Mon Sep 17 00:00:00 2001
From: Rajula Vineet Reddy <rajula.vineet.reddy@cern.ch>
Date: Wed, 2 Nov 2022 10:35:59 +0100
Subject: [PATCH 1/2] Change load location to CET
---
controllers/drupalsite_controller_utils.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/controllers/drupalsite_controller_utils.go b/controllers/drupalsite_controller_utils.go
index 399597cc..f186f04c 100644
--- a/controllers/drupalsite_controller_utils.go
+++ b/controllers/drupalsite_controller_utils.go
@@ -205,7 +205,7 @@ func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *web
// Source site name from which the clone was requested
drp.Annotations["clonedFrom"] = string(drp.Spec.Configuration.CloneFrom)
// Set the time when the clone was requested
- loc, _ := time.LoadLocation("Europe/Zurich")
+ loc, _ := time.LoadLocation("CET")
drp.Annotations["clonedOn"] = time.Now().In(loc).Format("Jan 2 2006 3:04PM CET")
// Reset the `cloneFrom` field
drp.Spec.Configuration.CloneFrom = ""
--
GitLab
From 2f73590c168192fe43d95e7f9726fa0ad9bf915e Mon Sep 17 00:00:00 2001
From: Rajula Vineet Reddy <rajula.vineet.reddy@cern.ch>
Date: Wed, 2 Nov 2022 11:27:04 +0100
Subject: [PATCH 2/2] Install missing package to load locations for time
---
Dockerfile | 3 +++
controllers/drupalsite_controller_utils.go | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 87f0a7c7..218fa4f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,5 +30,8 @@ COPY --from=builder /workspace/manager .
# Pkg used for WebDAV password generation
RUN apk add --no-cache openssl
+# Pkg used for time locations
+RUN apk --no-cache add tzdata
+
USER 65532:65532
ENTRYPOINT ["/manager"]
diff --git a/controllers/drupalsite_controller_utils.go b/controllers/drupalsite_controller_utils.go
index f186f04c..399597cc 100644
--- a/controllers/drupalsite_controller_utils.go
+++ b/controllers/drupalsite_controller_utils.go
@@ -205,7 +205,7 @@ func (r *DrupalSiteReconciler) ensureSpecFinalizer(ctx context.Context, drp *web
// Source site name from which the clone was requested
drp.Annotations["clonedFrom"] = string(drp.Spec.Configuration.CloneFrom)
// Set the time when the clone was requested
- loc, _ := time.LoadLocation("CET")
+ loc, _ := time.LoadLocation("Europe/Zurich")
drp.Annotations["clonedOn"] = time.Now().In(loc).Format("Jan 2 2006 3:04PM CET")
// Reset the `cloneFrom` field
drp.Spec.Configuration.CloneFrom = ""
--
GitLab