Skip to content

Commit 3c9a85e

Browse files
committed
weave.works.flux annotations -> fluxcd.io
1 parent e66c427 commit 3c9a85e

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

docs/faq.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ Yes. The easiest way to do that is to use the following annotation
309309
*in the manifest files*:
310310

311311
```yaml
312-
flux.weave.works/ignore: true
312+
fluxcd.io/ignore: true
313313
```
314314
315315
To stop ignoring these annotated resources, you simply remove the
@@ -329,7 +329,7 @@ If the annotation is just carried in the cluster, the easiest way
329329
to remove it is to run:
330330

331331
```sh
332-
kubectl annotate <resource> "flux.weave.works/ignore"-
332+
kubectl annotate <resource> "fluxcd.io/ignore"-
333333
```
334334

335335
Mixing both kinds of annotations (in-git and in-cluster), can make

docs/references/fluxctl.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ default:deployment/helloworld helloworld quay.io/weaveworks/helloworld:master-
302302
```
303303

304304
Automation can also be enabled by adding the annotation
305-
`flux.weave.works/automated: "true"` to the deployment.
305+
`fluxcd.io/automated: "true"` to the deployment.
306306
307307
We can see that the `list-workloads` subcommand reports that the
308308
helloworld application is automated. Flux will now automatically
@@ -600,9 +600,9 @@ no existing author
600600
Automation and image tag filtering can also be managed using annotations
601601
(`fluxctl` is using the same mechanism).
602602

603-
Automation can be enabled with `flux.weave.works/automated: "true"`. Image
603+
Automation can be enabled with `fluxcd.io/automated: "true"`. Image
604604
filtering annotations take the form
605-
`flux.weave.works/tag.<container-name>: <filter-type>:<filter-value>` or
605+
`fluxcd.io/tag.<container-name>: <filter-type>:<filter-value>` or
606606
`filter.fluxcd.io/<container-name>: <filter-type>:<filter-value>`. Values of
607607
`filter-type` can be [`glob`](#glob), [`semver`](#semver), and
608608
[`regexp`](#regexp). Filter values use the same syntax as when the filter is
@@ -619,8 +619,8 @@ metadata:
619619
labels:
620620
app: podinfo
621621
annotations:
622-
flux.weave.works/automated: "true"
623-
flux.weave.works/tag.podinfod: semver:~1.3
622+
fluxcd.io/automated: "true"
623+
fluxcd.io/tag.podinfod: semver:~1.3
624624
spec:
625625
selector:
626626
matchLabels:
@@ -644,8 +644,8 @@ spec:
644644
Things to notice:
645645

646646
1. The annotations are made in `metadata.annotations`, not in `spec.template.metadata`.
647-
2. The `flux.weave.works/tag.`... references the container name `podinfod`, this will change based on your container name. If you have multiple containers you would have multiple lines like that.
648-
3. The value for the `flux.weave.works/tag.`... annotation should includes the filter pattern type, in this case `semver`.
647+
2. The `fluxcd.io/tag.`... references the container name `podinfod`, this will change based on your container name. If you have multiple containers you would have multiple lines like that.
648+
3. The value for the `fluxcd.io/tag.`... annotation should includes the filter pattern type, in this case `semver`.
649649

650650
Annotations can also be used to tell Flux to temporarily ignore certain manifests
651-
using `flux.weave.works/ignore: "true"`. Read more about this in the [FAQ](../faq.md).
651+
using `fluxcd.io/ignore: "true"`. Read more about this in the [FAQ](../faq.md).

docs/references/fluxyaml-config-files.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ commandUpdated:
101101
policy:
102102
command: >-
103103
cat flux-patch.yaml |
104-
kubeyaml annotate --namespace $FLUX_WL_NS --kind $FLUX_WL_KIND --name $FLUX_WL_NAME "flux.weave.works/$FLUX_POLICY=$FLUX_POLICY_VALUE"
104+
kubeyaml annotate --namespace $FLUX_WL_NS --kind $FLUX_WL_KIND --name $FLUX_WL_NAME "fluxcd.io/$FLUX_POLICY=$FLUX_POLICY_VALUE"
105105
> new-flux-patch.yaml &&
106106
mv new-flux-patch.yaml flux-patch.yaml
107107
```
@@ -164,7 +164,7 @@ In addition, `updaters` are provided with some environment variables:
164164
* `FLUX_IMG`: Image name which the container needs to be updated to (e.g. `nginx`).
165165
* `FLUX_TAG`: Image tag which the container needs to be updated to (e.g. `1.15`).
166166
* `policy` updaters are provided with:
167-
* `FLUX_POLICY`: the name of the policy to be added or updated in the workload. To make into an annotation name, prefix with `flux.weave.works/`
167+
* `FLUX_POLICY`: the name of the policy to be added or updated in the workload. To make into an annotation name, prefix with `fluxcd.io/`
168168
* `FLUX_POLICY_VALUE`: value of the policy to be added or updated in the controller. If the `FLUX_POLICY_VALUE`
169169
environment variable is not set, it means the policy should be removed.
170170

