-
Notifications
You must be signed in to change notification settings - Fork 12
Expand file tree
/
Copy pathkustomize.patch
More file actions
26 lines (26 loc) · 833 Bytes
/
kustomize.patch
File metadata and controls
26 lines (26 loc) · 833 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
diff --git a/pkg/target/kusttarget.go b/pkg/target/kusttarget.go
index a26fdce6..4bbbfe35 100644
--- a/sigs.k8s.io/kustomize/pkg/target/kusttarget.go
+++ b/sigs.k8s.io/kustomize/pkg/target/kusttarget.go
@@ -278,7 +278,10 @@ func (kt *KustTarget) runGenerators(
}
err = ra.AppendAll(resMap)
if err != nil {
- return errors.Wrapf(err, "merging from generator %v", g)
+ err1 := ra.AbsorbAll(resMap)
+ if err1 != nil {
+ return errors.Wrapf(err, "merging from generator %v", g)
+ }
}
}
return nil
diff --git a/go.mod b/go.mod
index c1944f22..5aa12b64 100644
--- a/sigs.k8s.io/kustomize/go.mod
+++ b/sigs.k8s.io/kustomize/go.mod
@@ -29,4 +29,5 @@ require (
k8s.io/klog v0.3.3 // indirect
k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208
sigs.k8s.io/yaml v1.1.0
+ go.mozilla.org/sops 3.4.0
)