Skip to content

Commit 06d5b86

Browse files
authored
Merge pull request #8843 from killianmuldoon/pr-docs-xdg-home
📖 Small doc fixes for XDG_CONFIG_HOME
2 parents 34439da + 3c7c24c commit 06d5b86

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

cmd/clusterctl/hack/create-local-repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def print_instructions(repos):
289289
cmd = "clusterctl init \\\n"
290290
for name, type, next_version, components_path in repos:
291291
cmd += " {} {}:{} \\\n".format(type_to_flag(type), name, next_version)
292-
cmd += " --config ~/.cluster-api/dev-repository/config.yaml"
292+
cmd += " --config $XDG_CONFIG_HOME/cluster-api/dev-repository/config.yaml"
293293
print(cmd)
294294
print
295295
if 'infrastructure-docker' in providerList:

docs/book/src/clusterctl/developers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ clusterctl init \
8080
--control-plane kubeadm:v0.3.8 \
8181
--infrastructure aws:v0.5.0 \
8282
--infrastructure docker:v0.3.8 \
83-
--config ~/.cluster-api/dev-repository/config.yaml
83+
--config $XDG_CONFIG_HOME/cluster-api/dev-repository/config.yaml
8484
```
8585

8686
As you might notice, the command is using the `$XDG_CONFIG_HOME/cluster-api/dev-repository/config.yaml` config file,
@@ -90,7 +90,7 @@ containing all the required setting to make clusterctl use the local repository.
9090

9191
<h1>Warnings</h1>
9292

93-
You must pass `--config ~/.cluster-api/dev-repository/config.yaml` to all the clusterctl commands you are running
93+
You must pass `--config $XDG_CONFIG_HOME/cluster-api/dev-repository/config.yaml` to all the clusterctl commands you are running
9494
during your dev session.
9595

9696
The above config file changes the location of the [overrides layer] folder thus ensuring

docs/book/src/user/quick-start.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ clusterctl init --infrastructure virtink
719719
# The username used to access the remote vSphere endpoint
720720
export VSPHERE_USERNAME="[email protected]"
721721
# The password used to access the remote vSphere endpoint
722-
# You may want to set this in ~/.cluster-api/clusterctl.yaml so your password is not in
722+
# You may want to set this in `$XDG_CONFIG_HOME/cluster-api/clusterctl.yaml` so your password is not in
723723
# bash history
724724
export VSPHERE_PASSWORD="admin!23"
725725
@@ -756,7 +756,7 @@ You can now create your first workload cluster by running the following:
756756
<h1>Alternatives to environment variables</h1>
757757
758758
Throughout this quickstart guide we've given instructions on setting parameters using environment variables. For most
759-
environment variables in the rest of the guide, you can also set them in ~/.cluster-api/clusterctl.yaml
759+
environment variables in the rest of the guide, you can also set them in `$XDG_CONFIG_HOME/cluster-api/clusterctl.yaml`
760760
761761
See [`clusterctl init`](../clusterctl/commands/init.md) for more details.
762762

docs/book/src/user/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Installing cert-manager Version="v1.11.0"
165165
Error: action failed after 10 attempts: failed to get cert-manager object /, Kind=, /: Object 'Kind' is missing in 'unstructured object has no kind'
166166
```
167167

168-
This error was fixed in more recent Cluster API releases on the 0.4 and 1.0 release branches. The simplest way to resolve the issue is to upgrade to a newer version of Cluster API for a given release. For who need to continue using an older release it is possible to override the repository used by `clusterctl init` in the clusterctl config file. The default location of this file is in `~/.cluster-api/clusterctl.yaml`.
168+
This error was fixed in more recent Cluster API releases on the 0.4 and 1.0 release branches. The simplest way to resolve the issue is to upgrade to a newer version of Cluster API for a given release. For who need to continue using an older release it is possible to override the repository used by `clusterctl init` in the clusterctl config file. The default location of this file is in `$XDG_CONFIG_HOME/cluster-api/clusterctl.yaml`.
169169

170170
To do so add the following to the file:
171171
```yaml

0 commit comments

Comments
 (0)