From 0f427fd296fb12f396c6232019d6d7fe0797fbbf Mon Sep 17 00:00:00 2001 From: Orzelius Date: Tue, 13 Jun 2023 21:47:42 +0900 Subject: [PATCH] fix: properly convert serviceResources --- core/src/plugins/kubernetes/helm/handlers.ts | 4 ++-- core/src/plugins/kubernetes/kubernetes-type/common.ts | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/src/plugins/kubernetes/helm/handlers.ts b/core/src/plugins/kubernetes/helm/handlers.ts index 3cbc089a30..eb9e1a1730 100644 --- a/core/src/plugins/kubernetes/helm/handlers.ts +++ b/core/src/plugins/kubernetes/helm/handlers.ts @@ -83,7 +83,7 @@ export const helmModuleHandlers: Partial> = { } 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> = { 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 index cfe2b2f73f..bbcfec64f2 100644 --- 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, }