diff --git a/modules/network-observability-flowcollector-api-specifications.adoc b/modules/network-observability-flowcollector-api-specifications.adoc index b1f5bde9a9..c073318a00 100644 --- a/modules/network-observability-flowcollector-api-specifications.adoc +++ b/modules/network-observability-flowcollector-api-specifications.adoc @@ -1,4 +1,3 @@ -// Automatically generated by 'openshift-apidocs-gen'. Do not edit. :_mod-docs-content-type: REFERENCE [id="network-observability-flowcollector-api-specifications_{context}"] = FlowCollector API specifications diff --git a/rest_api/config_apis/network-config-openshift-io-v1.adoc b/rest_api/config_apis/network-config-openshift-io-v1.adoc index 20751b0ed5..c967d77121 100644 --- a/rest_api/config_apis/network-config-openshift-io-v1.adoc +++ b/rest_api/config_apis/network-config-openshift-io-v1.adoc @@ -78,6 +78,11 @@ Type:: | `object` | externalIP defines configuration for controllers that affect Service.ExternalIP. If nil, then ExternalIP is not allowed to be set. +| `networkDiagnostics` +| `object` +| networkDiagnostics defines network diagnostics configuration. + Takes precedence over spec.disableNetworkDiagnostics in network.operator.openshift.io. If networkDiagnostics is not specified or is empty, and the spec.disableNetworkDiagnostics flag in network.operator.openshift.io is set to true, the network diagnostics feature will be disabled. + | `networkType` | `string` | NetworkType is the plugin that is to be deployed (e.g. OpenShiftSDN). This should match a value that the cluster-network-operator understands, or else no networking will be installed. Currently supported values are: - OpenShiftSDN This field is immutable after installation. @@ -181,6 +186,210 @@ Type:: | `array (string)` | rejectedCIDRs is the list of disallowed CIDRs. These take precedence over allowedCIDRs. +|=== +=== .spec.networkDiagnostics +Description:: ++ +-- +networkDiagnostics defines network diagnostics configuration. + Takes precedence over spec.disableNetworkDiagnostics in network.operator.openshift.io. If networkDiagnostics is not specified or is empty, and the spec.disableNetworkDiagnostics flag in network.operator.openshift.io is set to true, the network diagnostics feature will be disabled. +-- + +Type:: + `object` + + + + +[cols="1,1,1",options="header"] +|=== +| Property | Type | Description + +| `mode` +| `string` +| mode controls the network diagnostics mode + When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is All. + +| `sourcePlacement` +| `object` +| sourcePlacement controls the scheduling of network diagnostics source deployment + See NetworkDiagnosticsSourcePlacement for more details about default values. + +| `targetPlacement` +| `object` +| targetPlacement controls the scheduling of network diagnostics target daemonset + See NetworkDiagnosticsTargetPlacement for more details about default values. + +|=== +=== .spec.networkDiagnostics.sourcePlacement +Description:: ++ +-- +sourcePlacement controls the scheduling of network diagnostics source deployment + See NetworkDiagnosticsSourcePlacement for more details about default values. +-- + +Type:: + `object` + + + + +[cols="1,1,1",options="header"] +|=== +| Property | Type | Description + +| `nodeSelector` +| `object (string)` +| nodeSelector is the node selector applied to network diagnostics components + When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `kubernetes.io/os: linux`. + +| `tolerations` +| `array` +| tolerations is a list of tolerations applied to network diagnostics components + When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is an empty list. + +| `tolerations[]` +| `object` +| The pod this Toleration is attached to tolerates any taint that matches the triple using the matching operator . + +|=== +=== .spec.networkDiagnostics.sourcePlacement.tolerations +Description:: ++ +-- +tolerations is a list of tolerations applied to network diagnostics components + When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is an empty list. +-- + +Type:: + `array` + + + + +=== .spec.networkDiagnostics.sourcePlacement.tolerations[] +Description:: ++ +-- +The pod this Toleration is attached to tolerates any taint that matches the triple using the matching operator . +-- + +Type:: + `object` + + + + +[cols="1,1,1",options="header"] +|=== +| Property | Type | Description + +| `effect` +| `string` +| Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute. + +| `key` +| `string` +| Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys. + +| `operator` +| `string` +| Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category. + +| `tolerationSeconds` +| `integer` +| TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system. + +| `value` +| `string` +| Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string. + +|=== +=== .spec.networkDiagnostics.targetPlacement +Description:: ++ +-- +targetPlacement controls the scheduling of network diagnostics target daemonset + See NetworkDiagnosticsTargetPlacement for more details about default values. +-- + +Type:: + `object` + + + + +[cols="1,1,1",options="header"] +|=== +| Property | Type | Description + +| `nodeSelector` +| `object (string)` +| nodeSelector is the node selector applied to network diagnostics components + When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `kubernetes.io/os: linux`. + +| `tolerations` +| `array` +| tolerations is a list of tolerations applied to network diagnostics components + When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `- operator: "Exists"` which means that all taints are tolerated. + +| `tolerations[]` +| `object` +| The pod this Toleration is attached to tolerates any taint that matches the triple using the matching operator . + +|=== +=== .spec.networkDiagnostics.targetPlacement.tolerations +Description:: ++ +-- +tolerations is a list of tolerations applied to network diagnostics components + When omitted, this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is `- operator: "Exists"` which means that all taints are tolerated. +-- + +Type:: + `array` + + + + +=== .spec.networkDiagnostics.targetPlacement.tolerations[] +Description:: ++ +-- +The pod this Toleration is attached to tolerates any taint that matches the triple using the matching operator . +-- + +Type:: + `object` + + + + +[cols="1,1,1",options="header"] +|=== +| Property | Type | Description + +| `effect` +| `string` +| Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute. + +| `key` +| `string` +| Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys. + +| `operator` +| `string` +| Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category. + +| `tolerationSeconds` +| `integer` +| TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system. + +| `value` +| `string` +| Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string. + |=== === .status Description:: diff --git a/rest_api/network_apis/adminnetworkpolicy-policy-networking-k8s-io-v1alpha1.adoc b/rest_api/network_apis/adminnetworkpolicy-policy-networking-k8s-io-v1alpha1.adoc index f508d7c8c5..48547c269d 100644 --- a/rest_api/network_apis/adminnetworkpolicy-policy-networking-k8s-io-v1alpha1.adoc +++ b/rest_api/network_apis/adminnetworkpolicy-policy-networking-k8s-io-v1alpha1.adoc @@ -123,6 +123,7 @@ Support: Core | `subject` | `object` | Subject defines the pods to which this AdminNetworkPolicy applies. +Note that host-networked pods are not included in subject selection. Support: Core @@ -1467,6 +1468,7 @@ Description:: + -- Subject defines the pods to which this AdminNetworkPolicy applies. +Note that host-networked pods are not included in subject selection. Support: Core diff --git a/rest_api/network_apis/baselineadminnetworkpolicy-policy-networking-k8s-io-v1alpha1.adoc b/rest_api/network_apis/baselineadminnetworkpolicy-policy-networking-k8s-io-v1alpha1.adoc index 28665befbb..46fad3a8f2 100644 --- a/rest_api/network_apis/baselineadminnetworkpolicy-policy-networking-k8s-io-v1alpha1.adoc +++ b/rest_api/network_apis/baselineadminnetworkpolicy-policy-networking-k8s-io-v1alpha1.adoc @@ -113,6 +113,7 @@ Subject field. | `subject` | `object` | Subject defines the pods to which this BaselineAdminNetworkPolicy applies. +Note that host-networked pods are not included in subject selection. Support: Core @@ -1445,6 +1446,7 @@ Description:: + -- Subject defines the pods to which this BaselineAdminNetworkPolicy applies. +Note that host-networked pods are not included in subject selection. Support: Core diff --git a/rest_api/network_apis/egressfirewall-k8s-ovn-org-v1.adoc b/rest_api/network_apis/egressfirewall-k8s-ovn-org-v1.adoc index fbbcda9726..eed85ba92b 100644 --- a/rest_api/network_apis/egressfirewall-k8s-ovn-org-v1.adoc +++ b/rest_api/network_apis/egressfirewall-k8s-ovn-org-v1.adoc @@ -191,7 +191,7 @@ Type:: | `dnsName` | `string` -| dnsName is the domain name to allow/deny traffic to. If this is set, cidrSelector and nodeSelector must be unset. +| dnsName is the domain name to allow/deny traffic to. If this is set, cidrSelector and nodeSelector must be unset. For a wildcard DNS name, the '*' will match only one label. Additionally, only a single '*' can be used at the beginning of the wildcard DNS name. For example, '*.example.com' will match 'sub1.example.com' but won't match 'sub2.sub1.example.com' | `nodeSelector` | `object` diff --git a/rest_api/operator_apis/config-imageregistry-operator-openshift-io-v1.adoc b/rest_api/operator_apis/config-imageregistry-operator-openshift-io-v1.adoc index b3a3abc9ca..2e0da69a12 100644 --- a/rest_api/operator_apis/config-imageregistry-operator-openshift-io-v1.adoc +++ b/rest_api/operator_apis/config-imageregistry-operator-openshift-io-v1.adoc @@ -660,7 +660,15 @@ Required:: | `labelSelector` | `object` -| A label query over a set of resources, in this case pods. +| A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. + +| `matchLabelKeys` +| `array (string)` +| MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. Also, MatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + +| `mismatchLabelKeys` +| `array (string)` +| MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector. Also, MismatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. | `namespaceSelector` | `object` @@ -679,7 +687,7 @@ Required:: Description:: + -- -A label query over a set of resources, in this case pods. +A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. -- Type:: @@ -861,7 +869,15 @@ Required:: | `labelSelector` | `object` -| A label query over a set of resources, in this case pods. +| A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. + +| `matchLabelKeys` +| `array (string)` +| MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. Also, MatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + +| `mismatchLabelKeys` +| `array (string)` +| MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector. Also, MismatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. | `namespaceSelector` | `object` @@ -880,7 +896,7 @@ Required:: Description:: + -- -A label query over a set of resources, in this case pods. +A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. -- Type:: @@ -1125,7 +1141,15 @@ Required:: | `labelSelector` | `object` -| A label query over a set of resources, in this case pods. +| A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. + +| `matchLabelKeys` +| `array (string)` +| MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. Also, MatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + +| `mismatchLabelKeys` +| `array (string)` +| MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector. Also, MismatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. | `namespaceSelector` | `object` @@ -1144,7 +1168,7 @@ Required:: Description:: + -- -A label query over a set of resources, in this case pods. +A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. -- Type:: @@ -1326,7 +1350,15 @@ Required:: | `labelSelector` | `object` -| A label query over a set of resources, in this case pods. +| A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. + +| `matchLabelKeys` +| `array (string)` +| MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. Also, MatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + +| `mismatchLabelKeys` +| `array (string)` +| MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector. Also, MismatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. | `namespaceSelector` | `object` @@ -1345,7 +1377,7 @@ Required:: Description:: + -- -A label query over a set of resources, in this case pods. +A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. -- Type:: @@ -2541,6 +2573,8 @@ OperatorCondition is just the standard condition fields. Type:: `object` +Required:: + - `type` diff --git a/rest_api/operator_apis/dns-operator-openshift-io-v1.adoc b/rest_api/operator_apis/dns-operator-openshift-io-v1.adoc index 48f25182c6..238614bf28 100644 --- a/rest_api/operator_apis/dns-operator-openshift-io-v1.adoc +++ b/rest_api/operator_apis/dns-operator-openshift-io-v1.adoc @@ -429,7 +429,7 @@ Type:: | `upstreams[]` | `object` | Upstream can either be of type SystemResolvConf, or of type Network. - * For an Upstream of type SystemResolvConf, no further fields are necessary: The upstream will be configured to use /etc/resolv.conf. * For an Upstream of type Network, a NetworkResolver field needs to be defined with an IP address or IP:port if the upstream listens on a port other than 53. + - For an Upstream of type SystemResolvConf, no further fields are necessary: The upstream will be configured to use /etc/resolv.conf. - For an Upstream of type Network, a NetworkResolver field needs to be defined with an IP address or IP:port if the upstream listens on a port other than 53. |=== === .spec.upstreamResolvers.transportConfig @@ -533,7 +533,7 @@ Description:: + -- Upstream can either be of type SystemResolvConf, or of type Network. - * For an Upstream of type SystemResolvConf, no further fields are necessary: The upstream will be configured to use /etc/resolv.conf. * For an Upstream of type Network, a NetworkResolver field needs to be defined with an IP address or IP:port if the upstream listens on a port other than 53. + - For an Upstream of type SystemResolvConf, no further fields are necessary: The upstream will be configured to use /etc/resolv.conf. - For an Upstream of type Network, a NetworkResolver field needs to be defined with an IP address or IP:port if the upstream listens on a port other than 53. -- Type:: @@ -630,6 +630,8 @@ OperatorCondition is just the standard condition fields. Type:: `object` +Required:: + - `type` diff --git a/rest_api/operator_apis/etcd-operator-openshift-io-v1.adoc b/rest_api/operator_apis/etcd-operator-openshift-io-v1.adoc index 75cef7a735..279387d0c9 100644 --- a/rest_api/operator_apis/etcd-operator-openshift-io-v1.adoc +++ b/rest_api/operator_apis/etcd-operator-openshift-io-v1.adoc @@ -66,6 +66,10 @@ Type:: |=== | Property | Type | Description +| `controlPlaneHardwareSpeed` +| `string` +| HardwareSpeed allows user to change the etcd tuning profile which configures the latency parameters for heartbeat interval and leader election timeouts allowing the cluster to tolerate longer round-trip-times between etcd members. Valid values are "", "Standard" and "Slower". "" means no opinion and the platform is left to choose a reasonable default which is subject to change without notice. + | `failedRevisionLimit` | `integer` | failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default) diff --git a/rest_api/operator_apis/imagepruner-imageregistry-operator-openshift-io-v1.adoc b/rest_api/operator_apis/imagepruner-imageregistry-operator-openshift-io-v1.adoc index 94c63b5ce9..34c7d8707a 100644 --- a/rest_api/operator_apis/imagepruner-imageregistry-operator-openshift-io-v1.adoc +++ b/rest_api/operator_apis/imagepruner-imageregistry-operator-openshift-io-v1.adoc @@ -617,7 +617,15 @@ Required:: | `labelSelector` | `object` -| A label query over a set of resources, in this case pods. +| A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. + +| `matchLabelKeys` +| `array (string)` +| MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. Also, MatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + +| `mismatchLabelKeys` +| `array (string)` +| MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector. Also, MismatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. | `namespaceSelector` | `object` @@ -636,7 +644,7 @@ Required:: Description:: + -- -A label query over a set of resources, in this case pods. +A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. -- Type:: @@ -818,7 +826,15 @@ Required:: | `labelSelector` | `object` -| A label query over a set of resources, in this case pods. +| A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. + +| `matchLabelKeys` +| `array (string)` +| MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. Also, MatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + +| `mismatchLabelKeys` +| `array (string)` +| MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector. Also, MismatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. | `namespaceSelector` | `object` @@ -837,7 +853,7 @@ Required:: Description:: + -- -A label query over a set of resources, in this case pods. +A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. -- Type:: @@ -1082,7 +1098,15 @@ Required:: | `labelSelector` | `object` -| A label query over a set of resources, in this case pods. +| A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. + +| `matchLabelKeys` +| `array (string)` +| MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. Also, MatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + +| `mismatchLabelKeys` +| `array (string)` +| MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector. Also, MismatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. | `namespaceSelector` | `object` @@ -1101,7 +1125,7 @@ Required:: Description:: + -- -A label query over a set of resources, in this case pods. +A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. -- Type:: @@ -1283,7 +1307,15 @@ Required:: | `labelSelector` | `object` -| A label query over a set of resources, in this case pods. +| A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. + +| `matchLabelKeys` +| `array (string)` +| MatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key in (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MatchLabelKeys and LabelSelector. Also, MatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. + +| `mismatchLabelKeys` +| `array (string)` +| MismatchLabelKeys is a set of pod label keys to select which pods will be taken into consideration. The keys are used to lookup values from the incoming pod labels, those key-value labels are merged with `LabelSelector` as `key notin (value)` to select the group of existing pods which pods will be taken into consideration for the incoming pod's pod (anti) affinity. Keys that don't exist in the incoming pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both MismatchLabelKeys and LabelSelector. Also, MismatchLabelKeys cannot be set when LabelSelector isn't set. This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate. | `namespaceSelector` | `object` @@ -1302,7 +1334,7 @@ Required:: Description:: + -- -A label query over a set of resources, in this case pods. +A label query over a set of resources, in this case pods. If it's null, this PodAffinityTerm matches with no Pods. -- Type:: @@ -1629,6 +1661,8 @@ OperatorCondition is just the standard condition fields. Type:: `object` +Required:: + - `type` diff --git a/rest_api/operator_apis/kubecontrollermanager-operator-openshift-io-v1.adoc b/rest_api/operator_apis/kubecontrollermanager-operator-openshift-io-v1.adoc index b7a9594742..58408bf0ec 100644 --- a/rest_api/operator_apis/kubecontrollermanager-operator-openshift-io-v1.adoc +++ b/rest_api/operator_apis/kubecontrollermanager-operator-openshift-io-v1.adoc @@ -190,6 +190,8 @@ OperatorCondition is just the standard condition fields. Type:: `object` +Required:: + - `type` @@ -296,6 +298,8 @@ NodeStatus provides information about the current state of a particular node man Type:: `object` +Required:: + - `nodeName` diff --git a/rest_api/operator_apis/openshiftcontrollermanager-operator-openshift-io-v1.adoc b/rest_api/operator_apis/openshiftcontrollermanager-operator-openshift-io-v1.adoc index 8686c65cb1..3237234835 100644 --- a/rest_api/operator_apis/openshiftcontrollermanager-operator-openshift-io-v1.adoc +++ b/rest_api/operator_apis/openshiftcontrollermanager-operator-openshift-io-v1.adoc @@ -158,6 +158,8 @@ OperatorCondition is just the standard condition fields. Type:: `object` +Required:: + - `type`