Skip to content

Commit 0c42c04

Browse files
authored
[release-4.16] OCPBUGS-38021: Integration of the OpenStack CRs into the insights-operator (#974)
* Collect oscp CRs Control Plan of the Red Hat OpenStack starting from the version 18 (RHOSO 18) will be deployed using OpenShift operators as a set of OpenShift applications. Compute nodes will be deployed still as RHEL nodes and will be outside of the OpenShift cluster but all will be mangaged by the Dataplane-operator and only interface for OpenStack operators will be though the CRs: - OpenStackControlPlane CR for the control plane, - OpenStackDataplaneNodeSet and OpenStackDataplaneDeployment CRs for the compute nodes. This patch adds OpenStackControlPlane CR to the insights-operator so that whole configuration of the OpenStack control plane may be gathered by the insights-operator and send to analysis to the Insights server. Co-Authored-By: Yatin Karel <[email protected]> Conflicts: docs/gathered-data.md pkg/gatherers/clusterconfig/clusterconfig_gatherer.go Related: #OSPRH-5904 (cherry picked from commit 999cbf5) * Add anonymization for data in the oscp CR Some fields in the collected OpenStackControlPlane CRs should be anonymized. This is for example field 'options' from the 'dns' service spec. Related: #OSPRH-5904 (cherry picked from commit d725c1f) * Add test module for the oscp CR gatherer (cherry picked from commit 1573f08) * Add way to drop some fields from the gathered oscp CR For now it will drop only 'metadata/annotations/kubectl.kubernetes.io/last-applied-configuration' but other fields can be added to that list too. (cherry picked from commit c697f3d) * Collect osdpns CRs Control Plan of the Red Hat OpenStack starting from the version 18 (RHOSO 18) will be deployed using OpenShift operators as a set of OpenShift applications. Compute nodes will be deployed still as RHEL nodes and will be outside of the OpenShift cluster but all will be mangaged by the Dataplane-operator and only interface for OpenStack operators will be though the CRs: - OpenStackControlPlane CR for the control plane, - OpenStackDataplaneNodeSet and OpenStackDataplaneDeployment CRs for the compute nodes. This patch adds OpenStackDataplaneNodeSet CR to the insights-operator so that whole configuration of the OpenStack control plane may be gathered by the insights-operator and send to analysis to the Insights server. Co-Authored-By: Yatin Karel <[email protected]> Related: #OSPRH-5904 (cherry picked from commit 809ea80) * Collect osdpd CRs Control Plan of the Red Hat OpenStack starting from the version 18 (RHOSO 18) will be deployed using OpenShift operators as a set of OpenShift applications. Compute nodes will be deployed still as RHEL nodes and will be outside of the OpenShift cluster but all will be mangaged by the Dataplane-operator and only interface for OpenStack operators will be though the CRs: - OpenStackControlPlane CR for the control plane, - OpenStackDataplaneNodeSet and OpenStackDataplaneDeployment CRs for the compute nodes. This patch adds OpenStackDataplaneDeployment CR to the insights-operator so that whole configuration of the OpenStack control plane may be gathered by the insights-operator and send to analysis to the Insights server. Co-Authored-By: Yatin Karel <[email protected]> Related: #OSPRH-5904 (cherry picked from commit 52659ff) * Add 'ansibleHost' field to be annonymized (cherry picked from commit 933ac23) * Rename names of the collected OpenStackDataPlane resources (cherry picked from commit 5a82b6b) * Update examples of the OpenStack CRs to their latest versions Related: #OSPRH-5904 (cherry picked from commit c6feae6) * Collect OpenStackVersion CRs Red Hat's openstack-operator in addition to the OpenStackControlPlane and OpenStackDataPlane CRs uses also additonal CR 'openstackversions' which reports version of the openstack(s) deployed in the OCP cluster. This patch adds support for gathering also this CRs from the cluster if they exists. Related: #OSPRH-5904 (cherry picked from commit d0d5cc7)
1 parent 3a723d3 commit 0c42c04

20 files changed

+3522
-0
lines changed

docs/anonymized-data.md

+10
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,13 @@ anonymized by the Insights Operator. This list is subject to change.
7979
- Status.HTTPProxy
8080
- Status.HTTPSProxy
8181
- Status.NoProxy
82+
- OpenstackControlplanes
83+
- IP Addresses
84+
- Spec.dns.template.options
85+
- OpenstackDataplaneNodeSets
86+
- IP Addresses
87+
- ansibleHost
88+
- ansibleUser
89+
- edpm_sshd_allowed_ranges
90+
- dnsClusterAddresses
91+
- Status.allHostnames

docs/gathered-data.md

+98
Original file line numberDiff line numberDiff line change
@@ -1681,6 +1681,104 @@ Collects logs from pods in `openshift-sdn` namespace with following substrings:
16811681
None
16821682

16831683

1684+
## PodDefinition
1685+
1686+
## OpenstackControlplanes
1687+
1688+
Collects `openstackcontrolplanes.core.openstack.org`
1689+
resources from all namespaces
1690+
1691+
### API Reference
1692+
None
1693+
1694+
### Sample data
1695+
- [docs/insights-archive-sample/namespaces/openstack/core.openstack.org/openstackcontrolplanes/openstack-galera-network-isolation.json](./insights-archive-sample/namespaces/openstack/core.openstack.org/openstackcontrolplanes/openstack-galera-network-isolation.json)
1696+
1697+
### Location in archive
1698+
- `namespaces/{namespace}/core.openstack.org/openstackcontrolplanes/{name}.json`
1699+
1700+
### Config ID
1701+
`clusterconfig/openstack_controlplanes`
1702+
1703+
### Released version
1704+
- 4.17
1705+
1706+
### Changes
1707+
None
1708+
1709+
1710+
## OpenstackDataplaneDeployments
1711+
1712+
Collects `openstackdataplanedeployments.dataplane.openstack.org`
1713+
resources from all namespaces
1714+
1715+
### API Reference
1716+
None
1717+
1718+
### Sample data
1719+
- [docs/insights-archive-sample/namespaces/openstack/dataplane.openstack.org/openstackdataplanedeployments/edpm-deployment.json](./insights-archive-sample/namespaces/openstack/dataplane.openstack.org/openstackdataplanedeployments/edpm-deployment.json)
1720+
1721+
### Location in archive
1722+
- `namespaces/{namespace}/dataplane.openstack.org/openstackdataplanedeployments/{name}.json`
1723+
1724+
### Config ID
1725+
`clusterconfig/openstack_dataplanedeployments`
1726+
1727+
### Released version
1728+
- 4.17
1729+
1730+
### Changes
1731+
None
1732+
1733+
1734+
## OpenstackDataplaneNodeSets
1735+
1736+
Collects `openstackdataplanenodesets.dataplane.openstack.org`
1737+
resources from all namespaces
1738+
1739+
### API Reference
1740+
None
1741+
1742+
### Sample data
1743+
- [docs/insights-archive-sample/namespaces/openstack/dataplane.openstack.org/openstackdataplanenodesets/openstack-edpm-ipam.json](./insights-archive-sample/namespaces/openstack/dataplane.openstack.org/openstackdataplanenodesets/openstack-edpm-ipam.json)
1744+
1745+
### Location in archive
1746+
- `namespaces/{namespace}/dataplane.openstack.org/openstackdataplanenodesets/{name}.json`
1747+
1748+
### Config ID
1749+
`clusterconfig/openstack_dataplanenodesets`
1750+
1751+
### Released version
1752+
- 4.17
1753+
1754+
### Changes
1755+
None
1756+
1757+
1758+
## Openstackversions
1759+
1760+
Collects `openstackversion.core.openstack.org`
1761+
resources from all namespaces
1762+
1763+
### API Reference
1764+
None
1765+
1766+
### Sample data
1767+
- [docs/insights-archive-sample/namespaces/openstack/core.openstack.org/openstackversions/openstack-galera-network-isolation.json](./insights-archive-sample/namespaces/openstack/core.openstack.org/openstackversions/openstack-galera-network-isolation.json)
1768+
1769+
### Location in archive
1770+
- `namespaces/{namespace}/core.openstack.org/openstackversions/{name}.json`
1771+
1772+
### Config ID
1773+
`clusterconfig/openstack_version`
1774+
1775+
### Released version
1776+
- 4.17
1777+
1778+
### Changes
1779+
None
1780+
1781+
16841782
## PodDefinition
16851783

16861784
Collects pod definition from pods that are

docs/insights-archive-sample/insights-operator/gathers.json

+32
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,38 @@
129129
"warnings": null,
130130
"panic": null
131131
},
132+
{
133+
"name": "clusterconfig/openstack_controlplanes",
134+
"duration_in_ms": 25,
135+
"records_count": 1,
136+
"errors": null,
137+
"warnings": null,
138+
"panic": null
139+
},
140+
{
141+
"name": "clusterconfig/openstack_dataplanedeployments",
142+
"duration_in_ms": 9,
143+
"records_count": 1,
144+
"errors": null,
145+
"warnings": null,
146+
"panic": null
147+
},
148+
{
149+
"name": "clusterconfig/openstack_dataplanenodesets",
150+
"duration_in_ms": 9,
151+
"records_count": 1,
152+
"errors": null,
153+
"warnings": null,
154+
"panic": null
155+
},
156+
{
157+
"name": "clusterconfig/openstack_version",
158+
"duration_in_ms": 25,
159+
"records_count": 1,
160+
"errors": null,
161+
"warnings": null,
162+
"panic": null
163+
},
132164
{
133165
"name": "clusterconfig/scheduler_logs",
134166
"duration_in_ms": 617,

0 commit comments

Comments
 (0)