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

fix(charts): Added missing flag #2870

Merged
merged 3 commits into from
Feb 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions chart/flux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ The following tables lists the configurable parameters of the Flux chart and the
| `git.pollInterval` | `5m` | Period at which to poll git repo for new commits
| `git.timeout` | `20s` | Duration after which git operations time out
| `git.secretName` | `None` | Kubernetes secret with the SSH private key. Superseded by `helmOperator.git.secretName` if set.
| `git.secret.enabled` | `false` | If set and a `.gitsecret` directory exist in the root of the git repository, Flux will execute a `git secret reveal -f` in the working clone before performing any operations
| `git.config.enabled` | `false` | Mount `$HOME/.gitconfig` via Secret into the Flux and HelmOperator Pods, allowing for custom global Git configuration
| `git.config.secretName` | `Computed` | Kubernetes secret with the global Git configuration
| `git.config.data` | `None` | Global Git configuration per [git-config](https://git-scm.com/docs/git-config)
Expand Down
3 changes: 3 additions & 0 deletions chart/flux/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,9 @@ spec:
{{- end }}
- --git-verify-signatures={{ .Values.git.verifySignatures }}
- --git-set-author={{ .Values.git.setAuthor }}
{{- if .Values.git.secret.enabled }}
- --git-secret
{{- end }}
- --git-poll-interval={{ .Values.git.pollInterval }}
- --git-timeout={{ .Values.git.timeout }}
- --sync-interval={{ .Values.sync.interval | default .Values.git.pollInterval }}
Expand Down
6 changes: 6 additions & 0 deletions chart/flux/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ git:
# 4. Add ./identity.pub as a deployment key with write access in your Git repo
# 5. Set the secret name (flux-ssh) below
secretName: ""
# Enables `git-secret` support, as this makes use of known GPG keys
# you will need to have imported the paired secret-key with one of
# the public-keys which were used in the encryption using
# `gpgKeys.secretName`.
secret:
enabled: false
# Global Git configuration See https://git-scm.com/docs/git-config for more details.
config:
enabled: false
Expand Down
1 change: 1 addition & 0 deletions docs/references/daemon.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Version controlling of cluster manifests provides reproducibility and a historic
| --git-set-author | false | if set, the author of git commits will reflect the user who initiated the commit and will differ from the git committer
| --git-gpg-key-import | | if set, fluxd will attempt to import the gpg key(s) found on the given path
| --git-signing-key | | if set, commits made by fluxd to the user git repo will be signed with the provided GPG key.
| --git-secret | | if set and a `.gitsecret` directory exist in the root of the git repository, Flux will execute a `git secret reveal -f` in the working clone before performing any operations
| --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
Expand Down