From 6f9850f5c4681d820c4a30d4ec91b05333ed68d5 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Tue, 3 May 2022 12:03:36 +0200 Subject: [PATCH] Fix path assumption Signed-off-by: Hidde Beydals --- pkg/manifestgen/install/manifests.go | 4 ++-- pkg/manifestgen/kustomization/kustomization.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/manifestgen/install/manifests.go b/pkg/manifestgen/install/manifests.go index 0435ae490e..17fc33f101 100644 --- a/pkg/manifestgen/install/manifests.go +++ b/pkg/manifestgen/install/manifests.go @@ -126,8 +126,8 @@ func build(base, output string) error { return err } - parent := path.Dir(base) - fs, err := filesys.MakeFsOnDiskSecureBuild(parent) + outputBase := filepath.Dir(strings.TrimSuffix(output, string(filepath.Separator))) + fs, err := filesys.MakeFsOnDiskSecure(outputBase) if err != nil { return err } diff --git a/pkg/manifestgen/kustomization/kustomization.go b/pkg/manifestgen/kustomization/kustomization.go index fd439d0b72..87fc86a22b 100644 --- a/pkg/manifestgen/kustomization/kustomization.go +++ b/pkg/manifestgen/kustomization/kustomization.go @@ -19,8 +19,8 @@ package kustomization import ( "fmt" "os" - "path" "path/filepath" + "strings" "sync" "sigs.k8s.io/kustomize/api/konfig" @@ -143,7 +143,7 @@ func Build(base string) ([]byte, error) { kustomizeBuildMutex.Lock() defer kustomizeBuildMutex.Unlock() - parent := path.Dir(base) + parent := filepath.Dir(strings.TrimSuffix(base, string(filepath.Separator))) fs, err := filesys.MakeFsOnDiskSecureBuild(parent) if err != nil { return nil, err