Skip to content

Commit

Permalink
Regenerate docs and tests after merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
@tejal29
tejal29 committed Apr 29, 2019
1 parent 46ee1a7 commit e704e4e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 9 deletions.
2 changes: 1 addition & 1 deletion cmd/skaffold/app/cmd/flags_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestAddFlags(t *testing.T) {
{
description: "union of anotations",
annotations: map[string]string{"cleanup": "true", "test": "true"},
expectedFlags: []string{"skip-tests", "cleanup", "port-forward", "no-prune"},
expectedFlags: []string{"skip-tests", "cleanup", "no-prune"},
},
}

Expand Down
27 changes: 19 additions & 8 deletions docs/content/en/schemas/v1beta9.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,8 @@
},
"tagPolicy": {
"$ref": "#/definitions/TagPolicy",
"description": "*beta* determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to `gitCommit: {}`.",
"x-intellij-html-description": "<em>beta</em> determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to <code>gitCommit: {}</code>."
"description": "*beta* determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to `gitCommit: {variant: Tags}`.",
"x-intellij-html-description": "<em>beta</em> determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to <code>gitCommit: {variant: Tags}</code>."
}
},
"preferredOrder": [
Expand Down Expand Up @@ -392,8 +392,8 @@
},
"tagPolicy": {
"$ref": "#/definitions/TagPolicy",
"description": "*beta* determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to `gitCommit: {}`.",
"x-intellij-html-description": "<em>beta</em> determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to <code>gitCommit: {}</code>."
"description": "*beta* determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to `gitCommit: {variant: Tags}`.",
"x-intellij-html-description": "<em>beta</em> determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to <code>gitCommit: {variant: Tags}</code>."
}
},
"preferredOrder": [
Expand Down Expand Up @@ -430,8 +430,8 @@
},
"tagPolicy": {
"$ref": "#/definitions/TagPolicy",
"description": "*beta* determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to `gitCommit: {}`.",
"x-intellij-html-description": "<em>beta</em> determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to <code>gitCommit: {}</code>."
"description": "*beta* determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to `gitCommit: {variant: Tags}`.",
"x-intellij-html-description": "<em>beta</em> determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to <code>gitCommit: {variant: Tags}</code>."
}
},
"preferredOrder": [
Expand Down Expand Up @@ -468,8 +468,8 @@
},
"tagPolicy": {
"$ref": "#/definitions/TagPolicy",
"description": "*beta* determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to `gitCommit: {}`.",
"x-intellij-html-description": "<em>beta</em> determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to <code>gitCommit: {}</code>."
"description": "*beta* determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to `gitCommit: {variant: Tags}`.",
"x-intellij-html-description": "<em>beta</em> determines how images are tagged. A few strategies are provided here, although you most likely won't need to care! If not specified, it defaults to <code>gitCommit: {variant: Tags}</code>."
}
},
"preferredOrder": [
Expand Down Expand Up @@ -691,6 +691,17 @@
"x-intellij-html-description": "<em>beta</em> tags images with a configurable template string."
},
"GitTagger": {
"properties": {
"variant": {
"type": "string",
"description": "determines the behavior of the git tagger. Valid variants are `Tags` (default): use git tags or fall back to abbreviated commit hash. `CommitSha`: use the full git commit sha. `AbbrevCommitSha`: use the abbreviated git commit sha.",
"x-intellij-html-description": "determines the behavior of the git tagger. Valid variants are <code>Tags</code> (default): use git tags or fall back to abbreviated commit hash. <code>CommitSha</code>: use the full git commit sha. <code>AbbrevCommitSha</code>: use the abbreviated git commit sha."
}
},
"preferredOrder": [
"variant"
],
"additionalProperties": false,
"description": "*beta* tags images with the git tag or commit of the artifact's workspace.",
"x-intellij-html-description": "<em>beta</em> tags images with the git tag or commit of the artifact's workspace."
},
Expand Down

0 comments on commit e704e4e

Please sign in to comment.