Also change the name of the sealed secrets key ref

Vandebron · Feb 19, 2025 · 00b0ec9 · 00b0ec9
1 parent 9f7e26c
commit 00b0ec9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/mpyl/steps/deploy/k8s/chart.py b/src/mpyl/steps/deploy/k8s/chart.py
@@ -725,14 +725,14 @@ def _get_resources(self, deployment: Deployment) -> V1ResourceRequirements:
         return ChartBuilder._to_resource_requirements(resources, defaults, self.target)
 
     def _create_sealed_secret_env_vars(
-        self, secret_list: list[KeyValueProperty]
+        self, secret_list: list[KeyValueProperty], secret_name: str
     ) -> list[V1EnvVar]:
         return [
             V1EnvVar(
                 name=e.key,
                 value_from=V1EnvVarSource(
                     secret_key_ref=V1SecretKeySelector(
-                        key=e.key, name=self.release_name, optional=False
+                        key=e.key, name=secret_name, optional=False
                     )
                 ),
             )
@@ -755,12 +755,16 @@ def extract_raw_env(target: Target, env: list[KeyValueProperty]):
         return raw_env_vars
 
     def get_sealed_secret_as_env_vars(
-        self, sealed_secrets: list[KeyValueProperty]
+        self,
+        sealed_secrets: list[KeyValueProperty],
+        secret_name: str,
     ) -> list[V1EnvVar]:
         sealed_secrets_for_target = list(
             filter(lambda v: v.get_value(self.target) is not None, sealed_secrets)
         )
-        return self._create_sealed_secret_env_vars(sealed_secrets_for_target)
+        return self._create_sealed_secret_env_vars(
+            sealed_secrets_for_target, secret_name
+        )
 
     def _get_env_vars(self, deployment: Deployment) -> list[V1EnvVar]:
         raw_env_vars = (
@@ -792,7 +796,9 @@ def _get_env_vars(self, deployment: Deployment) -> list[V1EnvVar]:
             else []
         )
         sealed_secrets = (
-            self.get_sealed_secret_as_env_vars(deployment.properties.sealed_secrets)
+            self.get_sealed_secret_as_env_vars(
+                deployment.properties.sealed_secrets, deployment.name
+            )
             if deployment.properties
             else []
         )

diff --git a/src/mpyl/steps/deploy/k8s/resources/dagster.py b/src/mpyl/steps/deploy/k8s/resources/dagster.py
@@ -40,7 +40,7 @@ def to_user_code_values(
         )
     sealed_secret_refs = []
     for sealed_secret_env in builder.get_sealed_secret_as_env_vars(
-        combined_sealed_secrets
+        combined_sealed_secrets, builder.release_name
     ):
         sealed_secret_env.value_from.secret_key_ref.name = release_name
         sealed_secret_refs.append(to_dict(sealed_secret_env, skip_none=True))