Skip to content

Commit b3e25ae

Browse files
authored
Merge pull request #83015 from ShaunaDiaz/OSDOCS-12131
OSDOCS-12131: adds immutable setting note to configuration doc
2 parents b46765d + 7d7ba84 commit b3e25ae

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

_topic_maps/_topic_map_ms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Dir: microshift_configuring
110110
Distros: microshift
111111
Topics:
112112
- Name: Using the MicroShift configuration file
113-
File: microshift-using-config-tools
113+
File: microshift-using-config-yaml
114114
- Name: Configuring IPv6 networking
115115
File: microshift-nw-ipv6-config
116116
- Name: Cluster access with kubeconfig

microshift_configuring/microshift-using-config-tools.adoc renamed to microshift_configuring/microshift-using-config-yaml.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:_mod-docs-content-type: ASSEMBLY
2-
[id="microshift-using-config-tools"]
2+
[id="microshift-using-config-yaml"]
33
include::_attributes/attributes-microshift.adoc[]
44
= Using the {microshift-short} configuration file
55
:context: microshift-configuring
@@ -18,7 +18,7 @@ include::modules/microshift-nw-advertise-address.adoc[leveloffset=+2]
1818

1919
include::modules/microshift-config-nodeport-limits.adoc[leveloffset=+2]
2020

21-
[id="additional-resources_microshift-using-config-tools_{context}"]
21+
[id="additional-resources_microshift-using-config-yaml_{context}"]
2222
[role="_additional-resources"]
2323
== Additional resources
2424

microshift_configuring/microshift_low_latency/microshift-low-latency.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include::modules/microshift-low-latency-config-yaml.adoc[leveloffset=+1]
2323
[role="_additional-resources"]
2424
.Additional resources
2525
//TODO * workload partitioning crossref here
26-
* xref:../../microshift_configuring/microshift-using-config-tools.adoc#microshift-config-yaml_microshift-configuring[Using a YAML configuration file]
26+
* xref:../../microshift_configuring/microshift-using-config-yaml.adoc#microshift-config-yaml_microshift-configuring[Using a YAML configuration file]
2727
* link:https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/#kubelet-config-k8s-io-v1beta1-KubeletConfiguration[KubeletConfiguration reference] (Kubernetes upstream documentation)
2828
2929
//RHEL TuneD

microshift_install_rpm/microshift-install-rpm.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ include::modules/microshift-install-rpm-preparing.adoc[leveloffset=+1]
2121
[role="_additional-resources"]
2222
.Additional resources
2323
* Download the link:https://console.redhat.com/openshift/install/pull-secret[pull secret] from the Red Hat Hybrid Cloud Console.
24-
* xref:../microshift_configuring/microshift-using-config-tools.adoc#microshift-using-config-tools[Configuring MicroShift].
24+
* xref:../microshift_configuring/microshift-using-config-yaml.adoc#microshift-using-config-yaml[Configuring MicroShift].
2525
* For more options on partition configuration, read link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/performing_a_standard_rhel_9_installation/index#manual-partitioning_graphical-installation[Configuring Manual Partitioning].
2626
* For more information about resizing your existing LVs to free up capacity in your VGs, read link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/configuring_and_managing_logical_volumes/index#managing-lvm-volume-groups_configuring-and-managing-logical-volumes[Managing LVM Volume Groups].
2727
* For more information about creating VGs and PVs, read link:https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/configuring_and_managing_logical_volumes/overview-of-logical-volume-management_configuring-and-managing-logical-volumes[Overview of logical volume management].

microshift_networking/microshift-cni.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ include::modules/microshift-nw-topology.adoc[leveloffset=+1]
6868
[id="_additional-resources_microshift-cni_{context}"]
6969
== Additional resources
7070

71-
* xref:../microshift_configuring/microshift-using-config-tools.adoc#microshift-config-yaml_microshift-configuring[Using a YAML configuration file]
71+
* xref:../microshift_configuring/microshift-using-config-yaml.adoc#microshift-config-yaml_microshift-configuring[Using a YAML configuration file]
7272
* xref:../microshift_networking/microshift-networking-settings.adoc#microshift-understanding-networking-settings[Understanding networking settings]
7373
* xref:../microshift_networking/microshift_multiple_networks/microshift-cni-multus.adoc#microshift-cni-multus[About using multiple networks]
7474
* xref:../microshift_networking/microshift_network_policy/microshift-network-policy-index.adoc#microshift-network-policies[About network policies]

microshift_networking/microshift-nw-router.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ include::modules/microshift-nw-router-config-ip-address.adoc[leveloffset=+2]
2424
[role="_additional-resources"]
2525
[id="additional-resources_microshift-understanding-and-configuring-router_{context}"]
2626
== Additional resources
27-
* xref:../microshift_configuring/microshift-using-config-tools.adoc#microshift-yaml-default_microshift-using-config-tools[Default settings] ({microshift-short})
27+
* xref:../microshift_configuring/microshift-using-config-yaml.adoc#microshift-yaml-default_microshift-using-config-yaml[Default settings] ({microshift-short})
2828

2929
* xref:../microshift_networking/microshift_network_policy/microshift-network-policy-index.adoc#microshift-network-policies[About network policies]
3030

modules/microshift-default-settings.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Module included in the following assemblies:
22
//
3-
// * microshift_configuring/microshift-using-config-tools.adoc
3+
// * microshift_configuring/microshift-using-config-yaml.adoc
44

55
:_mod-docs-content-type: CONCEPT
66
[id="microshift-yaml-default_{context}"]
@@ -86,7 +86,7 @@ storage:
8686
<16> A block of IP addresses from which pod IP addresses are allocated. IPv4 is the default. Dual-stack entries are supported. The first entry in this field is immutable after installation.
8787
<17> A block of virtual IP addresses for Kubernetes services. IP address pool for services. IPv4 is the default. Dual-stack entries are supported. The first entry in this field is immutable after installation.
8888
<18> The port range allowed for Kubernetes services of type `NodePort`. If not specified, the default range of 30000-32767 is used. Services without a `NodePort` specified are automatically allocated one from this range. This parameter can be updated after the cluster is installed.
89-
<19> The name of the node. The default value is the hostname. If non-empty, this string is used to identify the node instead of the hostname.
89+
<19> The name of the node. The default value is the hostname. If non-empty, this string is used to identify the node instead of the hostname. You cannot change this immutable setting after {microshift-short} starts for the first time.
9090
<20> The IPv4 address of the node. The default value is the IP address of the default route.
9191
<21> The IPv6 address for the node for dual-stack configurations. Cannot be configured in single stack for either IPv4 or IPv6. Default is empty or null.
9292
<22> Default value is empty. Valid values are "none" or "lvms". An empty value or null field defaults to LVMS deployment.

snippets/microshift-greenboot-status-snip.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Text snippet included in the following assemblies:
22
//
3-
// * microshift_configuring/microshift-using-config-tools.adoc
3+
// * microshift_configuring/microshift-using-config-yaml.adoc
44
//
55
// Text snippet included in the following modules:
66
//

0 commit comments

Comments
 (0)