Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-21 00:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #714 from fluxcd/tag-filter

Browse Source
This commit is contained in:
Hidde Beydals
2021-01-15 12:32:07 +01:00
committed by GitHub
parent 36bafa23df bcdce02b78
commit 6a7f1e7d48
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/flux/create_image_policy.go
View File

@@ -40,6 +40,7 @@ the status of the object.`,
type imagePolicyFlags struct {
imageRef string
semver string
filterRegex string
}
var imagePolicyArgs = imagePolicyFlags{}
@@ -48,6 +49,7 @@ func init() {
flags := createImagePolicyCmd.Flags()
flags.StringVar(&imagePolicyArgs.imageRef, "image-ref", "", "the name of an image repository object")
flags.StringVar(&imagePolicyArgs.semver, "semver", "", "a semver range to apply to tags; e.g., '1.x'")
flags.StringVar(&imagePolicyArgs.filterRegex, "filter-regex", "", " regular expression pattern used to filter the image tags")
createImageCmd.AddCommand(createImagePolicyCmd)
}
@@ -95,6 +97,12 @@ func createImagePolicyRun(cmd *cobra.Command, args []string) error {
return fmt.Errorf("a policy must be provided with --semver")
}
if imagePolicyArgs.filterRegex != "" {
policy.Spec.FilterTags = &imagev1.TagFilter{
Pattern: imagePolicyArgs.filterRegex,
}
}
if export {
return printExport(exportImagePolicy(&policy))
}

6
cmd/flux/create_image_updateauto.go
View File

@@ -50,7 +50,7 @@ var imageUpdateArgs = imageUpdateFlags{}
func init() {
flags := createImageUpdateCmd.Flags()
flags.StringVar(&imageUpdateArgs.gitRepoRef, "git-repo-ref", "", "the name of a GitRepository resource with details of the upstream git repository")
flags.StringVar(&imageUpdateArgs.branch, "branch", "", "the branch to push commits to")
flags.StringVar(&imageUpdateArgs.branch, "branch", "", "the branch to checkout and push commits to")
flags.StringVar(&imageUpdateArgs.commitTemplate, "commit-template", "", "a template for commit messages")
flags.StringVar(&imageUpdateArgs.authorName, "author-name", "", "the name to use for commit author")
flags.StringVar(&imageUpdateArgs.authorEmail, "author-email", "", "the email to use for commit author")
@@ -68,6 +68,10 @@ func createImageUpdateRun(cmd *cobra.Command, args []string) error {
return fmt.Errorf("a reference to a GitRepository is required (--git-repo-ref)")
}
if imageUpdateArgs.branch == "" {
return fmt.Errorf("the Git repoistory branch is required (--branch)")
}
labels, err := parseLabels()
if err != nil {
return err

1
docs/cmd/flux_create_image_policy.md
View File

@@ -18,6 +18,7 @@ flux create image policy <name> [flags]
### Options
```
--filter-regex string regular expression pattern used to filter the image tags
-h, --help help for policy
--image-ref string the name of an image repository object
--semver string a semver range to apply to tags; e.g., '1.x'

2
docs/cmd/flux_create_image_update.md
View File

@@ -17,7 +17,7 @@ flux create image update <name> [flags]
```
--author-email string the email to use for commit author
--author-name string the name to use for commit author
--branch string the branch to push commits to
--branch string the branch to checkout and push commits to
--commit-template string a template for commit messages
--git-repo-ref string the name of a GitRepository resource with details of the upstream git repository
-h, --help help for update