Fix fernet rotation timestamp comparison

xek · xek · commit d7fe24dd0d6d · 2024-10-18T12:06:29.000+02:00
diff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go
@@ -1384,7 +1384,7 @@ func (r *KeystoneAPIReconciler) ensureFernetKeys(
 
 		if err != nil {
 			secret.Annotations[fernetAnnotation] = now.Format(time.RFC3339)
-		} else if rotatedAt.AddDate(0, 0, duration).After(now) {
+		} else if rotatedAt.AddDate(0, 0, duration).Before(now) {
 			secret.Data[extraKey] = secret.Data["FernetKeys0"]
 			secret.Data["FernetKeys0"] = []byte(keystone.GenerateFernetKey())
 		}

Original file line number	Diff line number	Diff line change
`@@ -1384,7 +1384,7 @@ func (r *KeystoneAPIReconciler) ensureFernetKeys(`
`1384`	`1384`
`1385`	`1385`	`if err != nil {`
`1386`	`1386`	`secret.Annotations[fernetAnnotation] = now.Format(time.RFC3339)`
`1387`		`- } else if rotatedAt.AddDate(0, 0, duration).After(now) {`
	`1387`	`+ } else if rotatedAt.AddDate(0, 0, duration).Before(now) {`
`1388`	`1388`	`secret.Data[extraKey] = secret.Data["FernetKeys0"]`
`1389`	`1389`	`secret.Data["FernetKeys0"] = []byte(keystone.GenerateFernetKey())`
`1390`	`1390`	`}`