rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-07-16 06:25:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #911 from rmweir/wait-timeout-fix

Browse Source 
Wait timeout fix
This commit is contained in:
Dan Ramich 2019-07-25 10:01:25 -07:00 committed by GitHub
commit 839eead94c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/project.cattle.io/v3/app_types.go
View File

@ -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]"`

4
client/project/v3/zz_generated_app.go
View File

@ -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 {

4
client/project/v3/zz_generated_app_spec.go
View File

@ -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"`
}