Skip to content

Commit 79aee6c

Browse files
committed
OSDOCS-11439: update microshift config defaults
1 parent 6863a36 commit 79aee6c

File tree

1 file changed

+22
-12
lines changed

1 file changed

+22
-12
lines changed

modules/microshift-default-settings.adoc

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,27 @@ ingress:
4646
routeAdmissionPolicy:
4747
namespaceOwnership: InterNamespaceAllowed # <12>
4848
status: Managed # <13>
49-
manifests: # <14>
49+
kubelet: # <14>
50+
manifests: # <15>
5051
kustomizePaths:
5152
- /usr/lib/microshift/manifests
5253
- /usr/lib/microshift/manifests.d/*
5354
- /etc/microshift/manifests
5455
- /etc/microshift/manifests.d/*
5556
network:
5657
clusterNetwork:
57-
- 10.42.0.0/16 # <15>
58+
- 10.42.0.0/16 # <16>
5859
serviceNetwork:
59-
- 10.43.0.0/16 # <16>
60-
serviceNodePortRange: 30000-32767 # <17>
60+
- 10.43.0.0/16 # <17>
61+
serviceNodePortRange: 30000-32767 # <18>
6162
node:
62-
hostnameOverride: "" # <18>
63-
nodeIP: "" # <19>
63+
hostnameOverride: "" # <19>
64+
nodeIP: "" # <20>
65+
nodeIPv6: "" # <21>
66+
storage:
67+
driver: "" # <22>
68+
optionalCsiComponents: # <23>
69+
- ""
6470
----
6571
<1> A string that specifies the IP address from which the API server is advertised to members of the cluster. The default value is calculated based on the address of the service network.
6672
<2> How long log files are kept before automatic deletion. The default value of `0` in the `maxFileAge` parameter means a log file is never deleted based on age. This value can be configured.
@@ -75,9 +81,13 @@ node:
7581
<11> Default ports shown. Configurable. Valid values for both port entries are a single, unique port in the 1-65535 range. The values of the `ports.http` and `ports.https` fields cannot be the same.
7682
<12> Describes how hostname claims across namespaces are handled. By default, allows routes to claim different paths of the same hostname across namespaces. Valid values are `Strict` and `InterNamespaceAllowed`. Specifying `Strict` prevents routes in different namespaces from claiming the same hostname. If the value is deleted in a customized {microshift-short} `config.yaml`, the `InterNamespaceAllowed` value is automatically set.
7783
<13> Default router status, can be `Managed` or `Removed`.
78-
<14> The locations on the file system to scan for `kustomization` files to use to load manifests. Set to a list of paths to scan only those paths. Set to an empty list to disable loading manifests. The entries in the list can be glob patterns to match multiple subdirectories.
79-
<15> A block of IP addresses from which pod IP addresses are allocated. This field is immutable after installation.
80-
<16> A block of virtual IP addresses for Kubernetes services. IP address pool for services. A single entry is supported. This field is immutable after installation.
81-
<17> 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.
82-
<18> 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.
83-
<19> The IP address of the node. The default value is the IP address of the default route.
84+
<14> Parameter for configuring kubelet. Used for low-latency configuration. Default value is null.
85+
<15> The locations on the file system to scan for `kustomization` files to use to load manifests. Set to a list of paths to scan only those paths. Set to an empty list to disable loading manifests. The entries in the list can be glob patterns to match multiple subdirectories.
86+
<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.
87+
<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.
88+
<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.
90+
<20> The IPv4 address of the node. The default value is the IP address of the default route.
91+
<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.
92+
<22> Default value is empty. Valid values are "none" or "lvms". An empty value or null field defaults to LVMS deployment.
93+
<23> Array. Default value is null or an empty array. A null or empty array defaults to deploying `snapshot-controller` and `snapshot-webhook`. Expected values are `csi-snapshot-controller`, `csi-snapshot-webhook`, or `none`. An entry of `none` is mutually exclusive with all other values.

0 commit comments

Comments
 (0)