certsuite | update backwards compatibility till v5.5.0

Author: ramperher

roles/k8s_best_practices_certsuite/README.md

@@ -9,7 +9,7 @@ Before executing the certsuite, it's important to label the pods to test using t
 Name                                    | Default                                                                                                                                                                                                                                 | Description
 --------------------------------------- |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------
 kbpc_check_commit_sha                   | false                                                                                                                                                                                                                                   | Flag that allows to check if the certsuite image used is based on the same commit SHA than the repository cloned in this role.
-kbpc_version                            | See [default vars file](defaults/main.yml) for the latest version supported by the agent                                                                                                                                                                                                                           | Certsuite downloaded version. The role supports from v5.3.3 till the latest stable version. HEAD version (in the main branch) can be also used, but it is not guaranteed a complete compatibility with the latest unstable changes.
+kbpc_version                            | See [default vars file](defaults/main.yml) for the latest version supported by the agent                                                                                                                                                                                                                           | Certsuite downloaded version. The role supports from v5.5.0 till the latest stable version. HEAD version (in the main branch) can be also used, but it is not guaranteed a complete compatibility with the latest unstable changes.
 kbpc_repo_org_name                      | redhat-best-practices-for-k8s                                                                                                                                                                                                           | Repository organization.
 kbpc_project_name                       | certsuite                                                                                                                                                                                                                               | Project name. Also, directory name to look at on the certsuite repo.
 kbpc_repository                         | "https://github.com/{{ kbpc_repo_org_name }}/{{ kbpc_project_name }}"                                                                                                                                                                                                                                       | Repository to download the certsuite code.

roles/k8s_best_practices_certsuite/tasks/pre-run.yml

@@ -6,12 +6,12 @@
       - kbpc_kubeconfig|length
     fail_msg: "kubeconfig is required to run certsuite"
 
-- name: Fail if certsuite version is lower than v5.3.3
+- name: Fail if certsuite version is lower than v5.5.0
   when:
-    - kbpc_version is version("v5.3.3", "<")
+    - kbpc_version is version("v5.5.0", "<")
     - kbpc_version != "HEAD"
   ansible.builtin.fail:
-    msg: "This role is not compatible with certsuite version < v5.3.3"
+    msg: "This role is not compatible with certsuite version < v5.5.0"
 
 # Just do this in case preflight test suite is used. This happens if using
 # preflight label. This check is included as a warning for users in case of not

roles/k8s_best_practices_certsuite/tasks/tests.yml

@@ -12,7 +12,6 @@
     mode: '0755'
 
 - name: Tasks related to Certsuite submission through CWE Hydra API
-  when: kbpc_version is version('v5.4.2', '>=') or kbpc_version == 'HEAD'
   block:
     - name: Verify if the CWE Hydra API key file exists
       ansible.builtin.stat:
@@ -58,7 +57,7 @@
           --preflight-dockerconfig=/usr/certsuite/config/config.json \
           --allow-preflight-insecure={{ kbpc_allow_preflight_insecure }} \
           {% endif %}
-          {% if (kbpc_version is version('v5.4.3', '>=') or kbpc_version == 'HEAD') and kbpc_cwe_apikey is defined and kbpc_cwe_project_id is defined %}
+          {% if kbpc_cwe_apikey is defined and kbpc_cwe_project_id is defined %}
           --connect-api-key={{ kbpc_cwe_apikey }} \
           --connect-project-id={{ kbpc_cwe_project_id }} \
           {% endif %}
@@ -68,11 +67,7 @@
           --kubeconfig=/usr/certsuite/config/kubeconfig \
           --certsuite-probe-image={{ kbpc_partner_repo }}/{{ kbpc_support_image }} \
           --create-xml-junit-file={{ kbpc_enable_xml_creation }} \
-          {% if kbpc_version is version('v5.5.0', '>=') or kbpc_version == 'HEAD' %}
           --intrusive={{ kbpc_intrusive }} \
-          {% else %}
-          --non-intrusive={{ kbpc_non_intrusive_only }} \
-          {% endif %}
           --log-level={{ kbpc_log_level }} \
           --include-web-files=true
       ansible.builtin.shell: |

roles/k8s_best_practices_certsuite/templates/certsuite_config.yml.j2

@@ -50,19 +50,12 @@ servicesignorelist:
   - {{ item }}
 {% endfor %}
 
-{% if kbpc_version is version('v5.4.2', '>=') or kbpc_version == 'HEAD' %}
 connectAPIConfig:
   baseURL: "https://access.redhat.com/hydra/cwe/rest/v1.0"
-{% if kbpc_version is version('v5.4.2', '==') and kbpc_cwe_apikey is defined and kbpc_cwe_project_id is defined %}
-  apiKey: {{ kbpc_cwe_apikey }}
-  projectID: {{ kbpc_cwe_project_id }}
-{% else %}
   apiKey: ""
   projectID: ""
-{% endif %}
   proxyURL: ""
   proxyPort: ""
-{% endif %}
 
 ## collector DB
 {% if kbpc_partner_name|length == 0 %}#{% endif %}partnerName: {{ kbpc_partner_name }}