Skip to content

Commit 2e99c96

Browse files
authored
Merge pull request #99337 from ShaunaDiaz/OSDOCS-15755
OSDOCS-15755: breaks up topics into assemblies MS config
2 parents 3a46b71 + ab035c3 commit 2e99c96

25 files changed

+252
-210
lines changed

_topic_maps/_topic_map_ms.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,19 @@ Name: Configuring
113113
Dir: microshift_configuring
114114
Distros: microshift
115115
Topics:
116-
- Name: Using the MicroShift configuration file
116+
- Name: About the default MicroShift configuration file
117+
File: microshift-default-config-yaml
118+
- Name: Customizing MicroShift by using the configuration file
117119
File: microshift-using-config-yaml
120+
- Name: Using configuration snippets
121+
File: microshift-config-snippets
118122
- Name: Configuring IPv6 networking
119123
File: microshift-nw-ipv6-config
120124
- Name: Using ingress control for a MicroShift cluster
121125
File: microshift-ingress-controller
122126
- Name: Disabling LVMS CSI provider and CSI snapshot
123127
File: microshift-disable-lvms-csi-provider-csi-snapshot
124-
- Name: Checking the status of Greenboot health checks
128+
- Name: Checking the status of greenboot health checks
125129
File: microshift-greenboot-checking-status
126130
- Name: Cluster access with kubeconfig files
127131
File: microshift-cluster-access-kubeconfig
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="microshift-config-snippets"]
3+
include::_attributes/attributes-microshift.adoc[]
4+
= Using {microshift-short} configuration snippets
5+
:context: microshift-config-snippets
6+
7+
If you want to configure one or two settings, use the `/etc/microshift/config.d/` configuration directory to drop in configuration snippet YAML files.
8+
9+
include::modules/microshift-how-config-snippets-work.adoc[leveloffset=+1]
10+
11+
include::modules/microshift-example-config-snippets-list.adoc[leveloffset=+1]
12+
13+
include::modules/microshift-example-config-snippets-objects.adoc[leveloffset=+1]
14+
15+
include::modules/microshift-example-mixed-config-snippets.adoc[leveloffset=+1]
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="microshift-default-config-yaml"]
3+
include::_attributes/attributes-microshift.adoc[]
4+
= About the default {microshift-short} configuration file
5+
:context: microshift-default-config-yaml
6+
7+
toc::[]
8+
9+
The {microshift-short} built-in default settings are listed in a YAML file.
10+
11+
include::modules/microshift-config-rhde-con.adoc[leveloffset=+1]
12+
13+
include::snippets/microshift-greenboot-status-snip.adoc[leveloffset=+2]
14+
15+
include::modules/microshift-config-yaml.adoc[leveloffset=+1]
16+
17+
include::modules/microshift-default-settings.adoc[leveloffset=+2]
18+
19+
//[id="additional-resources_microshift-using-config-yaml_{context}"]
20+
//[role="_additional-resources"]
21+
//== Additional resources
22+
23+
//* xref:../microshift-using-config-yaml.adoc#microshift-using-config-yaml[Customizing {microshift-short} by using the configuration file]

