Pub/k8s plugins

.github/workflows/ansible-lint.yml

@@ -10,6 +10,7 @@ on:
       - pub/multiple_login_node
       - pub/local_repo_arch
       - pub/k8s_plugins
+      - pub/slurm_multi_arch
 
 jobs:
   build:

.github/workflows/pylint.yml

@@ -9,6 +9,7 @@ on:
       - pub/multiple_login_node
       - pub/local_repo_arch
       - pub/k8s_plugins
+      - pub/slurm_multi_arch
 
 jobs:
   build:

accelerator/ansible.cfg

@@ -14,4 +14,4 @@ connect_timeout = 180
 
 [ssh_connection]
 retries = 3
-ssh_args = -o ControlMaster=auto -o ControlPersist=60 -o ConnectTimeout=60
+ssh_args = -o ControlMaster=auto -o ControlPersist=60 -o ConnectTimeout=60

common/library/module_utils/input_validation/common_utils/config.py

@@ -75,7 +75,7 @@
         files["omnia_config"],
         files["high_availability_config"]
     ],
-    "k8s": [
+    "compute_k8s": [
         files['roles_config'],
         files["omnia_config"],
         files["high_availability_config"]

common/library/module_utils/input_validation/schema/credential_rules.json

@@ -130,5 +130,17 @@
         "maxLength": 128,
         "pattern": "^(?!admin$)[^\\\\\\-'\"]+$",
         "description": "Password for grafana UI. Should not be kept 'admin. Length must be at least 5 characters and must not contain backslashes (\\), hyphens (-), single quotes ('), or double quotes (\\\")."
+      },
+      "csi_username": {
+        "minLength": 4,
+        "maxLength": 64,
+        "description": "Username for Powerscale UI. Must not contain semicolons (;), square brackets ([]), or backticks (`).",
+        "pattern": "^[^;\\[\\]`]+$"
+      },
+      "csi_password": {
+        "description": "Password for Powerscale UI. Must not contain hyphens (-), single quotes ('), double quotes (\"), at symbols (@), or backslashes (\\).",
+        "minLength": 5,
+        "maxLength": 32,
+        "pattern": "^[^\\-\\'\\\"@\\\\]*$"
       }
   }

common/library/module_utils/input_validation/schema/omnia_config.json

@@ -59,6 +59,16 @@
           "k8s_offline_install": {
             "type": "boolean",
             "description": "Whether to pull packages/images from local repo."
+          },
+          "csi_powerscale_driver_secret_file_path": {
+            "description": "Absolute file path for the secret.yaml file.",
+            "type": "string",
+            "pattern": "^(|/?([a-zA-Z0-9._-]+/)*[a-zA-Z0-9._-]+\\.yaml)$"
+          },
+          "csi_powerscale_driver_values_file_path": {
+            "description": "File path for the values.yaml file.",
+            "type": "string",
+            "pattern": "^(|/?([a-zA-Z0-9._-]+/)*[a-zA-Z0-9._-]+\\.yaml)$"
           }
         },
         "required": [
@@ -74,6 +84,20 @@
           "then": {
             "required": ["topology_manager_scope"]
           }
+        },
+        {
+          "if": {
+            "properties": {
+              "csi_powerscale_driver_secret_file_path": {
+                "type": "string",
+                "minLength": 1
+              }
+            },
+            "required": ["csi_powerscale_driver_secret_file_path"]
+          },
+          "then": {
+            "required": ["csi_powerscale_driver_values_file_path"]
+          }
         }
       ]
       }
@@ -122,6 +146,16 @@
           "k8s_offline_install": {
             "type": "boolean",
             "description": "Whether to pull packages/images from local repo."
+          },
+          "csi_powerscale_driver_secret_file_path": {
+            "description": "Absolute file path for the secret.yaml file.",
+            "type": "string",
+            "pattern": "^(|/?([a-zA-Z0-9._-]+/)*[a-zA-Z0-9._-]+\\.yaml)$"
+          },
+          "csi_powerscale_driver_values_file_path": {
+            "description": "File path for the values.yaml file.",
+            "type": "string",
+            "pattern": "^(|/?([a-zA-Z0-9._-]+/)*[a-zA-Z0-9._-]+\\.yaml)$"
           }
         },
         "required": [
@@ -137,6 +171,20 @@
           "then": {
             "required": ["topology_manager_scope"]
           }
+        },
+        {
+          "if": {
+            "properties": {
+              "csi_powerscale_driver_secret_file_path": {
+                "type": "string",
+                "minLength": 1
+              }
+            },
+            "required": ["csi_powerscale_driver_secret_file_path"]
+          },
+          "then": {
+            "required": ["csi_powerscale_driver_values_file_path"]
+          }
         }
       ]
       }

common/library/module_utils/input_validation/schema/telemetry_config.json

