Add runfn implementation with timeout support

Allows to limit execution time of KRM function. Change-Id: I7fd8d97492512c6c5033375429906a1268f3818e Signed-off-by: Ruslan Aliev <[email protected]> Closes: #544 Closes: #545 Closes: #597
airshipit · Nov 17, 2021 · d0e2f6d · d0e2f6d
1 parent 1aab57a
commit d0e2f6d
Show file tree

Hide file tree

Showing 8 changed files with 1,873 additions and 1 deletion.
diff --git a/manifests/function/airshipctl-schemas/airshipit.org_genericcontainers.yaml b/manifests/function/airshipctl-schemas/airshipit.org_genericcontainers.yaml
@@ -149,6 +149,12 @@ spec:
                   parameter is specified. Else it will write output to STDOUT. This
                   path relative to current site root.
                 type: string
+              timeout:
+                description: Timeout is the maximum amount of time (in seconds) for
+                  container execution if not specified (0) no timeout will be set
+                  and container could run indefinitely
+                format: int64
+                type: integer
               type:
                 description: Supported types are "airship" and "krm"
                 type: string

diff --git a/pkg/api/v1alpha1/genericcontainer_types.go b/pkg/api/v1alpha1/genericcontainer_types.go
@@ -95,6 +95,10 @@ type GenericContainerSpec struct {
 
 	// Mounts are the storage or directories to mount into the container
 	StorageMounts []StorageMount `json:"mounts,omitempty" yaml:"mounts,omitempty"`
+
+	// Timeout is the maximum amount of time (in seconds) for container execution
+	// if not specified (0) no timeout will be set and container could run indefinitely
+	Timeout uint64 `json:"timeout,omitempty"`
 }
 
 // AirshipContainerSpec airship container settings

diff --git a/pkg/container/api.go b/pkg/container/api.go
@@ -28,11 +28,11 @@ import (
 	"github.com/ahmetb/dlog"
 	"sigs.k8s.io/kustomize/kyaml/fn/runtime/runtimeutil"
 	"sigs.k8s.io/kustomize/kyaml/kio"
-	"sigs.k8s.io/kustomize/kyaml/runfn"
 	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
 	"sigs.k8s.io/yaml"
 
 	"opendev.org/airship/airshipctl/pkg/api/v1alpha1"
+	"opendev.org/airship/airshipctl/pkg/container/runfn"
 	"opendev.org/airship/airshipctl/pkg/log"
 	"opendev.org/airship/airshipctl/pkg/util"
 )
@@ -228,6 +228,7 @@ func (c *V1Alpha1) runKRM() error {
 		Output:                c.output,
 		StorageMounts:         mounts,
 		ContinueOnEmptyResult: true,
+		Timeout:               c.conf.Spec.Timeout,
 	}
 	function, err := kyaml.Parse(c.conf.Config)
 	if err != nil {