add protobuf and crd of timeout attribute

Signed-off-by: AhmedGrati <[email protected]>
argoproj · Jul 23, 2023 · 070bf61 · 070bf61
1 parent af6439a
commit 070bf61
Show file tree

Hide file tree

Showing 12 changed files with 578 additions and 514 deletions.
diff --git a/docs/features/kustomize/rollout_cr_schema.json b/docs/features/kustomize/rollout_cr_schema.json
@@ -4280,6 +4280,9 @@
                                                     },
                                                     "query": {
                                                         "type": "string"
+                                                    },
+                                                    "timeout": {
+                                                        "type": "integer"
                                                     }
                                                 },
                                                 "type": "object"
@@ -8670,6 +8673,9 @@
                                                     },
                                                     "query": {
                                                         "type": "string"
+                                                    },
+                                                    "timeout": {
+                                                        "type": "integer"
                                                     }
                                                 },
                                                 "type": "object"
@@ -13060,6 +13066,9 @@
                                                     },
                                                     "query": {
                                                         "type": "string"
+                                                    },
+                                                    "timeout": {
+                                                        "type": "integer"
                                                     }
                                                 },
                                                 "type": "object"

diff --git a/manifests/crds/analysis-run-crd.yaml b/manifests/crds/analysis-run-crd.yaml
@@ -2779,6 +2779,8 @@ spec:
                               type: object
                             query:
                               type: string
+                            timeout:
+                              type: integer
                           type: object
                         skywalking:
                           properties:

diff --git a/manifests/crds/analysis-template-crd.yaml b/manifests/crds/analysis-template-crd.yaml
@@ -2775,6 +2775,8 @@ spec:
                               type: object
                             query:
                               type: string
+                            timeout:
+                              type: integer
                           type: object
                         skywalking:
                           properties:

diff --git a/manifests/crds/cluster-analysis-template-crd.yaml b/manifests/crds/cluster-analysis-template-crd.yaml
@@ -2775,6 +2775,8 @@ spec:
                               type: object
                             query:
                               type: string
+                            timeout:
+                              type: integer
                           type: object
                         skywalking:
                           properties:

diff --git a/manifests/install.yaml b/manifests/install.yaml
@@ -2780,6 +2780,8 @@ spec:
                               type: object
                             query:
                               type: string
+                            timeout:
+                              type: integer
                           type: object
                         skywalking:
                           properties:
@@ -5739,6 +5741,8 @@ spec:
                               type: object
                             query:
                               type: string
+                            timeout:
+                              type: integer
                           type: object
                         skywalking:
                           properties:
@@ -8584,6 +8588,8 @@ spec:
                               type: object
                             query:
                               type: string
+                            timeout:
+                              type: integer
                           type: object
                         skywalking:
                           properties:

diff --git a/metricproviders/prometheus/prometheus.go b/metricproviders/prometheus/prometheus.go
@@ -156,7 +156,7 @@ func NewPrometheusProvider(api v1.API, logCtx log.Entry, metric v1alpha1.Metric)
 		return nil, errors.New("prometheus timeout should not be negative")
 	}
 
-	provider.Timeout = time.Duration(*metricTimeout * int(time.Second))
+	provider.Timeout = time.Duration(*metricTimeout * int64(time.Second))
 	return provider, nil
 }
 

diff --git a/metricproviders/prometheus/prometheus_test.go b/metricproviders/prometheus/prometheus_test.go
@@ -31,7 +31,7 @@ func TestType(t *testing.T) {
 	mock := mockAPI{
 		value: newScalar(10),
 	}
-	timeout := 5
+	timeout := int64(5)
 	metric := v1alpha1.Metric{
 		Name:             "foo",
 		SuccessCondition: "result == 10",
@@ -46,7 +46,7 @@ func TestType(t *testing.T) {
 	p, err := NewPrometheusProvider(mock, e, metric)
 	assert.NoError(t, err)
 	assert.Equal(t, ProviderType, p.Type())
-	assert.Equal(t, p.Timeout, time.Duration(timeout*int(time.Second)))
+	assert.Equal(t, p.Timeout, time.Duration(timeout*int64(time.Second)))
 }
 
 func TestRunSuccessfully(t *testing.T) {

diff --git a/pkg/apis/rollouts/v1alpha1/analysis_types.go b/pkg/apis/rollouts/v1alpha1/analysis_types.go
@@ -215,7 +215,7 @@ type PrometheusMetric struct {
 	Authentication PrometheusAuth `json:"authentication,omitempty" protobuf:"bytes,3,opt,name=authentication"`
 	// Timeout represents the duration within which a prometheus query should complete. It is expressed in seconds.
 	// +optional
-	Timeout *int `json:"timeout,omitempty" protobuf:"bytes,4,opt,name=timeout"`
+	Timeout *int64 `json:"timeout,omitempty" protobuf:"bytes,4,opt,name=timeout"`
 }
 
 // PrometheusMetric defines the prometheus query to perform canary analysis