Apply default requests / limits via kubebuilder / openapi defaults

J12934 · J12934 · commit ed773bb3c755 · 2022-09-10T11:27:42.000+02:00
Signed-off-by: Jannik Hollenbach &lt;jannik@hollenbach.de&gt;
diff --git a/operator/apis/execution/v1/parsedefinition_types.go b/operator/apis/execution/v1/parsedefinition_types.go
@@ -43,6 +43,7 @@ type ParseDefinitionSpec struct {
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 
 	// Resources lets you control resource limits and requests for the parser container. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+	// +kubebuilder:default={requests:{cpu:"200m",memory:"100Mi"},limits:{cpu:"400m",memory:"200Mi"}}
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 }
 
diff --git a/operator/apis/execution/v1/scancompletionhook_types.go b/operator/apis/execution/v1/scancompletionhook_types.go
@@ -61,6 +61,7 @@ type ScanCompletionHookSpec struct {
 	TTLSecondsAfterFinished *int32 `json:"ttlSecondsAfterFinished,omitempty"`
 
 	// Resources lets you control resource limits and requests for the parser container. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
+	// +kubebuilder:default={requests:{cpu:"200m",memory:"100Mi"},limits:{cpu:"400m",memory:"200Mi"}}
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 }
 
diff --git a/operator/config/crd/bases/execution.securecodebox.io_parsedefinitions.yaml b/operator/config/crd/bases/execution.securecodebox.io_parsedefinitions.yaml
@@ -987,6 +987,13 @@ spec:
                   type: object
                 type: array
               resources:
+                default:
+                  limits:
+                    cpu: 400m
+                    memory: 200Mi
+                  requests:
+                    cpu: 200m
+                    memory: 100Mi
                 description: Resources lets you control resource limits and requests
                   for the parser container. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                 properties:
diff --git a/operator/config/crd/bases/execution.securecodebox.io_scancompletionhooks.yaml b/operator/config/crd/bases/execution.securecodebox.io_scancompletionhooks.yaml
@@ -1003,6 +1003,13 @@ spec:
                   hooks will be launched in parallel.
                 type: integer
               resources:
+                default:
+                  limits:
+                    cpu: 400m
+                    memory: 200Mi
+                  requests:
+                    cpu: 200m
+                    memory: 100Mi
                 description: Resources lets you control resource limits and requests
                   for the parser container. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                 properties:
diff --git a/operator/crds/execution.securecodebox.io_parsedefinitions.yaml b/operator/crds/execution.securecodebox.io_parsedefinitions.yaml
@@ -1118,6 +1118,13 @@ spec:
                     type: object
                   type: array
                 resources:
+                  default:
+                    limits:
+                      cpu: 400m
+                      memory: 200Mi
+                    requests:
+                      cpu: 200m
+                      memory: 100Mi
                   description:
                     Resources lets you control resource limits and requests
                     for the parser container. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
diff --git a/operator/crds/execution.securecodebox.io_scancompletionhooks.yaml b/operator/crds/execution.securecodebox.io_scancompletionhooks.yaml
@@ -1136,6 +1136,13 @@ spec:
                     hooks will be launched in parallel.
                   type: integer
                 resources:
+                  default:
+                    limits:
+                      cpu: 400m
+                      memory: 200Mi
+                    requests:
+                      cpu: 200m
+                      memory: 100Mi
                   description:
                     Resources lets you control resource limits and requests
                     for the parser container. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ type ParseDefinitionSpec struct {`
`43`	`43`	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
`44`	`44`
`45`	`45`	`// Resources lets you control resource limits and requests for the parser container. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/`
	`46`	`+ // +kubebuilder:default={requests:{cpu:"200m",memory:"100Mi"},limits:{cpu:"400m",memory:"200Mi"}}`
`46`	`47`	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
`47`	`48`	`}`
`48`	`49`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ type ScanCompletionHookSpec struct {`
`61`	`61`	TTLSecondsAfterFinished *int32 `json:"ttlSecondsAfterFinished,omitempty"`
`62`	`62`
`63`	`63`	`// Resources lets you control resource limits and requests for the parser container. See https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/`
	`64`	`+ // +kubebuilder:default={requests:{cpu:"200m",memory:"100Mi"},limits:{cpu:"400m",memory:"200Mi"}}`
`64`	`65`	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
`65`	`66`	`}`
`66`	`67`