diff --git a/manifests/0000_10_config-operator_01_build.crd.yaml b/manifests/0000_10_config-operator_01_build.crd.yaml index 0496c13a7..161c45137 100644 --- a/manifests/0000_10_config-operator_01_build.crd.yaml +++ b/manifests/0000_10_config-operator_01_build.crd.yaml @@ -18,8 +18,10 @@ spec: status: {} validation: openAPIV3Schema: - description: Build holds cluster-wide information on how to handle builds. The - canonical name is `cluster` + description: "Build configures the behavior of OpenShift builds for the entire + cluster. This includes default settings that can be overridden in BuildConfig + objects, and overrides which are applied to all builds. \n The canonical name + is \"cluster\"" properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation @@ -406,9 +408,11 @@ spec: description: Spec holds user-settable values for the build controller configuration properties: additionalTrustedCA: - description: AdditionalTrustedCA is a reference to a ConfigMap containing + description: "AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that should be trusted for image pushes and pulls during - builds. The namespace for this config map is openshift-config. + builds. The namespace for this config map is openshift-config. \n + DEPRECATED: Additional CAs for image pull and push should be set on + image.config.openshift.io/cluster instead." properties: name: description: name is the metadata.name of the referenced config diff --git a/manifests/0000_10_config-operator_01_ingress.crd.yaml b/manifests/0000_10_config-operator_01_ingress.crd.yaml index 7532c5253..874218c33 100644 --- a/manifests/0000_10_config-operator_01_ingress.crd.yaml +++ b/manifests/0000_10_config-operator_01_ingress.crd.yaml @@ -18,9 +18,8 @@ spec: status: {} validation: openAPIV3Schema: - description: Ingress holds cluster-wide information about Ingress. The canonical - name is `cluster` TODO this object is an example of a possible grouping and - is subject to change or removal + description: Ingress holds cluster-wide information about ingress, including + the default ingress domain used for routes. The canonical name is `cluster`. properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation @@ -406,9 +405,12 @@ spec: description: spec holds user settable values for configuration properties: domain: - description: 'domain is used to generate a default host name for a route - when the route''s host name is empty. The generated host name will - follow this pattern: "..".' + description: "domain is used to generate a default host name for a route + when the route's host name is empty. The generated host name will + follow this pattern: \"..\". + \n It is also used as the default wildcard domain suffix for ingress. + The default ingresscontroller domain will follow this pattern: \"*.\". + \n Once set, changing domain is not currently supported." type: string type: object status: diff --git a/manifests/0000_10_config-operator_01_network.crd.yaml b/manifests/0000_10_config-operator_01_network.crd.yaml index c9aaf5e14..310603347 100644 --- a/manifests/0000_10_config-operator_01_network.crd.yaml +++ b/manifests/0000_10_config-operator_01_network.crd.yaml @@ -16,9 +16,11 @@ spec: storage: true validation: openAPIV3Schema: - description: Network holds cluster-wide information about Network. The canonical - name is `cluster` TODO this object is an example of a possible grouping and - is subject to change or removal + description: 'Network holds cluster-wide information about Network. The canonical + name is `cluster`. It is used to configure the desired network configuration, + such as: IP address pools for services/pod IPs, network plugin, etc. Please + view network.spec for an explanation on what applies when configuring this + resource.' properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation @@ -401,10 +403,15 @@ spec: type: string type: object spec: - description: spec holds user settable values for configuration. + description: spec holds user settable values for configuration. As a general + rule, this SHOULD NOT be read directly. Instead, you should consume the + NetworkStatus, as it indicates the currently deployed configuration. Currently, + most spec fields are immutable after installation. Please view the individual + ones for further details on each. properties: clusterNetwork: - description: IP address pool to use for pod IPs. + description: IP address pool to use for pod IPs. This field is immutable + after installation. items: description: ClusterNetworkEntry is a contiguous block of IP addresses from which pod IPs are allocated. @@ -455,11 +462,11 @@ spec: description: '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' + values are: - OpenShiftSDN This field is immutable after installation.' type: string serviceNetwork: description: IP address pool for services. Currently, we only support - a single entry here. + a single entry here. This field is immutable after installation. items: type: string type: array