docs/references/helm-operator-integration.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ Top level image example:
141141
kind: HelmRelease
142142
metadata:
143143
annotations:
144-
flux.weave.works/automated: "true"
145-
flux.weave.works/tag.chart-image: semver:~4.0
144+
fluxcd.io/automated: "true"
145+
fluxcd.io/tag.chart-image: semver:~4.0
146146
spec:
147147
values:
148148
image:
@@ -156,9 +156,9 @@ Sub-section images example:
156156
kind: HelmRelease
157157
metadata:
158158
annotations:
159-
flux.weave.works/automated: "true"
160-
flux.weave.works/tag.prometheus: semver:~2.3
161-
flux.weave.works/tag.alertmanager: glob:v0.15.*
159+
fluxcd.io/automated: "true"
160+
fluxcd.io/tag.prometheus: semver:~2.3
161+
fluxcd.io/tag.alertmanager: glob:v0.15.*
162162
filter.fluxcd.io/nats: regex:^0.6.*
163163
spec:
164164
values:

docs/tutorials/driving-flux.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ It should look a little something like this:
179179
@@ -8,8 +8,8 @@ metadata:
180180
app: podinfo
181181
annotations:
182-
flux.weave.works/automated: "true"
183-
- flux.weave.works/tag.init: regexp:^3.*
184-
- flux.weave.works/tag.podinfod: semver:~1.3
185-
+ flux.weave.works/tag.init: glob:1.4.*
186-
+ flux.weave.works/tag.podinfod: glob:1.4.*
182+
fluxcd.io/automated: "true"
183+
- fluxcd.io/tag.init: regexp:^3.*
184+
- fluxcd.io/tag.podinfod: semver:~1.3
185+
+ fluxcd.io/tag.init: glob:1.4.*
186+
+ fluxcd.io/tag.podinfod: glob:1.4.*
187187
spec:
188188
strategy:
189189
rollingUpdate:
@@ -223,10 +223,10 @@ The resulting diff should look like this
223223
@@ -10,6 +10,7 @@ metadata:
224224
app: podinfo
225225
annotations:
226-
flux.weave.works/automated: "true"
227-
flux.weave.works/tag.init: glob:1.4.*
228-
flux.weave.works/tag.podinfod: glob:1.4.*
229-
+ flux.weave.works/locked: 'true'
226+
fluxcd.io/automated: "true"
227+
fluxcd.io/tag.init: glob:1.4.*
228+
fluxcd.io/tag.podinfod: glob:1.4.*
229+
+ fluxcd.io/locked: 'true'
230230
spec:
231231
strategy:
232232
rollingUpdate:
@@ -275,5 +275,5 @@ kubectl logs -n default deploy/flux -f
275275
```
276276

277277
If you should have any questions, find us on Slack in the [#flux
278-
channel](https://weave-community.slack.com/messages/flux/), get
279-
an invite to it [here](https://slack.weave.works/).
278+
channel](https://cncf.slack.com/messages/flux/), get
279+
an invite to it [here](https://slack.cncf.io).

0 commit comments

Comments
 (0)