microshift_configuring/microshift-gdp.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ include::modules/microshift-ref-generic-device-plugin-troubleshooting.adoc[level
2727
[id="_additional-resources_microshift-gdp_{context}"]
2828
== Additional resources
2929

30-
* xref:../microshift_configuring/microshift-using-config-yaml.adoc#microshift-config-yaml_microshift-configuring[The {microshift-short} YAML configuration file]
30+
//* xref:../microshift_configuring/microshift-using-config-yaml.adoc#microshift-using-config-yaml[Customizing {microshift-short} by using the configuration file]
3131
* xref:../microshift_networking/microshift-networking-settings.adoc#microshift-understanding-networking-settings[Understanding networking settings]
3232
* xref:../microshift_networking/microshift_multiple_networks/microshift-cni-multus.adoc#microshift-cni-multus[About using multiple networks]
3333
* xref:../microshift_networking/microshift_network_policy/microshift-network-policy-index.adoc#microshift-network-policies[About network policies]

microshift_configuring/microshift-ingress-controller.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ include::modules/microshift-ingress-controller-tls-config.adoc[leveloffset=+2]
2020
[role="_additional-resources"]
2121
== Additional resources
2222

23-
* xref:../microshift_configuring/microshift-using-config-yaml.adoc#microshift-config-snippets_microshift-configuring[Using configuration snippets]
23+
//* xref:../microshift_configuring/microshift-config-snippets.adoc#microshift-config-snippets[Using configuration snippets]
2424

2525
* link:https://docs.redhat.com/container-platform/latest/networking/networking_operators/ingress-operator.html#nw-http2-haproxy_configuring-ingress[Enabling HTTP/2 Ingress connectivity] ({OCP} documentation)

microshift_configuring/microshift-using-config-yaml.adoc

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,27 @@
11
:_mod-docs-content-type: ASSEMBLY
22
[id="microshift-using-config-yaml"]
33
include::_attributes/attributes-microshift.adoc[]
4-
= Using the {microshift-short} configuration file
5-
:context: microshift-configuring
6-
7-
:FeatureName: The Generic Device Plugin for {microshift-short}
8-
9-
include::snippets/technology-preview.adoc[]
4+
= Customizing {microshift-short} by using the configuration file
5+
:context: microshift-using-config-yaml
106

117
toc::[]
128

13-
A YAML file customizes {microshift-short} instances with your preferences, settings, and parameters.
14-
15-
include::modules/microshift-config-rhde-con.adoc[leveloffset=+1]
16-
17-
include::snippets/microshift-greenboot-status-snip.adoc[leveloffset=+2]
9+
Use the {microshift-short} YAML file to customize your preferences, settings, and parameters.
1810

19-
include::modules/microshift-config-yaml.adoc[leveloffset=+1]
11+
:FeatureName: The Generic Device Plugin for {microshift-short}
2012

21-
include::modules/microshift-default-settings.adoc[leveloffset=+2]
13+
include::snippets/technology-preview.adoc[]
2214

2315
include::modules/microshift-config-yaml-custom.adoc[leveloffset=+1]
2416

2517
include::modules/microshift-config-parameters-table.adoc[leveloffset=+2]
2618

27-
include::modules/microshift-config-snippets.adoc[leveloffset=+2]
28-
2919
include::modules/microshift-nw-advertise-address.adoc[leveloffset=+2]
3020

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

33-
[role="_additional-resources"]
3423
[id="additional-resources_microshift-using-config-yaml_{context}"]
24+
[role="_additional-resources"]
3525
== Additional resources
3626

3727
* xref:../../microshift-greenboot-checking-status.adoc#microshift-greenboot-checking-status[Checking Greenboot status]

microshift_configuring/microshift_auth_security/microshift-tls-config.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ include::modules/microshift-tls-default-cipher-suites.adoc[leveloffset=+2]
1818
[role="_additional-resources"]
1919
== Additional resources
2020

21-
* xref:../../microshift_configuring/microshift-using-config-yaml.adoc#microshift-config-snippets_microshift-configuring[Using configuration snippets].
21+
//* xref:../microshift-config-snippets.adoc#microshift-config-snippets[Using configuration snippets]
2222

23-
* To secure pods using security content constraints (SCC), see xref:../../microshift_running_apps/microshift-authentication.adoc#authentication-microshift[Pod security authentication and authorization].
23+
* To secure pods using security content constraints (SCC), see xref:../../microshift_running_apps/microshift-authentication.adoc#authentication-microshift[Pod security authentication and authorization]
2424

25-
* xref:../../microshift_configuring/microshift-cluster-access-kubeconfig.adoc#microshift-kubeconfig[Cluster access with kubeconfig].
25+
* xref:../../microshift_configuring/microshift-cluster-access-kubeconfig.adoc#microshift-kubeconfig[Cluster access with kubeconfig]
2626

27-
* xref:../microshift_auth_security/microshift-custom-ca.adoc#microshift-custom-ca[Configuring custom certificate authorities].
27+
* xref:../microshift_auth_security/microshift-custom-ca.adoc#microshift-custom-ca[Configuring custom certificate authorities]

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-yaml.adoc#microshift-config-yaml_microshift-configuring[Using a YAML configuration file]
26+
//* xref:../../microshift_configuring/microshift-using-config-yaml.adoc#microshift-using-config-yaml[Customizing {microshift-short} by using the 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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ include::modules/microshift-install-rpm-preparing.adoc[leveloffset=+1]
2020
//additional resources for install rpm prep module
2121
[role="_additional-resources"]
2222
.Additional resources
23-
* 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-yaml.adoc#microshift-using-config-yaml[Configuring MicroShift].
25-
* 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].
23+
* 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-yaml.adoc#microshift-using-config-yaml[Customizing {microshift-short} by using the configuration file]
25+
* 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://docs.redhat.com/en/documentation/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].
27-
* For more information about creating VGs and PVs, read link:https://docs.redhat.com/en/documentation/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].
27+
* For more information about creating VGs and PVs, read link:https://docs.redhat.com/en/documentation/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]
2828
2929
include::modules/microshift-install-rpms.adoc[leveloffset=+1]
3030

@@ -43,7 +43,7 @@ include::modules/microshift-accessing.adoc[leveloffset=+1]
4343
[role="_additional-resources"]
4444
.Additional resources
4545

46-
* xref:../microshift_cli_ref/microshift-oc-cli-install.adoc#microshift-oc-cli-install[Installing the OpenShift CLI tool].
46+
* xref:../microshift_cli_ref/microshift-oc-cli-install.adoc#microshift-oc-cli-install[Installing the OpenShift CLI tool]
4747

4848
include::modules/microshift-accessing-cluster-locally.adoc[leveloffset=+2]
4949

microshift_networking/microshift-cni.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ include::modules/microshift-nw-topology.adoc[leveloffset=+1]
6969
[role="_additional-resources"]
7070
== Additional resources
7171

72-
* xref:../microshift_configuring/microshift-using-config-yaml.adoc#microshift-config-yaml_microshift-configuring[Using a YAML configuration file]
72+
//* xref:../microshift_configuring/microshift-using-config-yaml.adoc#microshift-using-config-yaml[Customizing {microshift-short} by using the configuration file]
7373
* xref:../microshift_networking/microshift-networking-settings.adoc#microshift-understanding-networking-settings[Understanding networking settings]
7474
* xref:../microshift_networking/microshift_multiple_networks/microshift-cni-multus.adoc#microshift-cni-multus[About using multiple networks]
7575
* xref:../microshift_networking/microshift_network_policy/microshift-network-policy-index.adoc#microshift-network-policies[About network policies]

0 commit comments

Comments
 (0)