Skip to content

CMP-4521: Fix HyperShift Hosted Cluster detection using controlPlaneTopology #15085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuumasato wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CMP-4521: Fix HyperShift Hosted Cluster detection using controlPlaneTopology #15085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions shared/applicability/oval/installed_app_is_ocp4.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<literal_component>/kubernetes-api-resources/hypershift/version</literal_component>
</local_variable>

<local_variable id="ocp4_operator_deployment_dump_location" datatype="string" comment="The actual filepath of the file to scan." version="1">
<literal_component>/kubernetes-api-resources/api/v1/namespaces/openshift-compliance/pods/api-checks-pod</literal_component>
</local_variable>

<unix:file_test id="test_file_for_ocp4" check="only one" comment="Find the actual file to be scanned." version="1">
<unix:object object_ref="object_file_for_ocp4"/>
</unix:file_test>
Expand Down Expand Up @@ -91,13 +87,13 @@


<ind:yamlfilecontent_object id="object_hypershift_hosted" version="1">
<ind:filepath var_ref="ocp4_operator_deployment_dump_location"/>
<ind:yamlpath>.spec.containers[:].command[:]</ind:yamlpath>
<ind:filepath var_ref="ocp4_infra_dump_location"/>
<ind:yamlpath>.status.controlPlaneTopology</ind:yamlpath>
</ind:yamlfilecontent_object>

<ind:yamlfilecontent_state id="state_hypershift_hosted" version="1">
<ind:value datatype="record" entity_check="at least one">
<field name="#" datatype="string" operation="pattern match" entity_check="at least one">^--platform=HyperShift$</field>
<ind:value datatype="record">
<field name="#" datatype="string" operation="pattern match">^External$</field>
</ind:value>
</ind:yamlfilecontent_state>

Expand Down Expand Up @@ -270,7 +266,8 @@
<description>The application installed on the system is OpenShift 4 on HyperShift Hosted Cluster.</description>
</metadata>
<criteria operator="AND">
<criterion comment="Make sure there is HyperShift in the Compliance Operator Command flag" test_ref="test_hypershift_hosted"/>
<criterion comment="Make sure controlPlaneTopology is External (HyperShift Hosted Cluster)" test_ref="test_hypershift_hosted"/>
<criterion comment="Make sure OCP4 infrastructure/cluster file is present" test_ref="test_file_for_ocp4_infra"/>
</criteria>
</definition>

Expand Down
Loading