Skip to content

Commit 5ff6e00

Browse files
authored
Merge pull request #28035 from adellape/op_ref_api
Update "Red Hat Operators reference" modules for API object & unwrap changes
2 parents 52c72b9 + a01d4d1 commit 5ff6e00

21 files changed

+98
-241
lines changed

modules/cloud-credential-operator.adoc

Lines changed: 29 additions & 112 deletions
Large diffs are not rendered by default.

modules/cluster-authentication-operator.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
[discrete]
99
== Purpose
1010

11-
The Cluster Authentication Operator installs and maintains the Authentication
12-
Custom Resource in a cluster and can be viewed with:
11+
The Cluster Authentication Operator installs and maintains the `Authentication` custom resource in a cluster and can be viewed with:
1312

1413
[source,terminal]
1514
----

modules/cluster-autoscaler-operator.adoc

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
[discrete]
99
== Purpose
1010

11-
The Cluster Autoscaler Operator manages deployments of the OpenShift Cluster
12-
Autoscaler using the cluster-api provider.
11+
The Cluster Autoscaler Operator manages deployments of the OpenShift Cluster Autoscaler using the `cluster-api` provider.
1312

1413
[discrete]
1514
== Project
@@ -19,10 +18,5 @@ link:https://github.com/openshift/cluster-autoscaler-operator[cluster-autoscaler
1918
[discrete]
2019
== CRDs
2120

22-
* `ClusterAutoscaler`: This is a singleton resource, which controls the configuration
23-
of the cluster's autoscaler instance. The Operator will only respond to the
24-
`ClusterAutoscaler` resource named `default` in the managed namespace, the
25-
value of the `WATCH_NAMESPACE` environment variable.
26-
* `MachineAutoscaler`: This resource targets a node group and manages the
27-
annotations to enable and configure autoscaling for that group, the `min` and
28-
`max` size. Currently only `MachineSet` objects can be targeted.
21+
* `ClusterAutoscaler`: This is a singleton resource, which controls the configuration autoscaler instance for the cluster. The Operator only responds to the `ClusterAutoscaler` resource named `default` in the managed namespace, the value of the `WATCH_NAMESPACE` environment variable.
22+
* `MachineAutoscaler`: This resource targets a node group and manages the annotations to enable and configure autoscaling for that group, the `min` and `max` size. Currently only `MachineSet` objects can be targeted.

modules/cluster-dns-operator.adoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
[discrete]
99
== Purpose
1010

11-
The DNS Operator deploys and manages CoreDNS to provide a name resolution
12-
service to pods that enables DNS-based Kubernetes Service discovery in
13-
{product-title}.
11+
The DNS Operator deploys and manages CoreDNS to provide a name resolution service to pods that enables DNS-based Kubernetes Service discovery in {product-title}.
1412

1513
The Operator creates a working default deployment based on the cluster's configuration.
1614

1715
* The default cluster domain is `cluster.local`.
1816
* Configuration of the CoreDNS Corefile or Kubernetes plug-in is not yet supported.
1917

20-
The DNS Operator manages CoreDNS as a Kubernetes daemon set exposed as a service
21-
with a static IP. CoreDNS runs on all nodes in the cluster.
18+
The DNS Operator manages CoreDNS as a Kubernetes daemon set exposed as a service with a static IP. CoreDNS runs on all nodes in the cluster.
2219

2320
[discrete]
2421
== Project

modules/cluster-image-registry-operator.adoc

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,13 @@
88
[discrete]
99
== Purpose
1010

11-
The Cluster Image Registry Operator manages a singleton instance of the
12-
{product-title} registry. It manages all configuration of the registry,
13-
including creating storage.
11+
The Cluster Image Registry Operator manages a singleton instance of the {product-title} registry. It manages all configuration of the registry, including creating storage.
1412

15-
On initial start up, the Operator creates a default `image-registry` resource
16-
instance based on the configuration detected in the cluster. This indicates
17-
what cloud storage type to use based on the cloud provider.
13+
On initial start up, the Operator creates a default `image-registry` resource instance based on the configuration detected in the cluster. This indicates what cloud storage type to use based on the cloud provider.
1814

