From 5c94499402d38db6815dea90d5d2985d053edf4a Mon Sep 17 00:00:00 2001 From: monopole Date: Tue, 24 Aug 2021 11:56:15 -0700 Subject: [PATCH] WIP: Call DeAnchor in kustomization --- api/internal/accumulator/resaccumulator.go | 5 +++++ api/internal/target/kusttarget.go | 3 +++ 2 files changed, 8 insertions(+) diff --git a/api/internal/accumulator/resaccumulator.go b/api/internal/accumulator/resaccumulator.go index 2723feafcf..ec03f3d6ec 100644 --- a/api/internal/accumulator/resaccumulator.go +++ b/api/internal/accumulator/resaccumulator.go @@ -36,6 +36,11 @@ func (ra *ResAccumulator) ResMap() resmap.ResMap { return ra.resMap.ShallowCopy() } +// DeAnchor expands YAML anchor aliases with what they reference. +func (ra *ResAccumulator) DeAnchor() error { + return ra.resMap.DeAnchor() +} + // Vars returns a copy of underlying vars. func (ra *ResAccumulator) Vars() []types.Var { return ra.varSet.AsSlice() diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go index 45e021e245..2dbd67322b 100644 --- a/api/internal/target/kusttarget.go +++ b/api/internal/target/kusttarget.go @@ -205,6 +205,9 @@ func (kt *KustTarget) accumulateTarget(ra *accumulator.ResAccumulator, origin *r if err != nil { return nil, err } + if err = ra.DeAnchor(); err != nil { + return nil, err + } err = kt.runTransformers(ra) if err != nil { return nil, err