Merge pull request #548 from lmiccini/iha_disabled_fix

Fix INSTANCEHA_DISABLED env var override logic

Author: openshift-merge-bot[bot]

templates/instanceha/bin/instanceha.py

@@ -398,10 +398,10 @@ def _load_config(self) -> Dict[str, Any]:
         data = self._load_yaml_file(self.config_path, "configuration")
         config = data.get("config", {})
         # Allow the INSTANCEHA_DISABLED env var (set from the CR spec) to override
-        # the config file value
-        env_disabled = os.getenv('INSTANCEHA_DISABLED')
-        if env_disabled is not None:
-            config['DISABLED'] = env_disabled == 'True'
+        # the config file value. The env var is always set (either "True" or
+        # "False"), so we only override when it is explicitly "True".
+        if os.getenv('INSTANCEHA_DISABLED') == 'True':
+            config['DISABLED'] = True
         return config
 
     def _load_clouds_config(self) -> Dict[str, Any]:

test/instanceha/test_config_features.py

@@ -74,8 +74,8 @@ def test_env_var_true_overrides_config(self):
 
             self.assertTrue(result['DISABLED'])
 
-    def test_env_var_false_overrides_config(self):
-        """Test that INSTANCEHA_DISABLED=False env var sets DISABLED=False in config."""
+    def test_env_var_false_preserves_config(self):
+        """Test that INSTANCEHA_DISABLED=False preserves the config file value."""
         with patch.dict(os.environ, {'INSTANCEHA_DISABLED': 'False'}):
             config = instanceha.ConfigManager.__new__(instanceha.ConfigManager)
             config.config_path = '/nonexistent'
@@ -86,7 +86,7 @@ def test_env_var_false_overrides_config(self):
             with patch.object(config, '_load_yaml_file', return_value={'config': {'DISABLED': True}}):
                 result = config._load_config()
 
-            self.assertFalse(result['DISABLED'])
+            self.assertTrue(result['DISABLED'])
 
     def test_env_var_absent_uses_config_file(self):
         """Test that without INSTANCEHA_DISABLED env var, config file value is used."""

zuul.d/projects.yaml

@@ -6,10 +6,14 @@
     github-check:
       jobs:
         - openstack-k8s-operators-content-provider:
-            irrelevant-files:
+            irrelevant-files: &iha_irrelevant_files
               - ^templates/instanceha/.*$
               - ^test/instanceha/.*$
             vars:
               cifmw_install_yamls_sdk_version: v1.41.1
               cifmw_operator_build_golang_ct: "docker.io/library/golang:1.24"
               cifmw_operator_build_golang_alt_ct: "quay.rdoproject.org/openstack-k8s-operators/golang:1.24"
+        - podified-multinode-edpm-deployment-crc:
+            irrelevant-files: *iha_irrelevant_files
+        - cifmw-crc-podified-edpm-baremetal:
+            irrelevant-files: *iha_irrelevant_files