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

Commit

Permalink
Update docs for 1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
squaremo committed Jan 4, 2018
1 parent 862db4f commit 4cbc962
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions site/daemon.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ fluxd requires setup and offers customization though a multitude of flags.
|--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 poll git repo for new commits|
|**registry** | | |
|--memcached-hostname | | hostname for memcached service to use when caching chunks; if empty, no memcached will be used|
|**registry cache** | | (none of these need overriding, usually) |
|--memcached-hostname | `memcached` | hostname for memcached service to use for caching image metadata|
|--memcached-timeout | `1 second` | maximum time to wait before giving up on memcached requests|
|--memcached-service | `memcached` | SRV service used to discover memcache servers|
|--registry-cache-expiry | `20 minutes` | Duration to keep cached registry tag info. Must be < 1 month.|
|--registry-cache-expiry | `1 hour` | Duration to keep cached registry tag info. Must be < 1 month.|
|--registry-poll-interval| `5 minutes` | period at which to poll registry for new images|
|--registry-rps | 200 | maximum registry requests per second per host|
|--registry-rps | `200` | maximum registry requests per second per host|
|--registry-burst | `125` | maximum number of warmer connections to remote and memcache|
|**k8s-secret backed ssh keyring configuration** | | |
|--k8s-secret-name | `flux-git-deploy` | name of the k8s secret used to store the private SSH key|
Expand Down
7 changes: 3 additions & 4 deletions site/using.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@ default:deployment/helloworld success

# Recording user and message with the triggered action

Issuing a deployment change results in a version control change/git commit, keeping the
history of the actions. Flux daemon can be started with several flags that impact the commit
information:
Issuing a deployment change results in a version control change/git
commit, keeping the history of the actions. The Flux daemon can be
started with several flags that impact the commit information:

| flag | purpose | default |
|-------------------|-------------------------------|------------|
Expand Down Expand Up @@ -296,4 +296,3 @@ for b) and c):

git commit: fatal: --author 'unknown' is not 'Name <email>' and matches
no existing author

0 comments on commit 4cbc962

Please sign in to comment.