19-
If insufficient information is available to define a complete `image-registry`
20-
resource, then an incomplete resource is defined and the Operator updates the
21-
resource status with information about what is missing.
15+
If insufficient information is available to define a complete `image-registry` resource, then an incomplete resource is defined and the Operator updates the resource status with information about what is missing.
2216

23-
The Cluster Image Registry Operator runs in the `openshift-image-registry`
24-
namespace and it also manages the registry instance in that location. All
25-
configuration and workload resources for the registry reside in that namespace.
17+
The Cluster Image Registry Operator runs in the `openshift-image-registry` namespace and it also manages the registry instance in that location. All configuration and workload resources for the registry reside in that namespace.
2618

2719
[discrete]
2820
== Project

modules/cluster-kube-scheduler-operator.adoc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
[discrete]
99
== Purpose
1010

11-
The Kubernetes Scheduler Operator manages and updates the Kubernetes Scheduler
12-
deployed on top of {product-title}. The operator is based on the {product-title} library-go
13-
framework and it is installed with the Cluster Version Operator (CVO).
11+
The Kubernetes Scheduler Operator manages and updates the Kubernetes Scheduler deployed on top of {product-title}. The Operator is based on the {product-title} `library-go` framework and it is installed with the Cluster Version Operator (CVO).
1412

1513
The Kubernetes Scheduler Operator contains the following components:
1614

@@ -34,5 +32,4 @@ The configuration for the Kubernetes Scheduler is the result of merging:
3432
* a default configuration.
3533
* an observed configuration from the spec `schedulers.config.openshift.io`.
3634

37-
All of these are sparse configurations, invalidated JSON snippets which are
38-
merged in order to form a valid configuration at the end.
35+
All of these are sparse configurations, invalidated JSON snippets which are merged in order to form a valid configuration at the end.

modules/cluster-monitoring-operator.adoc

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
[discrete]
99
== Purpose
1010

11-
The Cluster Monitoring Operator manages and updates the Prometheus-based cluster
12-
monitoring stack deployed on top of {product-title}.
11+
The Cluster Monitoring Operator manages and updates the Prometheus-based cluster monitoring stack deployed on top of {product-title}.
1312

1413
[discrete]
1514
== Project
@@ -19,21 +18,21 @@ link:https://github.com/openshift/cluster-monitoring-operator[openshift-monitori
1918
[discrete]
2019
== CRDs
2120

22-
* alertmanagers.monitoring.coreos.com
21+
* `alertmanagers.monitoring.coreos.com`
2322
** Scope: Namespaced
24-
** CR: alertmanager
23+
** CR: `alertmanager`
2524
** Validation: Yes
26-
* prometheuses.monitoring.coreos.com
25+
* `prometheuses.monitoring.coreos.com`
2726
** Scope: Namespaced
28-
** CR: prometheus
27+
** CR: `prometheus`
2928
** Validation: Yes
30-
* prometheusrules.monitoring.coreos.com
29+
* `prometheusrules.monitoring.coreos.com`
3130
** Scope: Namespaced
32-
** CR: prometheusrule
31+
** CR: `prometheusrule`
3332
** Validation: Yes
34-
* servicemonitors.monitoring.coreos.com
33+
* `servicemonitors.monitoring.coreos.com`
3534
** Scope: Namespaced
36-
** CR: servicemonitor
35+
** CR: `servicemonitor`
3736
** Validation: Yes
3837

3938
[discrete]

modules/cluster-network-operator.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@
88
[discrete]
99
== Purpose
1010

11-
The Cluster Network Operator installs and upgrades the networking components on
12-
an OpenShift Kubernetes cluster.
11+
The Cluster Network Operator installs and upgrades the networking components on an {product-title} cluster.

modules/cluster-openshift-controller-manager-operators.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88
[discrete]
99
== Purpose
1010

