GoogleCloudPlatform
diff --git a/‎charts/operator/crds/monitoring.googleapis.com_clusternodemonitorings.yaml‎
Lines changed: 11 additions & 1 deletion b/‎charts/operator/crds/monitoring.googleapis.com_clusternodemonitorings.yaml‎
Lines changed: 11 additions & 1 deletion
@@ -64,7 +64,7 @@ spec:
                       default: 1m
                       description: Interval at which to scrape metrics. Must be a
                         valid Prometheus duration.
-                      pattern: ^((([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?|0)$
+                      format: duration
                       type: string
                     metricRelabeling:
                       description: |-
@@ -158,11 +158,15 @@ spec:
                       type: string
                     scheme:
                       description: Protocol scheme to use to scrape.
+                      enum:
+                      - http
+                      - https
                       type: string
                     timeout:
                       description: |-
                         Timeout for metrics scrapes. Must be a valid Prometheus duration.
                         Must not be larger then the scrape interval.
+                      format: duration
                       type: string
                     tls:
                       description: TLS configures the scrape request's TLS settings.
@@ -172,7 +176,13 @@ spec:
                             validation.
                           type: boolean
                       type: object
+                  required:
+                  - interval
                   type: object
+                  x-kubernetes-validations:
+                  - messageExpression: '''scrape timeout (%s) must not be greater
+                      than scrape interval (%s)''.format([self.timeout, self.interval])'
+                    rule: '!has(self.timeout) || self.timeout <= self.interval'
                 maxItems: 100
                 minItems: 1
                 type: array