Fix two bugs revealed by the new e2e tests

Signed-off-by: Alexander Berger <alex-berger@gmx.ch>
fluxcd · Feb 2, 2021 · 518233b · 518233b
1 parent fef9245
commit 518233b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/config/testdata/post-renderer-kustomize/helmrelease.yaml b/config/testdata/post-renderer-kustomize/helmrelease.yaml
@@ -21,7 +21,6 @@ spec:
         apiVersion: apps/v1
         metadata:
           name: mypodinfo
-          namespace: helm-system
           labels:
             xxxx: yyyy
       patchesJson6902:
@@ -30,7 +29,6 @@ spec:
           version: v1
           kind: Deployment
           name: mypodinfo
-          namespace: helm-system
         patch:
         - op: add
           path: /metadata/labels/yyyy

diff --git a/docs/spec/v2beta1/helmreleases.md b/docs/spec/v2beta1/helmreleases.md
@@ -1092,7 +1092,6 @@ spec:
             apiVersion: apps/v1
             metadata:
               name: metrics-server
-              namespace: kube-system
             spec:
               template:
                 spec:

diff --git a/internal/runner/post_renderer.go b/internal/runner/post_renderer.go
@@ -18,7 +18,7 @@ func newCombinedPostRenderer() combinedPostRenderer {
 	}
 }
 
-func (c combinedPostRenderer) addRenderer(renderer postrender.PostRenderer) {
+func (c *combinedPostRenderer) addRenderer(renderer postrender.PostRenderer) {
 	c.renderers = append(c.renderers, renderer)
 }
 

diff --git a/internal/runner/post_renderer_kustomize.go b/internal/runner/post_renderer_kustomize.go
@@ -102,7 +102,7 @@ func (k *postRendererKustomize) Run(renderedManifests *bytes.Buffer) (modifiedMa
 	}
 	// add JSON patches
 	for _, m := range k.spec.PatchesJSON6902 {
-		patch, err := json.Marshal(m)
+		patch, err := json.Marshal(m.Patch)
 		if err != nil {
 			return nil, err
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ func newCombinedPostRenderer() combinedPostRenderer { @@
     	}
     }
-    func (c combinedPostRenderer) addRenderer(renderer postrender.PostRenderer) {
+    func (c *combinedPostRenderer) addRenderer(renderer postrender.PostRenderer) {
     	c.renderers = append(c.renderers, renderer)
     }
@@ Expand Down @@