11-
The OpenShift Controller Manager Operator installs and maintains the `OpenShiftControllerManager` Custom Resource in a cluster and can be viewed with:
11+
The OpenShift Controller Manager Operator installs and maintains the `OpenShiftControllerManager` custom resource in a cluster and can be viewed with:
1212

1313
[source,terminal]
1414
----
1515
$ oc get clusteroperator openshift-controller-manager -o yaml
1616
----
1717

18-
The Custom Resource Definition `openshiftcontrollermanagers.operator.openshift.io`
19-
can be viewed in a cluster with:
18+
The custom resource definitino (CRD) `openshiftcontrollermanagers.operator.openshift.io` can be viewed in a cluster with:
2019

2120
[source,terminal]
2221
----

modules/cluster-samples-operator.adoc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@
88
[discrete]
99
== Purpose
1010

11-
The Cluster Samples Operator manages the sample imagestreams and templates stored in the `openshift` namespace.
11+
The Cluster Samples Operator manages the sample image streams and templates stored in the `openshift` namespace.
1212

13-
On initial start up, the Operator creates the default samples configuration resource to initiate the creation of the imagestreams and templates. The configuration object
14-
is a cluster scoped object with the key `cluster` and type `configs.samples`.
13+
On initial start up, the Operator creates the default samples configuration resource to initiate the creation of the image streams and templates. The configuration object is a cluster scoped object with the key `cluster` and type `configs.samples`.
1514

16-
The imagestreams are the {op-system-first}-based {product-title} imagestreams pointing to images on `registry.redhat.io`. Similarly, the templates are those categorized as {product-title} templates.
15+
The image streams are the {op-system-first}-based {product-title} image streams pointing to images on `registry.redhat.io`. Similarly, the templates are those categorized as {product-title} templates.
1716

18-
The Cluster Samples Operator deployment is contained within the `openshift-cluster-samples-operator` namespace. On start up, the install pull secret is used by the imagestream import logic in the internal registry and API server to authenticate with `registry.redhat.io`. An administrator can create any additional secrets in the `openshift` namespace if they change the registry used for the sample imagestreams. If created, those secrets contain the content of a Docker `config.json` needed to facilitate image import.
17+
The Cluster Samples Operator deployment is contained within the `openshift-cluster-samples-operator` namespace. On start up, the install pull secret is used by the image stream import logic in the internal registry and API server to authenticate with `registry.redhat.io`. An administrator can create any additional secrets in the `openshift` namespace if they change the registry used for the sample image streams. If created, those secrets contain the content of a `config.json` for `docker` needed to facilitate image import.
1918

20-
The image for the Cluster Samples Operator contains imagestream and template definitions for the associated {product-title} release. After the Cluster Samples Operator creates a sample, it adds an annotation that denotes the {product-title} version that it is compatible with. The Operator uses this annotation to ensure that each sample matches it's release version. Samples outside of its inventory are ignored, as are skipped samples. Modifications to any samples that are managed by the Operator are allowed as long as the version annotation is not modified or deleted. However, on an upgrade, as the version annotation will change, those modifications can get replaced as the sample will be updated with the newer version. The Jenkins images are part of the image payload from the installation and are tagged into the imagestreams directly.
19+
The image for the Cluster Samples Operator contains image stream and template definitions for the associated {product-title} release. After the Cluster Samples Operator creates a sample, it adds an annotation that denotes the {product-title} version that it is compatible with. The Operator uses this annotation to ensure that each sample matches the compatible release version. Samples outside of its inventory are ignored, as are skipped samples.
20+
21+
Modifications to any samples that are managed by the Operator are allowed as long as the version annotation is not modified or deleted. However, on an upgrade, as the version annotation will change, those modifications can get replaced as the sample will be updated with the newer version. The Jenkins images are part of the image payload from the installation and are tagged into the image streams directly.
2122

2223
The samples resource includes a finalizer, which cleans up the following upon its deletion:
2324

24-
* Operator-managed imagestreams
25+
* Operator-managed image streams
2526
* Operator-managed templates
2627
* Operator-generated configuration resources
2728
* Cluster status resources

0 commit comments

Comments
 (0)