Skip to content

Commit 198a961

Browse files
Daniel Holbachhiddeco
Daniel Holbach
authored andcommitted
more Flux → Weave Flux
1 parent 582d726 commit 198a961

17 files changed

+38
-38
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Bug report
3-
about: Create a report to help us improve Weave Flux
3+
about: Create a report to help us improve Flux
44
title: ''
55
labels: blocked-needs-validation, bug
66
assignees: ''

.github/ISSUE_TEMPLATE/feature_request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Feature request
3-
about: Suggest a new feature for Weave Flux
3+
about: Suggest a new feature for Flux
44
title: ''
55
labels: blocked-needs-validation, enhancement
66
assignees: ''

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ be interested in the following:
142142

143143
If you have any questions about Flux and continuous delivery:
144144

145-
- Read [the Weave Flux docs](https://github.com/weaveworks/flux/tree/master/site).
145+
- Read [the Flux docs](https://github.com/weaveworks/flux/tree/master/site).
146146
- Invite yourself to the <a href="https://slack.weave.works/" target="_blank">Weave community</a>
147147
slack and ask a question on the [#flux](https://weave-community.slack.com/messages/flux/)
148148
channel.

chart/flux/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ You should also remove the deploy key from your GitHub repository.
179179

180180
### Configuration
181181

182-
The following tables lists the configurable parameters of the Weave Flux chart and their default values.
182+
The following tables lists the configurable parameters of the Flux chart and their default values.
183183

184184
| Parameter | Default | Description
185185
| ----------------------------------------------- | ---------------------------------------------------- | ---
@@ -299,7 +299,7 @@ weaveworks/flux
299299

300300
### Upgrade
301301

302-
Update Weave Flux version with:
302+
Update Flux version with:
303303

304304
```sh
305305
helm upgrade --reuse-values flux \

site/annotations-tutorial.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Driving Weave Flux - automations, locks and annotations
1+
# Driving Flux - automations, locks and annotations
22

3-
In this tutorial we want to get a better feel for what we can do with Weave
3+
In this tutorial we want to get a better feel for what we can do with
44
Flux. We won't spend too much time with getting it up and running, so let's
55
get that out of the way first.
66

@@ -11,7 +11,7 @@ deployment](https://github.com/weaveworks/flux-get-started) and click on the
1111

1212
## Setup
1313

14-
Get the source code of Weave Flux:
14+
Get the source code of Flux:
1515

1616
```sh
1717
git clone https://github.com/weaveworks/flux
@@ -83,7 +83,7 @@ Apply the Helm Release CRD:
8383
kubectl apply -f https://raw.githubusercontent.com/weaveworks/flux/master/deploy-helm/flux-helm-release-crd.yaml
8484
```
8585

86-
Install Weave Flux and its Helm Operator by specifying your fork URL. Just
86+
Install Flux and its Helm Operator by specifying your fork URL. Just
8787
make sure you replace `YOURUSER` with your GitHub username in the command
8888
below:
8989

@@ -108,14 +108,14 @@ running `kubectl get pods --all-namespaces`).
108108

109109
In the second step we will use fluxctl to talk to Flux in the cluster and
110110
interact with the deployments. First, please [install fluxctl](fluxctl.md#installing-fluxctl).
111-
(It enables you to drive all of Weave Flux, so have a look at the output of
111+
(It enables you to drive all of Flux, so have a look at the output of
112112
`fluxctl -h` to get a better idea.)
113113

114114
> **Note:** Another option (without installing `fluxctl` is to take a look
115115
at the resulting annotation changes and make the changes in Git. This is
116116
GitOps after all. :-)
117117

118-
To enable Weave Flux to sync your config, you need to add the deployment key
118+
To enable Flux to sync your config, you need to add the deployment key
119119
to your fork.
120120

121121
Get your Flux deployment key by running
@@ -134,11 +134,11 @@ Wait for sync to happen or run
134134
fluxctl sync
135135
```
136136

137-
## Driving Weave Flux
137+
## Driving Flux
138138

139-
After syncing, Weave Flux will find out which workloads there are, which
139+
After syncing, Flux will find out which workloads there are, which
140140
images are available and what needs doing. To find out which workloads are
141-
managed by Weave Flux, run
141+
managed by Flux, run
142142

143143
```sh
144144
fluxctl list-workloads -a
@@ -167,7 +167,7 @@ Commit pushed: 4755a3b
167167
```
168168

169169
If you now go back to `https://github.com/YOUR-USER-ID/flux-get-started` in
170-
your browser, you will notice that Weave Flux has made a commit on your
170+
your browser, you will notice that Flux has made a commit on your
171171
behalf. The policy change is now in Git, which is great for transparency and
172172
for defining expected state.
173173

@@ -265,7 +265,7 @@ and the diff for this is going to look like this:
265265
```
266266

267267
And that's it. At the end of this tutorial, you have automated, locked and
268-
annotated deployments with Weave Flux.
268+
annotated deployments with Flux.
269269

270270
Another tip, if you should get stuck anywhere: check what Flux is doing. You
271271
can do that by simply running

site/building.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Building Weave Flux
2+
title: Building Flux
33
menu_order: 80
44
---
55

site/faq.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Weave Flux FAQ
2+
title: Flux FAQ
33
menu_order: 60
44
---
55

site/fluxctl.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Using Weave Flux
2+
title: Using Flux
33
menu_order: 40
44
---
55

site/get-started.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Installing Weave Flux Manually
2+
title: Installing Flux Manually
33
menu_order: 10
44
---
55

@@ -152,4 +152,4 @@ As a next step, you might want to dive deeper into [how to
152152
control Flux](./fluxctl.md), check out [more sophisticated
153153
setups](./standalone-setup.md) or go through our hands-on
154154
tutorial about driving Flux, e.g.
155-
[automations, annotations and locks](annotations-tutorial.md).
155+
[automations, annotations and locks](annotations-tutorial.md).

site/helm-get-started.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Installing Weave Flux using Helm
2+
title: Installing Flux using Helm
33
menu_order: 20
44
---
55

66
- [Get started with Flux using Helm](#get-started-with-flux-using-helm)
77
* [Prerequisites](#prerequisites)
8-
* [Install Weave Flux](#install-weave-flux)
8+
* [Install Flux](#install-flux)
99
* [Giving write access](#giving-write-access)
1010
* [Committing a small change](#committing-a-small-change)
1111
* [Conclusion](#conclusion)
@@ -60,7 +60,7 @@ helm init --skip-refresh --upgrade --service-account tiller --history-max 10
6060
> and be aware of the `--history-max` flag before promoting to
6161
> production.
6262
63-
## Install Weave Flux
63+
## Install Flux
6464

6565
Add the Flux repository of Weaveworks:
6666

@@ -74,12 +74,12 @@ Apply the Helm Release CRD:
7474
kubectl apply -f https://raw.githubusercontent.com/weaveworks/flux/master/deploy-helm/flux-helm-release-crd.yaml
7575
```
7676

77-
In this next step you install Weave Flux using `helm`. Simply
77+
In this next step you install Flux using `helm`. Simply
7878

7979
1. Fork [flux-get-started](https://github.com/weaveworks/flux-get-started)
8080
on GitHub and replace the `weaveworks` with your GitHub username in
8181
[here](https://github.com/weaveworks/flux-get-started/blob/master/releases/ghost.yaml#L13)
82-
1. Install Weave Flux and its Helm Operator by specifying your fork URL:
82+
1. Install Flux and its Helm Operator by specifying your fork URL:
8383

8484
*Just make sure you replace `YOURUSER` with your GitHub username
8585
in the command below:*
@@ -203,4 +203,4 @@ Flux](fluxctl.md) or go through our hands-on tutorial about driving Flux,
203203
e.g. [automations, annotations and locks](annotations-tutorial.md).
204204
205205
For a more advanced Helm setup, take a look at the [gitops-helm
206-
repository](https://github.com/stefanprodan/gitops-helm).
206+
repository](https://github.com/stefanprodan/gitops-helm).

site/helm-operator.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ helm-operator requires setup and offers customization though a multitude of flag
3030
| --log-release-diffs | `false` | Log the diff when a chart release diverges. **Potentially insecure.**
3131
| --update-chart-deps | `true` | Update chart dependencies before installing or upgrading a release.
3232

33-
## Installing Weave Flux Helm Operator and Helm with TLS enabled
33+
## Installing Flux Helm Operator and Helm with TLS enabled
3434

3535
### Installing Helm / Tiller
3636

37-
Generate certificates for Tiller and Flux. This will provide a CA, servercerts for Tiller and client certs for Helm / Weave Flux.
37+
Generate certificates for Tiller and Flux. This will provide a CA, servercerts for Tiller and client certs for Helm / Flux.
3838

3939
> **Note:** When creating the certificate for Tiller the Common Name should match the hostname you are connecting to from the Helm operator.
4040
@@ -171,7 +171,7 @@ helm --tls --tls-verify \
171171
ls
172172
```
173173

174-
### Deploy Weave Flux Helm Operator
174+
### Deploy Flux Helm Operator
175175

176176
First create a new Kubernetes TLS secret for the client certs;
177177

site/how-it-works.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: How Weave Flux Works
2+
title: How Flux Works
33
menu_order: 20
44
---
55

site/installing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Installing Weave Flux
2+
title: Installing Flux
33
menu_order: 30
44
---
55

@@ -10,7 +10,7 @@ contains [manifests][k8s-manifests] (as YAML files) describing what
1010
should run in the cluster. Flux imposes
1111
[some requirements](/site/requirements.md) on these files.
1212

13-
# Installing Weave Flux
13+
# Installing Flux
1414

1515
Here are the instructions to [install Flux on your own
1616
cluster](./get-started.md).

site/introduction.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Introducing Weave Flux
2+
title: Introducing Flux
33
menu_order: 10
44
---
55

site/monitoring.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Monitoring Weave Flux
2+
title: Monitoring Flux
33
menu_order: 70
44
---
55

site/troubleshooting.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Troubleshooting Weave Flux
2+
title: Troubleshooting Flux
33
menu_order: 50
44
---
55

snap/snapcraft.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ version-script: |
99
echo "$FLUX_TAG+$GIT_REV"
1010
fi
1111
version: git
12-
summary: fluxctl talks to Weave Flux and helps you deploy your code
12+
summary: fluxctl talks to Flux and helps you deploy your code
1313
description: |
14-
fluxctl talks to your Weave Flux instance and exposes all its
14+
fluxctl talks to your Flux instance and exposes all its
1515
functionality to an easy to use command line interface.
1616
grade: devel # must be 'stable' to release into candidate/stable channels
1717
confinement: strict

0 commit comments

Comments
 (0)