Merge pull request #534 from kartverket/skipjob-tz

SKIPJob[cron]: add support for timezone

api/v1alpha1/skipjob_types.go

@@ -175,6 +175,14 @@ type CronSettings struct {
 	//+kubebuilder:validation:Required
 	Schedule string `json:"schedule"`
 
+	// The time zone name for the given schedule, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones. If not specified,
+	// this will default to the time zone of the cluster.
+	//
+	// Example: "Europe/Oslo"
+	//
+	// +kubebuilder:validation:Optional
+	TimeZone *string `json:"timeZone,omitempty"`
+
 	// Denotes the deadline in seconds for starting a job on its schedule, if for some reason the Job's controller was not ready upon the scheduled time.
 	// If unset, Jobs missing their deadline will be considered failed jobs and will not start.
 	//

config/crd/skiperator.kartverket.no_skipjobs.yaml

@@ -780,6 +780,13 @@ spec:
                       If set to true, this tells Kubernetes to suspend this Job till the field is set to false. If the Job is active while this field is set to true,
                       all running Pods will be terminated.
                     type: boolean
+                  timeZone:
+                    description: |-
+                      The time zone name for the given schedule, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones. If not specified,
+                      this will default to the time zone of the cluster.
+
+                      Example: "Europe/Oslo"
+                    type: string
                 required:
                 - schedule
                 type: object

pkg/resourcegenerator/job/job.go

@@ -57,6 +57,7 @@ func Generate(r reconciliation.Reconciliation) error {
 func getCronJobSpec(skipJob *skiperatorv1alpha1.SKIPJob, selector *metav1.LabelSelector, podLabels map[string]string, gcpIdentityConfigMap *corev1.ConfigMap) batchv1.CronJobSpec {
 	spec := batchv1.CronJobSpec{
 		Schedule:                skipJob.Spec.Cron.Schedule,
+		TimeZone:                skipJob.Spec.Cron.TimeZone,
 		StartingDeadlineSeconds: skipJob.Spec.Cron.StartingDeadlineSeconds,
 		ConcurrencyPolicy:       skipJob.Spec.Cron.ConcurrencyPolicy,
 		Suspend:                 skipJob.Spec.Cron.Suspend,

tests/skipjob/cron-job-timezone/chainsaw-test.yaml

@@ -0,0 +1,14 @@
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: cron-job-timezone
+spec:
+  skip: false
+  concurrent: true
+  skipDelete: false
+  steps:
+    - try:
+        - apply:
+            file: skipjob.yaml
+        - assert:
+            file: skipjob-assert.yaml

tests/skipjob/cron-job-timezone/skipjob-assert.yaml

@@ -0,0 +1,64 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: cron-job-timezone-skipjob
+  labels:
+    skiperator.kartverket.no/skipjob: "true"
+    skiperator.kartverket.no/skipjobName: cron-job-timezone
+    app.kubernetes.io/managed-by: "skiperator"
+    skiperator.kartverket.no/controller: "skipjob"
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: cron-job-timezone
+  labels:
+    skiperator.kartverket.no/skipjob: "true"
+    skiperator.kartverket.no/skipjobName: cron-job-timezone
+    app.kubernetes.io/managed-by: "skiperator"
+    skiperator.kartverket.no/controller: "skipjob"
+  ownerReferences:
+    - apiVersion: skiperator.kartverket.no/v1alpha1
+      blockOwnerDeletion: true
+      controller: true
+      kind: SKIPJob
+      name: cron-job-timezone
+spec:
+  schedule: "* * * * *"
+  timeZone: "Europe/Oslo"
+  concurrencyPolicy: Allow
+  suspend: false
+  successfulJobsHistoryLimit: 3
+  failedJobsHistoryLimit: 1
+  jobTemplate:
+    metadata:
+      labels:
+        app: cron-job-timezone-skipjob
+        skiperator.kartverket.no/skipjob: "true"
+        skiperator.kartverket.no/skipjobName: cron-job-timezone
+        app.kubernetes.io/managed-by: "skiperator"
+        skiperator.kartverket.no/controller: "skipjob"
+    spec:
+      template:
+        metadata:
+          labels:
+            app: cron-job-timezone-skipjob
+        spec:
+          containers:
+            - name: cron-job-timezone-skipjob
+              image: "perl:5.34.0"
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    app: cron-job-timezone-skipjob
+    app.kubernetes.io/managed-by: skiperator
+    skiperator.kartverket.no/controller: skipjob
+    skiperator.kartverket.no/skipjob: 'true'
+    skiperator.kartverket.no/skipjobName: cron-job-timezone
+  ownerReferences:
+    - apiVersion: batch/v1
+      kind: Job
+      controller: true
+      blockOwnerDeletion: true

tests/skipjob/cron-job-timezone/skipjob.yaml

@@ -0,0 +1,15 @@
+apiVersion: skiperator.kartverket.no/v1alpha1
+kind: SKIPJob
+metadata:
+  name: cron-job-timezone
+spec:
+  container:
+    image: "perl:5.34.0"
+    command:
+      - "perl"
+      - "-Mbignum=bpi"
+      - "-wle"
+      - "print bpi(2000)"
+  cron:
+    schedule: "* * * * *"
+    timeZone: "Europe/Oslo"