fix: properly pass module buidld dependencies

With helm and kubernetes actions `module.build.dependencies` config was forgotten about when converting to actions.
garden-io · Jun 14, 2023 · cf75199 · cf75199
1 parent ed9e7b9
commit cf75199
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/core/src/plugins/kubernetes/helm/handlers.ts b/core/src/plugins/kubernetes/helm/handlers.ts
@@ -49,7 +49,7 @@ export const helmModuleHandlers: Partial<ModuleActionHandlers<HelmModule>> = {
     }
 
     // There's one service on helm modules expect when skipDeploy = true
-    const service: typeof services[0] | undefined = services[0]
+    const service: (typeof services)[0] | undefined = services[0]
 
     // The helm Deploy type does not support the `base` field. We handle the field here during conversion,
     // for compatibility.
@@ -212,7 +212,7 @@ function prepareDeployAction({
       atomic: module.spec.atomicInstall,
       portForwards: module.spec.portForwards,
       namespace: module.spec.namespace,
-      releaseName: module.spec.releaseName,
+      releaseName: module.spec.releaseName || module.name,
       values: module.spec.values,
       valueFiles: module.spec.valueFiles,
 
@@ -232,13 +232,16 @@ function prepareDeployAction({
     deployAction.spec.chart!.path = baseModule.spec.chartPath
   }
 
-  if (serviceResource) {
-    if (serviceResource.containerModule) {
-      const build = convertBuildDependency(serviceResource.containerModule)
-      deployAction.dependencies?.push(build)
+  const containerModules = module.build.dependencies.map(convertBuildDependency) || []
+  if (serviceResource?.containerModule) {
+    const containerModuleSpecDep = convertBuildDependency(serviceResource.containerModule)
+    if (!containerModules.find((m) => m.name === containerModuleSpecDep.name)) {
+      containerModules.push(containerModuleSpecDep)
     }
-    deployAction.spec.defaultTarget = convertServiceResource(module, serviceResource) || undefined
   }
 
+  deployAction.dependencies?.push(...containerModules)
+  deployAction.spec.defaultTarget = convertServiceResource(module, serviceResource) || undefined
+
   return deployAction
 }
diff --git a/core/src/plugins/kubernetes/kubernetes-type/handlers.ts b/core/src/plugins/kubernetes/kubernetes-type/handlers.ts
@@ -68,14 +68,16 @@ export const kubernetesHandlers: Partial<ModuleActionHandlers<KubernetesModule>>
       },
     }
 
-    if (serviceResource) {
-      if (serviceResource.containerModule) {
-        const build = convertBuildDependency(serviceResource.containerModule)
-        deployAction.dependencies?.push(build)
+    const containerModules = module.build.dependencies.map(convertBuildDependency) || []
+    if (serviceResource?.containerModule) {
+      const containerModuleSpecDep = convertBuildDependency(serviceResource.containerModule)
+      if (!containerModules.find((m) => m.name === containerModuleSpecDep.name)) {
+        containerModules.push(containerModuleSpecDep)
       }
-      deployAction.spec.defaultTarget = convertServiceResource(module, serviceResource) || undefined
     }
 
+    deployAction.dependencies?.push(...containerModules)
+    deployAction.spec.defaultTarget = convertServiceResource(module, serviceResource) || undefined
     actions.push(deployAction)
 
     for (const task of tasks) {
@@ -182,13 +184,11 @@ export const getKubernetesDeployStatus: DeployActionHandler<"getStatus", Kuberne
   })
   const preparedManifests = prepareResult.manifests
 
-  let { state, remoteResources, mode: deployedMode } = await compareDeployedResources(
-    k8sCtx,
-    api,
-    namespace,
-    preparedManifests,
-    log
-  )
+  let {
+    state,
+    remoteResources,
+    mode: deployedMode,
+  } = await compareDeployedResources(k8sCtx, api, namespace, preparedManifests, log)
 
   // Local mode has its own port-forwarding configuration
   const forwardablePorts = deployedMode === "local" ? [] : getForwardablePorts(remoteResources, action)