@@ -3,6 +3,15 @@
   "title": "Telemetry Configuration",
   "type": "object",
   "properties": {
+    "kube_prometheus_support": {
+      "type": "boolean"
+    },
+    "prometheus_scrape_interval": {
+     "type": "integer",
+     "minimum": 1,
+     "default": 15
+    },
+
     "idrac_telemetry_support": {
       "type": "boolean"
     },
@@ -17,6 +26,8 @@
     }
   },
   "required": [
+    "kube_prometheus_support",
+    "prometheus_scrape_interval",
     "idrac_telemetry_support",
     "visualization_support",
     "federated_idrac_telemetry_collection"

common/library/module_utils/input_validation/validation_flows/common_validation.py

@@ -17,13 +17,13 @@
 """
 import json
 import os
-import ipaddress
 import yaml
+import ipaddress
+import subprocess
 from ast import literal_eval
 import ansible.module_utils.input_validation.common_utils.data_fetch as get
+from ansible.module_utils.input_validation.validation_flows import csi_driver_validation
 import ansible.module_utils.input_validation.common_utils.data_validation as validate
-from ansible.modules.validate_input import generate_log_failure_message
-
 from ansible.module_utils.input_validation.common_utils import (
     validation_utils,
     config,
@@ -32,7 +32,6 @@
 )
 
 from ansible.module_utils.input_validation.validation_flows import scheduler_validation
-
 from ansible.module_utils.local_repo.software_utils import (
     load_json,
     set_version_variables,
@@ -947,7 +946,11 @@ def is_ip_in_range(ip_str, ip_range_str):
     except ValueError:
         return False
 
-def validate_k8s(data, admin_bmc_networks, softwares, ha_config, tag_names, errors):
+
+
+
+def validate_k8s(data, admin_bmc_networks, softwares, ha_config, tag_names, errors, 
+                 omnia_base_dir, project_name, logger, module, input_file_path):
     """
     Validates Kubernetes cluster configurations.
 
@@ -962,10 +965,10 @@ def validate_k8s(data, admin_bmc_networks, softwares, ha_config, tag_names, erro
     bmc_static_range = admin_bmc_networks["bmc_network"]["static_range"]
     bmc_dynamic_range = admin_bmc_networks["bmc_network"]["dynamic_range"]
     primary_oim_admin_ip = admin_bmc_networks["admin_network"]["primary_oim_admin_ip"]
-
+    
     # service_k8s_cluster = data["service_k8s_cluster"]
     cluster_set = {}
-    if "k8s" in softwares and "k8s" in tag_names:
+    if "compute_k8s" in softwares and "compute_k8s" in tag_names:
         cluster_set["compute_k8s_cluster"] = data.get(
             "compute_k8s_cluster", [])
     if "service_k8s" in softwares and "service_k8s" in tag_names:
@@ -997,7 +1000,7 @@ def validate_k8s(data, admin_bmc_networks, softwares, ha_config, tag_names, erro
                             f"{cluster_name} not found in high_availability_config.yml"
                         ))
                 pod_external_ip_range = kluster.get("pod_external_ip_range")
-                if not pod_external_ip_range:
+                if not pod_external_ip_range or str(pod_external_ip_range).strip() == "":
                     errors.append(
                         create_error_msg(
                             "Pod External IP Range -",
@@ -1031,7 +1034,41 @@ def validate_k8s(data, admin_bmc_networks, softwares, ha_config, tag_names, erro
                         create_error_msg(
                             "IP overlap -",
                             None,
-                            en_us_validation_msg.IP_OVERLAP_FAIL_MSG))
+                           en_us_validation_msg.IP_OVERLAP_FAIL_MSG))
+
+                #csi validation
+                if (
+                      "csi_driver_powerscale" in softwares
+                      and ("k8s" in softwares or "service_k8s" in softwares)
+                    ):
+
+                    csi_secret_file_path = kluster.get("csi_powerscale_driver_secret_file_path")
+                    csi_values_file_path = kluster.get("csi_powerscale_driver_values_file_path")
+
+                    # Validate secret file path
+                    if not csi_secret_file_path or \
+                    not csi_secret_file_path.strip() or \
+                    not os.path.exists(csi_secret_file_path.strip()):
+                        errors.append(
+                            create_error_msg(
+                                "csi_powerscale_driver_secret_file_path",
+                                csi_secret_file_path,
+                                en_us_validation_msg.CSI_DRIVER_SECRET_FAIL_MSG,
+                            )
+                        )
+                    else:
+                        # If secret path is valid, ensure values path is also valid
+                        if not csi_values_file_path or \
+                        not csi_values_file_path.strip() or \
+                        not os.path.exists(csi_values_file_path.strip()):
+                            errors.append(
+                                create_error_msg(
+                                    "csi_powerscale_driver_values_file_path",
+                                    csi_values_file_path,
+                                    en_us_validation_msg.CSI_DRIVER_VALUES_FAIL_MSG,
+                                )
+                            )
+                        csi_driver_validation.validate_powerscale_secret_and_values_file(csi_secret_file_path,csi_values_file_path, errors, input_file_path)
 
 def validate_omnia_config(
         input_file_path,
@@ -1077,8 +1114,8 @@ def validate_omnia_config(
             )
         )
 
-    if ("k8s" in sw_list or "service_k8s" in sw_list) and \
-        ("k8s" in tag_names or "service_k8s" in tag_names):
+    if ("compute_k8s" in sw_list or "service_k8s" in sw_list) and \
+        ("compute_k8s" in tag_names or "service_k8s" in tag_names):
         admin_bmc_networks = get_admin_bmc_networks(
             input_file_path, logger, module, omnia_base_dir, module_utils_base, project_name)
         ha_config_path = create_file_path(
@@ -1087,7 +1124,8 @@ def validate_omnia_config(
             ha_config = yaml.safe_load(f)
         for k in ["service_k8s_cluster_ha", "compute_k8s_cluster_ha"]:
             ha_config[k] = [xha["cluster_name"] for xha in ha_config.get(k, [])]
-        validate_k8s(data, admin_bmc_networks, sw_list, ha_config, tag_names, errors)
+        validate_k8s(data, admin_bmc_networks, sw_list, ha_config, tag_names,
+                        errors, omnia_base_dir, project_name, logger, module, input_file_path)
     return errors
 
 def validate_telemetry_config(
@@ -1233,3 +1271,4 @@ def validate_additional_software(
                 )
             )
     return errors
+