feat(ansible): make ansible verbosity configurable #1852
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,56 +52,65 @@ type Runner interface { | |
| GetFinalizer() (string, bool) | ||
| } | ||
|
|
||
| func ansibleVerbosityString(verbosity int) string { | ||
| if verbosity > 0 { | ||
|
There was a problem hiding this comment. Would not it can be as v, or vv, or vvv, or vvvv? See https://docs.ansible.com/ansible/latest/cli/ansible-playbook.html#cmdoption-ansible-playbook-v So, wdyt about your solution allow the user to inform it? There was a problem hiding this comment.
|
||
| return fmt.Sprintf("-%v", strings.Repeat("v", verbosity)) | ||
| } | ||
| return "" | ||
| } | ||
|
|
||
| type cmdFuncType func(ident, inputDirPath string, maxArtifacts int) *exec.Cmd | ||
|
|
||
| func playbookCmdFunc(verbosity, path string) cmdFuncType { | ||
| return func(ident, inputDirPath string, maxArtifacts int) *exec.Cmd { | ||
| return exec.Command("ansible-runner", verbosity, "--rotate-artifacts", fmt.Sprintf("%v", maxArtifacts), "-p", path, "-i", ident, "run", inputDirPath) | ||
| } | ||
| } | ||
|
|
||
| func roleCmdFunc(verbosity, path string) cmdFuncType { | ||
| rolePath, roleName := filepath.Split(path) | ||
| return func(ident, inputDirPath string, maxArtifacts int) *exec.Cmd { | ||
| return exec.Command("ansible-runner", verbosity, "--rotate-artifacts", fmt.Sprintf("%v", maxArtifacts), "--role", roleName, "--roles-path", rolePath, "--hosts", "localhost", "-i", ident, "run", inputDirPath) | ||
| } | ||
| } | ||
|
|
||
| // New - creates a Runner from a Watch struct | ||
| func New(watch watches.Watch) (Runner, error) { | ||
| var path string | ||
| var cmdFunc, finalizerCmdFunc cmdFuncType | ||
|
|
||
| err := watch.Validate() | ||
| if err != nil { | ||
| log.Error(err, "Failed to validate watch") | ||
| return nil, err | ||
| } | ||
| verbosityString := ansibleVerbosityString(watch.AnsibleVerbosity) | ||
|
|
||
| switch { | ||
| case watch.Playbook != "": | ||
| path = watch.Playbook | ||
| cmdFunc = playbookCmdFunc(verbosityString, path) | ||
| case watch.Role != "": | ||
| path = watch.Role | ||
| cmdFunc = roleCmdFunc(verbosityString, path) | ||
| } | ||
|
|
||
| // handle finalizer | ||
| switch { | ||
| case watch.Finalizer == nil: | ||
| finalizerCmdFunc = nil | ||
| case watch.Finalizer.Playbook != "": | ||
| finalizerCmdFunc = playbookCmdFunc(verbosityString, watch.Finalizer.Playbook) | ||
| case watch.Finalizer.Role != "": | ||
| finalizerCmdFunc = roleCmdFunc(verbosityString, watch.Finalizer.Role) | ||
| case len(watch.Finalizer.Vars) != 0: | ||
| finalizerCmdFunc = cmdFunc | ||
| } | ||
|
|
||
| return &runner{ | ||
| Path: path, | ||
| cmdFunc: cmdFunc, | ||
| Finalizer: watch.Finalizer, | ||
| finalizerCmdFunc: finalizerCmdFunc, | ||
| GVK: watch.GroupVersionKind, | ||
| maxRunnerArtifacts: watch.MaxRunnerArtifacts, | ||
|
|
@@ -119,7 +128,6 @@ type runner struct { | |
| } | ||
|
|
||
| func (r *runner) Run(ident string, u *unstructured.Unstructured, kubeconfig string) (RunResult, error) { | ||
| timer := metrics.ReconcileTimer(r.GVK.String()) | ||
| defer timer.ObserveDuration() | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is not this change cable of to cause break changes in the current projects?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The proposed changes should not break current projects or require any changes in those projects. If you have a scenario or code path in mind I should certainly fix it.