From 8db45f7afbfe0f0b8ada443ad23868551944577e Mon Sep 17 00:00:00 2001 From: erdii Date: Fri, 11 Oct 2019 10:56:06 +0200 Subject: [PATCH 1/2] Document sync-state and git-readonly daemon flags --- docs/references/daemon.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/references/daemon.md b/docs/references/daemon.md index a71670cee..70e2d3076 100644 --- a/docs/references/daemon.md +++ b/docs/references/daemon.md @@ -57,11 +57,13 @@ Version controlling of cluster manifests provides reproducibility and a historic | --git-notes-ref | `flux` | ref to use for keeping commit annotations in git notes | --git-poll-interval | `5m` | period at which to fetch any new commits from the git repo | --git-timeout | `20s` | duration after which git operations time out +| --git-readonly | `false` | If `true`, the git repo will be considered read-only, and Flux will not attempt to write to it. Implies -sync-state=secret | **syncing:** control over how config is applied to the cluster | --sync-interval | `5m` | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs | --sync-timeout | `1m` | duration after which sync operations time out | --sync-garbage-collection | `false` | when set, fluxd will delete resources that it created, but are no longer present in git | --sync-garbage-collection-dry | `false` | only log what would be garbage collected, rather than deleting. Implies --sync-garbage-collection +| --sync-state | `git` | Where to keep sync state; either a tag in the upstream repo (`git`), or as an annotation on the SSH secret (`secret`) | **registry cache:** (none of these need overriding, usually) | --memcached-hostname | `memcached` | hostname for memcached service to use for caching image metadata | --memcached-timeout | `1s` | maximum time to wait before giving up on memcached requests From e058c72e6ae31f8b584d788246ec1fcae644f695 Mon Sep 17 00:00:00 2001 From: erdii Date: Fri, 11 Oct 2019 11:01:26 +0200 Subject: [PATCH 2/2] Fix typo in daemon reference documentation --- docs/references/daemon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/references/daemon.md b/docs/references/daemon.md index 70e2d3076..39078642e 100644 --- a/docs/references/daemon.md +++ b/docs/references/daemon.md @@ -57,7 +57,7 @@ Version controlling of cluster manifests provides reproducibility and a historic | --git-notes-ref | `flux` | ref to use for keeping commit annotations in git notes | --git-poll-interval | `5m` | period at which to fetch any new commits from the git repo | --git-timeout | `20s` | duration after which git operations time out -| --git-readonly | `false` | If `true`, the git repo will be considered read-only, and Flux will not attempt to write to it. Implies -sync-state=secret +| --git-readonly | `false` | If `true`, the git repo will be considered read-only, and Flux will not attempt to write to it. Implies --sync-state=secret | **syncing:** control over how config is applied to the cluster | --sync-interval | `5m` | apply the git config to the cluster at least this often. New commits may provoke more frequent syncs | --sync-timeout | `1m` | duration after which sync operations time out