From bcc4494b9a0798a444dc768b7cd6ee613d14de38 Mon Sep 17 00:00:00 2001 From: rmweir Date: Fri, 19 Jul 2019 17:12:47 -0700 Subject: [PATCH 1/2] Add timeout and wait to apps Added timeout and wait fields to apps. Prior, there was no way for rancher to utilize helm's timeout and wait flags. Now, values for these flags can be read from and assigned to their respective app fields. --- apis/project.cattle.io/v3/app_types.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apis/project.cattle.io/v3/app_types.go b/apis/project.cattle.io/v3/app_types.go index 0281b112..44103390 100644 --- a/apis/project.cattle.io/v3/app_types.go +++ b/apis/project.cattle.io/v3/app_types.go @@ -23,6 +23,8 @@ type AppSpec struct { ExternalID string `json:"externalId,omitempty"` Files map[string]string `json:"files,omitempty"` Answers map[string]string `json:"answers,omitempty"` + Wait bool `json:"wait,omitempty"` + Timeout int `json:"timeout,omitempty" norman:"min=1,default=300"` AppRevisionName string `json:"appRevisionName,omitempty" norman:"type=reference[/v3/project/schemas/apprevision]"` Prune bool `json:"prune,omitempty"` MultiClusterAppName string `json:"multiClusterAppName,omitempty" norman:"type=reference[/v3/schemas/multiclusterapp]"` From e254a9ecb73e2593ce6a8eca41e4fe2cdd8a4802 Mon Sep 17 00:00:00 2001 From: rmweir Date: Mon, 22 Jul 2019 16:50:28 -0700 Subject: [PATCH 2/2] go generate --- client/project/v3/zz_generated_app.go | 4 ++++ client/project/v3/zz_generated_app_spec.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/client/project/v3/zz_generated_app.go b/client/project/v3/zz_generated_app.go index 3d49671e..edf77d61 100644 --- a/client/project/v3/zz_generated_app.go +++ b/client/project/v3/zz_generated_app.go @@ -28,10 +28,12 @@ const ( AppFieldRemoved = "removed" AppFieldState = "state" AppFieldTargetNamespace = "targetNamespace" + AppFieldTimeout = "timeout" AppFieldTransitioning = "transitioning" AppFieldTransitioningMessage = "transitioningMessage" AppFieldUUID = "uuid" AppFieldValuesYaml = "valuesYaml" + AppFieldWait = "wait" ) type App struct { @@ -58,10 +60,12 @@ type App struct { Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` State string `json:"state,omitempty" yaml:"state,omitempty"` TargetNamespace string `json:"targetNamespace,omitempty" yaml:"targetNamespace,omitempty"` + Timeout int64 `json:"timeout,omitempty" yaml:"timeout,omitempty"` Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` UUID string `json:"uuid,omitempty" yaml:"uuid,omitempty"` ValuesYaml string `json:"valuesYaml,omitempty" yaml:"valuesYaml,omitempty"` + Wait bool `json:"wait,omitempty" yaml:"wait,omitempty"` } type AppCollection struct { diff --git a/client/project/v3/zz_generated_app_spec.go b/client/project/v3/zz_generated_app_spec.go index 4fb8b50e..ba7a8bc1 100644 --- a/client/project/v3/zz_generated_app_spec.go +++ b/client/project/v3/zz_generated_app_spec.go @@ -11,7 +11,9 @@ const ( AppSpecFieldProjectID = "projectId" AppSpecFieldPrune = "prune" AppSpecFieldTargetNamespace = "targetNamespace" + AppSpecFieldTimeout = "timeout" AppSpecFieldValuesYaml = "valuesYaml" + AppSpecFieldWait = "wait" ) type AppSpec struct { @@ -24,5 +26,7 @@ type AppSpec struct { ProjectID string `json:"projectId,omitempty" yaml:"projectId,omitempty"` Prune bool `json:"prune,omitempty" yaml:"prune,omitempty"` TargetNamespace string `json:"targetNamespace,omitempty" yaml:"targetNamespace,omitempty"` + Timeout int64 `json:"timeout,omitempty" yaml:"timeout,omitempty"` ValuesYaml string `json:"valuesYaml,omitempty" yaml:"valuesYaml,omitempty"` + Wait bool `json:"wait,omitempty" yaml:"wait,omitempty"` }