Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use enviornment variables for watcher cli args #662

Merged
merged 1 commit into from
Nov 16, 2023
Merged

Use enviornment variables for watcher cli args #662

merged 1 commit into from
Nov 16, 2023

Conversation

drGrove
Copy link
Contributor

@drGrove drGrove commented Nov 10, 2023 •
edited
Loading

Using enviornment variable substitution for default cli args allows for modification of values via strategic merge patches instead of JSON6902. This reduces complexity of patches, allows for easier namespace overrides as well as a cleaner overlay

Changes

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you review them:

  • Has Docs included if any changes are user facing
  • Has Tests included if any functionality added or changed
  • Tested your changes locally (if this is a code change)
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including functionality, content, code)
  • Has a kind label. You can add a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
  • Release notes block below has been updated with any user-facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings)
  • Release notes contain the string "action required" if the change requires additional action from users switching to the new release

Release Notes

@drGrove
Use enviornment variables for watcher cli args
99b09ee 
Using enviornment variable substitution for default cli args allows for
modification of values via strategic merge patches instead of JSON6902.
This reduces complexity of patches, allows for easier namespace
overrides as well as a cleaner overlay
@tekton-robot tekton-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Nov 10, 2023
@tekton-robot tekton-robot requested a review from dibyom November 10, 2023 01:38
@tekton-robot
Copy link

Hi @drGrove. Thanks for your PR.

I'm waiting for a tektoncd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@tekton-robot tekton-robot requested a review from enarha November 10, 2023 01:38
@tekton-robot tekton-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 10, 2023
@drGrove
Copy link
Contributor Author

drGrove commented Nov 10, 2023

/kind cleanup

@tekton-robot tekton-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Nov 10, 2023
james-callahan
james-callahan approved these changes Nov 13, 2023
View reviewed changes
config/base/watcher.yaml
Comment on lines +39 to +40
- -api_addr
- $(TEKTON_RESULTS_API_SERVICE)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this be cleaner?

Suggested change
- -api_addr
- $(TEKTON_RESULTS_API_SERVICE)
- -api_addr=$(TEKTON_RESULTS_API_SERVICE)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either way seems fine.

@enarha
Copy link
Contributor

enarha commented Nov 13, 2023

/ok-to-test

@tekton-robot tekton-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 13, 2023
sayan-biswas
sayan-biswas reviewed Nov 15, 2023
View reviewed changes
config/base/watcher.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are other config flags available for the watcher. So a long term solution would be to implement the knative configMap loader. Which will also reduce the complexity of patching.

But I guess this okay for now.

avinal
avinal approved these changes Nov 16, 2023
View reviewed changes
Copy link
Member

@avinal avinal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me
/approve

@tekton-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: avinal, james-callahan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 16, 2023
khrm
khrm reviewed Nov 16, 2023
View reviewed changes
Copy link
Contributor

@khrm khrm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 16, 2023
@tekton-robot tekton-robot merged commit 11ea190 into tektoncd:main Nov 16, 2023
@drGrove drGrove deleted the watcher-args-env branch November 16, 2023 17:39
@khrm
Copy link
Contributor

khrm commented Feb 1, 2024

/kind misc

@tekton-robot tekton-robot added the kind/misc Categorizes issue or PR as a miscellaneuous one. label Feb 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@khrm khrm khrm left review comments

@sayan-biswas sayan-biswas sayan-biswas left review comments

@james-callahan james-callahan james-callahan approved these changes

@avinal avinal avinal approved these changes

@dibyom dibyom Awaiting requested review from dibyom

@enarha enarha Awaiting requested review from enarha

Assignees

@khrm khrm

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. kind/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@drGrove @tekton-robot @enarha @khrm @sayan-biswas @james-callahan @avinal