Skip to content

Commit eab4ae2

Browse files
authored
Merge pull request #45681 from codablock/fix-dead-links
Update a few dead/outdated links in the "live and let live" blog post
2 parents 132cc26 + 2b84bd6 commit eab4ae2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

content/en/blog/_posts/2022-11-04-live-and-let-live-with-kluctl-and-ssa.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ large Kubernetes deployments, composed of multiple smaller parts
2222

2323
To get a basic understanding of Kluctl, I suggest to visit the [kluctl.io](https://kluctl.io)
2424
website and read through the documentation and tutorials, for example the
25-
[microservices demo tutorial](https://kluctl.io/docs/guides/tutorials/microservices-demo/).
25+
[microservices demo tutorial](https://kluctl.io/docs/tutorials/microservices-demo/1-basic-project-setup/).
2626
As an alternative, you can watch [Hands-on Introduction to kluctl](https://www.youtube.com/watch?v=9LoYLjDjOdg)
2727
from the Rawkode Academy YouTube channel which shows a hands-on demo session.
2828

29-
There is also a [Kluctl delivery scenario](https://github.com/codablock/podtato-head/tree/kluctl/delivery/kluctl)
30-
available in my fork of the [podtato-head](https://github.com/codablock/podtato-head) demo project.
29+
There is also a [Kluctl delivery scenario](https://github.com/podtato-head/podtato-head-delivery/tree/main/kluctl)
30+
for the [podtato-head](https://github.com/podtato-head/podtato-head) demo project.
3131

3232
## Live and let live
3333

@@ -144,8 +144,8 @@ If the field manager is not known by Kluctl, it will check if force-applying is
144144
requested for that field. Force-applying can be requested in different ways:
145145

146146
1. By passing `--force-apply` to Kluctl. This will cause ALL fields to be force-applied on conflicts.
147-
2. By adding the [`kluctl.io/force-apply=true`](https://kluctl.io/docs/reference/deployments/annotations/all-resources/#kluctlioforce-apply) annotation to the object in question. This will cause all fields of that object to be force-applied on conflicts.
148-
3. By adding the [`kluctl.io/force-apply-field=my.json.path`](https://kluctl.io/docs/reference/deployments/annotations/all-resources/#kluctlioforce-apply-field) annotation to the object in question. This causes only fields matching the JSON path to be force-applied on conflicts.
147+
2. By adding the [`kluctl.io/force-apply=true`](https://kluctl.io/docs/kluctl/deployments/annotations/all-resources/#kluctlioforce-apply) annotation to the object in question. This will cause all fields of that object to be force-applied on conflicts.
148+
3. By adding the [`kluctl.io/force-apply-field=my.json.path`](https://kluctl.io/docs/kluctl/deployments/annotations/all-resources/#kluctlioforce-apply-field) annotation to the object in question. This causes only fields matching the JSON path to be force-applied on conflicts.
149149

150150
Marking a field to be force-applied is required whenever some other actor is
151151
known to erroneously claim fields (the ECK operator does this to the nodeSets

0 commit comments

Comments
 (0)