Skip to content

Commit

Permalink
Merge pull request fluxcd#22 from fluxcd/update-fluxcdio
Browse files Browse the repository at this point in the history
Change annotations to fluxcd.io
  • Loading branch information
stefanprodan authored Oct 18, 2019
2 parents d529283 + f817917 commit f487106
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions releases/ghost.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
name: ghost
namespace: demo
annotations:
flux.weave.works/automated: "false"
flux.weave.works/tag.chart-image: glob:1.21.*
fluxcd.io/automated: "false"
fluxcd.io/tag.chart-image: glob:1.21.*
spec:
releaseName: ghost
chart:
Expand Down
4 changes: 2 additions & 2 deletions releases/mongodb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ metadata:
name: mongodb
namespace: demo
annotations:
flux.weave.works/automated: "false"
flux.weave.works/tag.chart-image: semver:~4.0
fluxcd.io/automated: "false"
fluxcd.io/tag.chart-image: semver:~4.0
spec:
releaseName: mongodb
chart:
Expand Down
10 changes: 5 additions & 5 deletions releases/redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ metadata:
name: redis
namespace: demo
annotations:
flux.weave.works/automated: "true"
flux.weave.works/tag.chart-image: semver:~4.0
flux.weave.works/locked: 'true'
flux.weave.works/locked_msg: '"Halt updates for now"'
flux.weave.works/locked_user: Stefan Prodan <stefan@weave.works>
fluxcd.io/automated: "true"
fluxcd.io/tag.chart-image: semver:~4.0
fluxcd.io/locked: "true"
fluxcd.io/locked_msg: "Halt updates for now"
fluxcd.io/locked_user: "Stefan Prodan <stefan@weave.works>"
spec:
releaseName: redis
chart:
Expand Down
6 changes: 3 additions & 3 deletions workloads/podinfo-dep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ metadata:
labels:
app: podinfo
annotations:
flux.weave.works/automated: "true"
flux.weave.works/tag.init: regex:^3.10.*
flux.weave.works/tag.podinfod: semver:~2.1
fluxcd.io/automated: "true"
fluxcd.io/tag.init: regex:^3.10.*
fluxcd.io/tag.podinfod: semver:~2.1
spec:
strategy:
rollingUpdate:
Expand Down

0 comments on commit f487106

Please sign in to comment.