task: cleanup setting "use_secondary_network", "resource_name" Jinja2 variables

Signed-off-by: Thomas Haller <thaller@redhat.com>

Author: thom311

manifests/sriov-pod.yaml.j2

@@ -17,11 +17,11 @@ spec:
     image: {{ test_image }}
     command: {{ command }}
     args: {{ args }}
-    imagePullPolicy: {{ image_pull_policy }} {% if use_secondary_network and resource_name %}
+    imagePullPolicy: {{ image_pull_policy }}{% if use_secondary_network and has_resource_name %}
     resources:
       requests:
         {{ resource_name }}: '1'
       limits:
-        {{ resource_name }}: '1' {% endif %}
+        {{ resource_name }}: '1'{% endif %}
     securityContext:
       privileged: {{ privileged_pod }}

task.py

@@ -336,7 +336,16 @@ def _fetch_default_resource_name(
         logger.info(f"autodetected resource_name as {repr(resource_name)}")
         return resource_name
 
-    def get_template_args(self) -> dict[str, str | list[str]]:
+    def get_template_args(self) -> dict[str, str | list[str] | bool]:
+        resource_name = (
+            self.ts.connection.resource_name
+            or Task._fetch_default_resource_name(
+                self.client,
+                self.get_namespace(),
+                self.ts.connection.secondary_network_nad,
+            )
+            or ""
+        )
         return {
             "name_space": _j(self.get_namespace()),
             "test_image": _j(tftbase.get_tft_test_image()),
@@ -348,19 +357,12 @@ def get_template_args(self) -> dict[str, str | list[str]]:
             "pod_name": _j(self.pod_name),
             "privileged_pod": _j(self._get_template_args_privileged_pod()),
             "port": self._get_template_args_port(),
-            "secondary_network_nad": _j(self.ts.connection.effective_secondary_network_nad),
-            "use_secondary_network": (
-                "1" if self.ts.connection.secondary_network_nad else ""
-            ),
-            "resource_name": (
-                self.ts.connection.resource_name
-                or Task._fetch_default_resource_name(
-                    self.client,
-                    self.get_namespace(),
-                    self.ts.connection.secondary_network_nad,
-                )
-                or ""
+            "secondary_network_nad": _j(
+                self.ts.connection.effective_secondary_network_nad
             ),
+            "use_secondary_network": bool(self.ts.connection.secondary_network_nad),
+            "has_resource_name": bool(resource_name),
+            "resource_name": _j(resource_name),
             "default_network": _j(self.node.default_network),
         }
 
@@ -394,7 +396,7 @@ def render_file(
         log_info: str,
         in_file_template: str,
         out_file_yaml: str,
-        template_args: Optional[dict[str, str | list[str]]] = None,
+        template_args: Optional[dict[str, str | list[str] | bool]] = None,
     ) -> None:
         if template_args is None:
             template_args = self.get_template_args()