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.

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

Reimplement Git timeout Helm operator #1565

Merged
merged 3 commits into from Dec 4, 2018

Conversation

@hiddeco
Copy link
Member

commented Dec 3, 2018

Fixes #1551, supersedes #1552.

Image available for testing as hiddeco/helm-operator:1551-git-timeout-fix-2.

hiddeco added 3 commits Dec 3, 2018
Signed-off-by: Hidde Beydals <hello@hidde.co>
Signed-off-by: Hidde Beydals <hello@hidde.co>
Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco hiddeco added the helm label Dec 3, 2018
@hiddeco hiddeco requested a review from squaremo Dec 3, 2018
@sfrique

This comment has been minimized.

Copy link
Contributor

commented Dec 3, 2018

I tested and it's working for my case.

Thanks!

Copy link
Member

left a comment

Nice and neat, thanks Hidde 🍍

@@ -60,16 +60,16 @@ fluxd requires setup and offers customization though a multitude of flags.
|--git-label | | label to keep track of sync progress; overrides both --git-sync-tag and --git-notes-ref|
|--git-sync-tag | `flux-sync` | tag to use to mark sync progress for this cluster (old config, still used if --git-label is not supplied)|
|--git-notes-ref | `flux` | ref to use for keeping commit annotations in git notes|
|--git-poll-interval | `5 minutes` | period at which to fetch any new commits from the git repo |
|--git-timeout | `20 seconds` | duration after which git operations time out |
|--git-poll-interval | `5m` | period at which to fetch any new commits from the git repo |

This comment has been minimized.

Copy link
@squaremo

squaremo Dec 4, 2018

Member

Well caught, en passant

This comment has been minimized.

Copy link
@hiddeco

hiddeco Dec 4, 2018

Author Member

Just noticed there are some more inconsistencies in the docs (https://github.com/weaveworks/flux/pull/1565/files#diff-91111368d299d9de710705677c1ad0f6R28 is not a valid flag, same goes for https://github.com/weaveworks/flux/pull/1565/files#diff-91111368d299d9de710705677c1ad0f6L33) but I will address them in an additional PR.

@hiddeco hiddeco merged commit 4ec08eb into master Dec 4, 2018
1 check passed
1 check passed
ci/circleci: build Your tests passed on CircleCI!
Details
@hiddeco hiddeco deleted the 1551-git-timeout-fix-2 branch Dec 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.