Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Reimplement Git timeout Helm operator #1565

Merged
merged 3 commits into from
Dec 4, 2018
Merged

Conversation

hiddeco
Copy link
Member

@hiddeco hiddeco commented Dec 3, 2018

Fixes #1551, supersedes #1552.

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

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 December 3, 2018 20:50
@sfrique
Copy link
Contributor

sfrique commented Dec 3, 2018

I tested and it's working for my case.

Thanks!

Copy link
Member

@squaremo squaremo left a comment

Choose a reason for hiding this comment

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

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 |
Copy link
Member

Choose a reason for hiding this comment

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

Well caught, en passant

Copy link
Member Author

Choose a reason for hiding this comment

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

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
@hiddeco hiddeco deleted the 1551-git-timeout-fix-2 branch December 4, 2018 10:44
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GitTimeout is not been used on helm-op anymore (chartsync)
4 participants