mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

chore: move ttl formats to constants (#7958)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
This commit is contained in:
Charles-Edouard Brétéché 2023-08-02 19:12:40 +02:00 • committed by GitHub
parent 4dee024f13
commit 329c11a058
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/kyverno/constants.go
View file

@ -16,4 +16,6 @@ const (
AnnotationPolicySeverity = "policies.kyverno.io/severity"
// Well known values
ValueKyvernoApp = "kyverno"
ValueTtlDateTimeLayout = "2006-01-02T150405Z"
ValueTtlDateLayout = "2006-01-02"
)

7
pkg/controllers/ttl/utils.go
View file

@ -5,6 +5,7 @@ import (
"time"
"github.com/go-logr/logr"
"github.com/kyverno/kyverno/api/kyverno"
checker "github.com/kyverno/kyverno/pkg/auth/checker"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -55,12 +56,10 @@ func parseDeletionTime(metaObj metav1.Object, deletionTime *time.Time, ttlValue
creationTime := metaObj.GetCreationTimestamp().Time
*deletionTime = creationTime.Add(ttlDuration)
} else {
layoutRFCC := "2006-01-02T150405Z"
// Try parsing ttlValue as a time in ISO 8601 format
*deletionTime, err = time.Parse(layoutRFCC, ttlValue)
*deletionTime, err = time.Parse(kyverno.ValueTtlDateTimeLayout, ttlValue)
if err != nil {
layoutCustom := "2006-01-02"
*deletionTime, err = time.Parse(layoutCustom, ttlValue)
*deletionTime, err = time.Parse(kyverno.ValueTtlDateLayout, ttlValue)
if err != nil {
return err
}

12
pkg/validation/ttl-label/validate.go
View file

@ -1,16 +1,18 @@
package ttllabel
import "time"
import (
"time"
"github.com/kyverno/kyverno/api/kyverno"
)
func Validate(ttlValue string) error {
_, err := time.ParseDuration(ttlValue)
if err != nil {
layoutRFCC := "2006-01-02T150405Z"
// Try parsing ttlValue as a time in ISO 8601 format
_, err := time.Parse(layoutRFCC, ttlValue)
_, err := time.Parse(kyverno.ValueTtlDateTimeLayout, ttlValue)
if err != nil {
layoutCustom := "2006-01-02"
_, err = time.Parse(layoutCustom, ttlValue)
_, err = time.Parse(kyverno.ValueTtlDateLayout, ttlValue)
if err != nil {
return err
}