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

Use flux-get-started repository everywhere. #1540

Merged
merged 1 commit into from
Nov 22, 2018
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
2 changes: 1 addition & 1 deletion chart/flux/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ tolerations: []
affinity: {}

git:
# URL of git repo with Kubernetes manifests; e.g. git.url=ssh://git@github.com/weaveworks/flux-example
# URL of git repo with Kubernetes manifests; e.g. git.url=ssh://git@github.com/weaveworks/flux-get-started
url: ""
# Branch of git repo to use for Kubernetes manifests
branch: "master"
Expand Down
2 changes: 1 addition & 1 deletion cmd/fluxd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func main() {
kubernetesKubectl = fs.String("kubernetes-kubectl", "", "Optional, explicit path to kubectl tool")
versionFlag = fs.Bool("version", false, "Get version number")
// Git repo & key etc.
gitURL = fs.String("git-url", "", "URL of git repo with Kubernetes manifests; e.g., git@github.com:weaveworks/flux-example")
gitURL = fs.String("git-url", "", "URL of git repo with Kubernetes manifests; e.g., git@github.com:weaveworks/flux-get-started")
gitBranch = fs.String("git-branch", "master", "branch of git repo to use for Kubernetes manifests")
gitPath = fs.StringSlice("git-path", []string{}, "relative paths within the git repo to locate Kubernetes manifests")
gitUser = fs.String("git-user", "Weave Flux", "username to use as git committer")
Expand Down
2 changes: 1 addition & 1 deletion deploy/flux-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ spec:
- --ssh-keygen-dir=/var/fluxd/keygen

# replace or remove the following URL
- --git-url=git@github.com:weaveworks/flux-example
- --git-url=git@github.com:weaveworks/flux-get-started
- --git-branch=master

# include these next two to connect to an "upstream" service
Expand Down
2 changes: 1 addition & 1 deletion site/daemon.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fluxd requires setup and offers customization though a multitude of flags.
|--kubernetes-kubectl | | optional, explicit path to kubectl tool|
|--version | false | output the version number and exit |
|**Git repo & key etc.** | ||
|--git-url | | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-example`|
|--git-url | | URL of git repo with Kubernetes manifests; e.g., `git@github.com:weaveworks/flux-get-started`|
|--git-branch | `master` | branch of git repo to use for Kubernetes manifests|
|--git-ci-skip | false | when set, fluxd will append `\n\n[ci skip]` to its commit messages |
|--git-ci-skip-message | `""` | if provided, fluxd will append this to commit messages (overrides --git-ci-skip`) |
Expand Down