fix: properly convert serviceResources

garden-io · Jun 14, 2023 · 0f427fd · 0f427fd
1 parent cf75199
commit 0f427fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/src/plugins/kubernetes/helm/handlers.ts b/core/src/plugins/kubernetes/helm/handlers.ts
@@ -83,7 +83,7 @@ export const helmModuleHandlers: Partial<ModuleActionHandlers<HelmModule>> = {
     }
 
     for (const task of tasks) {
-      const resource = convertServiceResource(module, task.spec.resource, task.name)
+      const resource = convertServiceResource(module, task.spec.resource)
 
       if (!resource) {
         continue
@@ -112,7 +112,7 @@ export const helmModuleHandlers: Partial<ModuleActionHandlers<HelmModule>> = {
 
     for (const test of tests) {
       const testName = module.name + "-" + test.name
-      const resource = convertServiceResource(module, test.spec.resource, testName)
+      const resource = convertServiceResource(module, test.spec.resource)
 
       if (!resource) {
         continue

diff --git a/core/src/plugins/kubernetes/kubernetes-type/common.ts b/core/src/plugins/kubernetes/kubernetes-type/common.ts
@@ -183,7 +183,6 @@ export function gardenNamespaceAnnotationValue(namespaceName: string) {
 export function convertServiceResource(
   module: KubernetesModule | HelmModule,
   serviceResourceSpec?: ServiceResourceSpec,
-  defaultName?: string
 ): KubernetesTargetResourceSpec | null {
   const s = serviceResourceSpec || module.spec.serviceResource
 
@@ -193,7 +192,7 @@ export function convertServiceResource(
 
   return {
     kind: s.kind,
-    name: s.name || defaultName || module.name,
+    name: s.name || module.name,
     podSelector: s.podSelector,
     containerName: s.containerName,
   }