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

Fixed broken URLs and mentions of old organization #2367

Merged
merged 1 commit into from
Aug 15, 2019
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
20 changes: 10 additions & 10 deletions chart/flux/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ configuration based on that (and a configurable policy).

## Introduction

This chart bootstraps a [Flux](/~https://github.com/weaveworks/flux) deployment on
This chart bootstraps a [Flux](/~https://github.com/fluxcd/flux) deployment on
a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.

## Prerequisites
Expand All @@ -22,7 +22,7 @@ This means fluxd can fail to apply changes to HelmRelease resources.
### Helm

Tiller should be running in the cluster, though
[helm-operator](../../docs/helm-operator/references/operator.md) will wait
[helm-operator](/~https://github.com/fluxcd/helm-operator) will wait
until it can find one.

# Git repo
Expand All @@ -32,12 +32,12 @@ until it can find one.
- Custom Resource namespace reflects where the release should be done.
Both the Helm release and its corresponding Custom Resource will
live in this namespace.
- Example of a test repo: /~https://github.com/weaveworks/flux-get-started
- Example of a test repo: /~https://github.com/fluxcd/flux-get-started

## Installation

We put together a simple [Get Started
guide](../../docs/tutorials/get-started-helm.md) which takes about 5-10 minutes to follow.
tutorial](https://docs.fluxcd.io/en/latest/tutorials/get-started-helm.html) which takes about 5-10 minutes to follow.
You will have a fully working Flux installation deploying workloads to your cluster.

## Installing Flux using Helm
Expand All @@ -52,11 +52,11 @@ helm repo add fluxcd https://charts.fluxcd.io

#### To install the chart with the release name `flux`

Replace `weaveworks/flux-get-started` with your own git repository and run helm install:
Replace `fluxcd/flux-get-started` with your own git repository and run helm install:

```sh
$ helm install --name flux \
--set git.url=git@github.com:weaveworks/flux-get-started \
--set git.url=git@github.com:fluxcd/flux-get-started \
--namespace flux \
fluxcd/flux
```
Expand All @@ -65,7 +65,7 @@ fluxcd/flux

```sh
helm install --name flux \
--set git.url=git@github.com:weaveworks/flux-get-started \
--set git.url=git@github.com:fluxcd/flux-get-started \
--set token=YOUR_WEAVE_CLOUD_SERVICE_TOKEN \
--namespace flux \
fluxcd/flux
Expand All @@ -76,14 +76,14 @@ fluxcd/flux
Apply the Helm Release CRD:

```sh
kubectl apply -f https://raw.githubusercontent.com/weaveworks/flux/master/deploy-helm/flux-helm-release-crd.yaml
kubectl apply -f https://raw.githubusercontent.com/fluxcd/flux/helm-0.10.1/deploy-helm/flux-helm-release-crd.yaml
```

Install Flux with Helm:

```sh
$ helm install --name flux \
--set git.url=git@github.com:weaveworks/flux-get-started \
--set git.url=git@github.com:fluxcd/flux-get-started \
--set helmOperator.create=true \
--set helmOperator.createCRD=false \
--namespace flux \
Expand Down Expand Up @@ -154,7 +154,7 @@ The [configuration](#configuration) section lists all the parameters that can be
#### Setup Git deploy

At startup Flux generates a SSH key and logs the public key.
Find the SSH public key by installing [fluxctl](../../docs/references/fluxctl.md) and
Find the SSH public key by installing [fluxctl](https://docs.fluxcd.io/en/latest/references/fluxctl.html) and
running:

```sh
Expand Down
2 changes: 1 addition & 1 deletion chart/flux/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Get the Git deploy key by either (a) running
kubectl -n {{ .Release.Namespace }} logs deployment/{{ .Release.Name }} | grep identity.pub | cut -d '"' -f2

or by (b) installing fluxctl through
https://github.com/weaveworks/flux/blob/master/docs/references/fluxctl.md#installing-fluxctl
https://docs.fluxcd.io/en/latest/references/fluxctl.html#installing-fluxctl
and running:

fluxctl identity
Expand Down
4 changes: 2 additions & 2 deletions daemon/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ giving this error:
Check that any files mentioned are well-formed, and resources are not
defined more than once. It's also worth reviewing

https://github.com/weaveworks/flux/blob/master/docs/requirements.md
https://docs.fluxcd.io/en/latest/requirements.html

to make sure you're not running into any corner cases.

If you think your files are all OK and you are still getting this
message, please log an issue at

/~https://github.com/weaveworks/flux/issues
/~https://github.com/fluxcd/flux/issues

and include the problematic file, if possible.
`,
Expand Down
2 changes: 1 addition & 1 deletion deploy/flux-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
# file, which you will need to do if you host your own git
# repo rather than using github or the like. You'll also need to
# mount it into the container, below. See
# https://github.com/weaveworks/flux/blob/master/docs//guides/use-private-git-host.md
# https://docs.fluxcd.io/en/latest/guides/use-private-git-host.html
# - name: ssh-config
# configMap:
# name: flux-ssh-config
Expand Down
2 changes: 1 addition & 1 deletion docs/references/fluxyaml-config-files.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Flux performs two types of actions on raw manifest files from the Git repository

1. Read manifest files when performing a sync operation (i.e making sure that the status of the cluster reflects what's
in the manifest files, adjusting it if necessary)
2. Update the manifest files of [workload](/~https://github.com/fluxcd/flux/blob/master/docs/using/fluxctl.md#what-is-a-workload).
2. Update the manifest files of [workload](fluxctl.html#workloads).
Specifically, flux can update:
* container images, when releasing a new image version. A release can happen manually or automatically, when a new
container image is pushed to a repository.
Expand Down
2 changes: 1 addition & 1 deletion git/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ We need to clone a git repo to proceed, and you haven't supplied
one. Please upload a config file, including a git repository URL, as
described in

https://github.com/weaveworks/flux/blob/master/docs/references/fluxctl.md
https://docs.fluxcd.io/en/latest/references/fluxctl.html

`,
}
Expand Down
16 changes: 8 additions & 8 deletions install/generated_templates.gogen.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion install/templates/flux-deployment.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
# file, which you will need to do if you host your own git
# repo rather than using github or the like. You'll also need to
# mount it into the container, below. See
# https://github.com/weaveworks/flux/blob/master/docs//guides/use-private-git-host.md
# https://docs.fluxcd.io/en/latest/guides/use-private-git-host.html
# - name: ssh-config
# configMap:
# name: flux-ssh-config
Expand Down
2 changes: 1 addition & 1 deletion internal_docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ change.

**Creating the release**

8. [Create a release in GitHub](/~https://github.com/weaveworks/flux/releases/new)
8. [Create a release in GitHub](/~https://github.com/fluxcd/flux/releases/new)

Use a tag name as explained above; semver for the Flux daemon, `helm-` then the semver for the Helm operator.

Expand Down
4 changes: 2 additions & 2 deletions release/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ func MakeReleaseError(err error) *fluxerr.Error {
This may be because of a limitation in the formats of file Flux can
deal with. See

https://github.com/weaveworks/flux/blob/master/docs/requirements.md
https://docs.fluxcd.io/en/latest/requirements.html

for those limitations.

If your files appear to meet the requirements, it may simply be a bug
in Flux. Please report it at

/~https://github.com/weaveworks/flux/issues
/~https://github.com/fluxcd/flux/issues

and try to include the problematic manifest, if it can be identified.
`,
Expand Down
8 changes: 4 additions & 4 deletions remote/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ and try the operation again.
Otherwise, please consult the installation instructions in our
documentation:

https://github.com/weaveworks/flux/blob/master/docs/get-started/index.rst
https://docs.fluxcd.io/en/latest/get-started/

If you are still stuck, please log an issue:

/~https://github.com/weaveworks/flux/issues
/~https://github.com/fluxcd/flux/issues

`,
Err: err,
Expand Down Expand Up @@ -89,11 +89,11 @@ Otherwise, it is likely to be an ongoing problem until fluxd is
updated and/or redeployed. For help, please consult the installation
instructions:

https://github.com/weaveworks/flux/blob/master/docs/install/index.md
https://docs.fluxcd.io/en/latest/get-started/

If you are still stuck, please log an issue:

/~https://github.com/weaveworks/flux/issues
/~https://github.com/fluxcd/flux/issues

`,
Err: err,
Expand Down