From 11941ee22eaf8b49eeade771d55f398f7d659b39 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Thu, 15 Aug 2019 17:04:24 +0200 Subject: [PATCH] Fixed broken URLs and mentions of old organization --- chart/flux/README.md | 20 ++++++++++---------- chart/flux/templates/NOTES.txt | 2 +- daemon/errors.go | 4 ++-- docs/references/fluxyaml-config-files.md | 2 +- git/errors.go | 2 +- install/templates/flux-deployment.yaml.tmpl | 2 +- internal_docs/releasing.md | 2 +- release/errors.go | 4 ++-- remote/errors.go | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/chart/flux/README.md b/chart/flux/README.md index 7ddddc88c9..912a6f459c 100755 --- a/chart/flux/README.md +++ b/chart/flux/README.md @@ -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 @@ -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 @@ -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 @@ -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 ``` @@ -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 @@ -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 \ @@ -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 diff --git a/chart/flux/templates/NOTES.txt b/chart/flux/templates/NOTES.txt index 1626bf0195..750e9a6f26 100644 --- a/chart/flux/templates/NOTES.txt +++ b/chart/flux/templates/NOTES.txt @@ -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 diff --git a/daemon/errors.go b/daemon/errors.go index 384c585ed7..c0f48b726c 100644 --- a/daemon/errors.go +++ b/daemon/errors.go @@ -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. `, diff --git a/docs/references/fluxyaml-config-files.md b/docs/references/fluxyaml-config-files.md index 7755118763..6cd8551c6c 100644 --- a/docs/references/fluxyaml-config-files.md +++ b/docs/references/fluxyaml-config-files.md @@ -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.md#what-is-a-workload). 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. diff --git a/git/errors.go b/git/errors.go index b55fc4bcd3..ca5095971b 100644 --- a/git/errors.go +++ b/git/errors.go @@ -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 `, } diff --git a/install/templates/flux-deployment.yaml.tmpl b/install/templates/flux-deployment.yaml.tmpl index 5da11895ca..256d07e243 100644 --- a/install/templates/flux-deployment.yaml.tmpl +++ b/install/templates/flux-deployment.yaml.tmpl @@ -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 diff --git a/internal_docs/releasing.md b/internal_docs/releasing.md index 08dbecb8b9..e535258fdb 100644 --- a/internal_docs/releasing.md +++ b/internal_docs/releasing.md @@ -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. diff --git a/release/errors.go b/release/errors.go index 92f2f28c0d..21d7720cbb 100644 --- a/release/errors.go +++ b/release/errors.go @@ -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. `, diff --git a/remote/errors.go b/remote/errors.go index 58cc54bdc2..12acc6cb69 100644 --- a/remote/errors.go +++ b/remote/errors.go @@ -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, @@ -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,