Skip to content

Commit 0227a9b

Browse files
committed
Adjust comments to reflect new reality.
Signed-off-by: Kurt Garloff <kurt@garloff.de>
1 parent eb4ecf0 commit 0227a9b

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

cluster-settings-template.env

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
# TODO: Check whether we can make this more compatible with v1 KaaS
66
#
77
### Per namespace: secrets
8-
# The namespace to keep your CS objects in for a set of clusters
9-
CS_NAMESPACE=cluster
10-
# Location of the clouds.yaml
8+
# The namespace to keep your CS objects for a set of clusters (use e.g. cloud project name)
9+
CS_NAMESPACE=clusterns
10+
# Location of the clouds.yaml (default: ~/.config/openstack/clouds.yaml)
1111
CLOUDS_YAML=~/.config/openstack/clouds.yaml
12-
# Name of the cloud in there -- currently it must be called openstack
12+
# Name of the cloud in there (default: openstack, any name works now)
1313
OS_CLOUD=${OS_CLOUD:-openstack}
1414
### Per cluster stack settings
15-
# Kubernetes Maj.Min, e.g. 1.32 (without leading v)
15+
# Kubernetes Maj.Min, e.g. 1.32 (without leading v), can be left empty (see last line)
1616
CS_MAINVER=
17-
# CS Template version that matches, e.g. v1 or v0-sha.XXXXXXX
17+
# CS Template version that matches, e.g. v1 or v0-sha.XXXXXXX, see table
1818
CS_VERSION=
1919
### Now the per workload cluster settings
20-
# Full K8s Version Maj.Min.Patch, e.g. 1.32.3 (this is per cluster)
20+
# Full K8s Version Maj.Min.Patch, without leading 'v', e.g. 1.32.3 (this is per cluster)
2121
CL_PATCHVER=
2222
# Cluster name
2323
CL_NAME=
@@ -30,5 +30,6 @@ CL_CTRLNODES=1
3030
# Number of (initial) worker nodes
3131
CL_WRKRNODES=1
3232
### Autofill magic, don't touch
33+
CS_NAMESPACE=${CS_NAMESPACE:-$OS_CLOUD}
3334
CS_MAINVER=${CS_MAINVER:-${CL_PATCHVER%.*}}
3435

0 commit comments

Comments
 (0)