Merge branch 'main' into allenporter-patch-1

flux_local/values.py

@@ -143,8 +143,11 @@ def _lookup_value_reference(
     found_value: str | None = None
     if found_data is None:
         if not ref.optional:
-            raise InvalidValuesReference(
-                f"Unable to find {ref.kind} {namespace}/{ref.name} referenced"
+            _LOGGER.warning(
+                "Unable to find %s %s/%s referenced",
+                ref.kind,
+                namespace,
+                ref.name,
             )
         if ref.target_path:
             # When a target path is specified, the value is expected to be

tests/test_values.py

@@ -138,6 +138,83 @@ def test_values_references_with_missing_values_key() -> None:
     }
 
 
+
+def test_values_references_with_missing_secret() -> None:
+    """Test for expanding a value reference with a missing secret."""
+    hr = HelmRelease(
+        name="test",
+        namespace="test",
+        chart=HelmChart(
+            repo_name="test-repo",
+            repo_namespace="flux-system",
+            name="test-chart",
+            version="test-version",
+        ),
+        values={"test": "test"},
+        values_from=[
+            ValuesReference(
+                kind="Secret",
+                name="test-values-secret",
+                values_key="some-key-does-not-exist",
+                target_path="target.path",
+            )
+        ],
+    )
+    ks = Kustomization(
+        name="test",
+        namespace="test",
+        path="example/path",
+        helm_releases=[hr],
+    )
+    updated_hr = expand_value_references(hr, ks)
+    assert updated_hr.values == {
+        "test": "test",
+        "target": {
+            "path": "!!PLACEHOLDER!!",
+        },
+    }
+
+
+def test_values_references_with_missing_secret_values_key() -> None:
+    """Test for expanding a value reference with a secret key that is missing."""
+    hr = HelmRelease(
+        name="test",
+        namespace="test",
+        chart=HelmChart(
+            repo_name="test-repo",
+            repo_namespace="flux-system",
+            name="test-chart",
+            version="test-version",
+        ),
+        values={"test": "test"},
+        values_from=[
+            ValuesReference(
+                kind="Secret",
+                name="test-values-secret",
+                values_key="some-key-does-not-exist",
+                target_path="target.path",
+            )
+        ],
+    )
+    ks = Kustomization(
+        name="test",
+        namespace="test",
+        path="example/path",
+        helm_releases=[hr],
+        secrets=[
+            Secret(
+                name="test-values-secret",
+                namespace="test",
+                string_data={"some-key": "example_value"},
+            )
+        ],
+    )
+    updated_hr = expand_value_references(hr, ks)
+    assert updated_hr.values == {
+        "test": "test",
+    }
+
+
 def test_values_references_invalid_yaml() -> None:
     """Test for expanding a value reference with a values key."""
     hr = HelmRelease(