Commit 993e4f14 authored by Konstantinos Togias's avatar Konstantinos Togias
Browse files

Keep Helm scratch files and namespace inside the explicit connection scope

parent 0a538469

src/openop_tfsdk/contract/adapters/kubernetes.py

+4 −4
Changes for src/openop_tfsdk/contract/adapters/kubernetes.py: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ class KubernetesCapabilityAdapter: 
        if unit is None or not unit.artifact_ref:

            raise ValidationError("activate needs a deployment_unit with an artifact_ref")

        release = release_name(unit.deployment_unit_ref)

        namespace = self._infrastructure.get("namespace", "default")

        namespace = self._connection.namespace



        result = _helm(

            [
@@ -229,7 +229,7 @@ class KubernetesCapabilityAdapter: 
        if not request.external_id:

            raise ValidationError("read_runtime_state needs the external_id returned by activate")

        release_name = request.external_id

        namespace = self._infrastructure.get("namespace", "default")

        namespace = self._connection.namespace



        result = _helm(

            [
@@ -276,7 +276,7 @@ class KubernetesCapabilityAdapter: 
        if not request.external_id:

            raise ValidationError("terminate needs the external_id returned by activate")

        release_name = request.external_id

        namespace = self._infrastructure.get("namespace", "default")

        namespace = self._connection.namespace



        result = _helm(

            [
@@ -311,7 +311,7 @@ class KubernetesCapabilityAdapter: 
        if unit is None or not unit.artifact_ref:

            raise ValidationError("update needs a deployment_unit with an artifact_ref")

        release_name = request.external_id

        namespace = self._infrastructure.get("namespace", "default")

        namespace = self._connection.namespace



        result = _helm(

            [

src/openop_tfsdk/contract/adapters/kubernetes_connection.py

+1 −0
Changes for src/openop_tfsdk/contract/adapters/kubernetes_connection.py: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ class KubernetesConnection: 
            environment = {

                "PATH": _EXECUTION_PATH,

                "HOME": directory,

                "TMPDIR": directory,

                "HELM_DRIVER": "secret",

                "HELM_CONFIG_HOME": str(root / "config"),

                "HELM_CACHE_HOME": str(root / "cache"),

tests/contract/test_kubernetes_explicit_configuration.py

+1 −0
Changes for tests/contract/test_kubernetes_explicit_configuration.py: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ def test_helm_uses_a_private_validated_snapshot_and_controlled_environment( 
        assert profile["users"][0]["user"] == {"token": "fixture-token"}

        assert profile["current-context"] == "athens"

        assert environment["HELM_DRIVER"] == "secret"

        assert environment["TMPDIR"] == str(snapshot.parent)

        assert not any(key.startswith("HELM_KUBE") for key in environment)

        assert not {"AWS_PROFILE", "HTTP_PROXY"} & environment.keys()

        assert "fixture-token" not in " ".join(args)