Skip to content

Commit

Permalink
fix: apply duration validation to all resync periods
Browse files Browse the repository at this point in the history
  • Loading branch information
@pb82
pb82 committed Apr 23, 2024
1 parent aa532c3 commit e146e69
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 16 deletions.
4 changes: 4 additions & 0 deletions api/v1beta1/grafanadashboard_types.go
View file
Expand Up @@ -94,6 +94,10 @@ type GrafanaDashboardSpec struct {

// how often the dashboard is refreshed, defaults to 5m if not set
// +optional
// +kubebuilder:validation:Type=string
// +kubebuilder:validation:Format=duration
// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$"
// +kubebuilder:default="5m"
ResyncPeriod string `json:"resyncPeriod,omitempty"`

// maps required data sources to existing ones
Expand Down
4 changes: 4 additions & 0 deletions api/v1beta1/grafanadatasource_types.go
View file
Expand Up @@ -75,6 +75,10 @@ type GrafanaDatasourceSpec struct {

// how often the datasource is refreshed, defaults to 5m if not set
// +optional
// +kubebuilder:validation:Type=string
// +kubebuilder:validation:Format=duration
// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$"
// +kubebuilder:default="5m"
ResyncPeriod string `json:"resyncPeriod,omitempty"`

// allow to import this resources from an operator in a different namespace
Expand Down
4 changes: 4 additions & 0 deletions api/v1beta1/grafanafolder_types.go
View file
Expand Up @@ -45,6 +45,10 @@ type GrafanaFolderSpec struct {

// how often the folder is synced, defaults to 5m if not set
// +optional
// +kubebuilder:validation:Type=string
// +kubebuilder:validation:Format=duration
// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$"
// +kubebuilder:default="5m"
ResyncPeriod string `json:"resyncPeriod,omitempty"`
}

Expand Down
7 changes: 3 additions & 4 deletions api/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/crd/bases/grafana.integreatly.org_grafanaalertrulegroups.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanaalertrulegroups.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/grafana.integreatly.org_grafanacontactpoints.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanacontactpoints.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down
5 changes: 4 additions & 1 deletion config/crd/bases/grafana.integreatly.org_grafanadashboards.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanadashboards.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down Expand Up @@ -202,6 +202,9 @@ spec:
type: object
type: array
resyncPeriod:
default: 5m
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
url:
type: string
Expand Down
5 changes: 4 additions & 1 deletion config/crd/bases/grafana.integreatly.org_grafanadatasources.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanadatasources.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down Expand Up @@ -110,6 +110,9 @@ spec:
type: object
type: array
resyncPeriod:
default: 5m
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
valuesFrom:
items:
Expand Down
5 changes: 4 additions & 1 deletion config/crd/bases/grafana.integreatly.org_grafanafolders.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanafolders.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down Expand Up @@ -62,6 +62,9 @@ spec:
permissions:
type: string
resyncPeriod:
default: 5m
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
title:
type: string
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/grafana.integreatly.org_grafanas.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanas.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanaalertrulegroups.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanaalertrulegroups.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanacontactpoints.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanacontactpoints.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down
5 changes: 4 additions & 1 deletion deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadashboards.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanadashboards.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down Expand Up @@ -202,6 +202,9 @@ spec:
type: object
type: array
resyncPeriod:
default: 5m
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
url:
type: string
Expand Down
5 changes: 4 additions & 1 deletion deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanadatasources.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanadatasources.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down Expand Up @@ -110,6 +110,9 @@ spec:
type: object
type: array
resyncPeriod:
default: 5m
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
valuesFrom:
items:
Expand Down
5 changes: 4 additions & 1 deletion deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanafolders.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanafolders.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down Expand Up @@ -62,6 +62,9 @@ spec:
permissions:
type: string
resyncPeriod:
default: 5m
format: duration
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
type: string
title:
type: string
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/grafana-operator/crds/grafana.integreatly.org_grafanas.yaml
View file
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.12.0
name: grafanas.grafana.integreatly.org
spec:
group: grafana.integreatly.org
Expand Down

0 comments on commit e146e69

Please sign in to comment.