actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-25 00:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Fix bootstrap path check

Browse source 
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan 2021-10-22 10:55:31 +03:00
parent ebd145f7f7
commit 4352915945
No known key found for this signature in database
GPG key ID: 3299AEB0E4085BAF
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/bootstrap/bootstrap.go
View file

@ -159,6 +159,10 @@ func kustomizationPathDiffers(ctx context.Context, kube client.Client, objKey cl
return "", err return "", err
} }
normalizePath := func(p string) string { normalizePath := func(p string) string {
// remove the trailing '/' if the path is not './'
if len(p) > 2 {
p = strings.TrimSuffix(p, "/")
}
return fmt.Sprintf("./%s", strings.TrimPrefix(p, "./")) return fmt.Sprintf("./%s", strings.TrimPrefix(p, "./"))
} }
if normalizePath(path) == normalizePath(k.Spec.Path) { if normalizePath(path) == normalizePath(k.Spec.Path) {