Add timeout for each step of ES ops request (#742)

Signed-off-by: kamolhasan <kamol@appscode.com>
kubedb · Jun 5, 2021 · 29627ec · 29627ec
1 parent cc6b969
commit 29627ec
Show file tree

Hide file tree

Showing 9 changed files with 335 additions and 257 deletions.
diff --git a/apis/ops/v1alpha1/elasticsearch_ops_types.go b/apis/ops/v1alpha1/elasticsearch_ops_types.go
@@ -69,6 +69,8 @@ type ElasticsearchOpsRequestSpec struct {
 	TLS *TLSSpec `json:"tls,omitempty" protobuf:"bytes,8,opt,name=tls"`
 	// Specifies information necessary for restarting database
 	Restart *RestartSpec `json:"restart,omitempty" protobuf:"bytes,9,opt,name=restart"`
+	// Timeout for each step of the ops request in second. If a step doesn't finish within the specified timeout, the ops request will result in failure.
+	Timeout *metav1.Duration `json:"timeout,omitempty" protobuf:"bytes,10,opt,name=timeout"`
 }
 
 type ElasticsearchUpgradeSpec struct {

diff --git a/apis/ops/v1alpha1/generated.pb.go b/apis/ops/v1alpha1/generated.pb.go
diff --git a/apis/ops/v1alpha1/generated.proto b/apis/ops/v1alpha1/generated.proto
diff --git a/apis/ops/v1alpha1/openapi_generated.go b/apis/ops/v1alpha1/openapi_generated.go
diff --git a/apis/ops/v1alpha1/zz_generated.deepcopy.go b/apis/ops/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/bindata.go b/crds/bindata.go
diff --git a/crds/ops.kubedb.com_elasticsearchopsrequests.v1.yaml b/crds/ops.kubedb.com_elasticsearchopsrequests.v1.yaml
@@ -69,6 +69,8 @@ spec:
                 type: object
               restart:
                 type: object
+              timeout:
+                type: string
               tls:
                 properties:
                   certificates:

diff --git a/crds/ops.kubedb.com_elasticsearchopsrequests.yaml b/crds/ops.kubedb.com_elasticsearchopsrequests.yaml
@@ -70,6 +70,8 @@ spec:
               type: object
             restart:
               type: object
+            timeout:
+              type: string
             tls:
               properties:
                 certificates:

diff --git a/openapi/swagger.json b/openapi/swagger.json
@@ -31713,6 +31713,10 @@
           "description": "Specifies information necessary for restarting database",
           "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.RestartSpec"
         },
+        "timeout": {
+          "description": "Timeout for each step of the ops request in second. If a step doesn't finish within the specified timeout, the ops request will result in failure.",
+          "$ref": "#/definitions/io.k8s.apimachinery.pkg.apis.meta.v1.Duration"
+        },
         "tls": {
           "description": "Specifies information necessary for configuring TLS",
           "$ref": "#/definitions/dev.kubedb.apimachinery.apis.ops.v1alpha1.TLSSpec"