[ws-manager-mk2] Add duration validation (#16687)

WVerlaek · web-flow · commit 311da7324cb1 · 2023-03-06T18:39:04.000+01:00
diff --git a/components/ws-manager-api/go/crd/v1/workspace_types.go b/components/ws-manager-api/go/crd/v1/workspace_types.go
@@ -88,6 +88,8 @@ type GitSpec struct {
 }
 
 type TimeoutSpec struct {
+	// +kubebuilder:validation:Type=string
+	// +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$"
 	Time *metav1.Duration `json:"time,omitempty"`
 }
 
diff --git a/components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_workspaces.yaml b/components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_workspaces.yaml
@@ -262,6 +262,7 @@ spec:
               timeout:
                 properties:
                   time:
+                    pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
                     type: string
                 type: object
               type:

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,8 @@ type GitSpec struct {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`type TimeoutSpec struct {`
	`91`	`+ // +kubebuilder:validation:Type=string`
	`92`	`+ // +kubebuilder:validation:Pattern="^([0-9]+(\\.[0-9]+)?(ms\|s\|m\|h))+$"`
`91`	`93`	Time *metav1.Duration `json:"time,omitempty"`
`92`	`94`	`}`
`93`	`95`