update kustomization api to latest and fix build issues

removed deprecated method kubernetes-sigs/kustomize#4923
weaveworks · May 13, 2023 · 98f54f4 · 98f54f4
1 parent 19c0288
commit 98f54f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -12,8 +12,8 @@ require (
 	gitlab.com/gitlab-org/security-products/analyzers/report/v3 v3.12.0
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
 	helm.sh/helm/v3 v3.8.1
-	sigs.k8s.io/kustomize/api v0.11.2
-	sigs.k8s.io/kustomize/kyaml v0.14.1
+	sigs.k8s.io/kustomize/api v0.13.4
+	sigs.k8s.io/kustomize/kyaml v0.14.2
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -1070,8 +1070,6 @@ github.com/weaveworks/policy-agent/pkg/logger v0.0.0-20230411201136-3d0c79150c68
 github.com/weaveworks/policy-agent/pkg/logger v0.0.0-20230411201136-3d0c79150c68/go.mod h1:QzCLIuqaKiVEGJqW3LOark8p9GQ4YcgbRDTG9S1baM4=
 github.com/weaveworks/policy-agent/pkg/opa-core v0.0.0-20230411202038-cd1a97b35eda h1:rayhmy0uTyMSwQV8iI3RRLNR+W5xrXwdbBFWxWhdV/g=
 github.com/weaveworks/policy-agent/pkg/opa-core v0.0.0-20230411202038-cd1a97b35eda/go.mod h1:MwRlDt6p01tiUAIR9hDiz7Ib/3btvRxBnLq4cc7LDS0=
-github.com/weaveworks/policy-agent/pkg/policy-core v0.0.0-20230411203714-bf53ac3f4945 h1:JPdM6/TVDXmc4sH/FBzAWZyULC5wjJj55BMsZ+JgwS0=
-github.com/weaveworks/policy-agent/pkg/policy-core v0.0.0-20230411203714-bf53ac3f4945/go.mod h1:qo1FabnoC3x2Vn1TEP535NGYNAhLumwDIoy8ID2+fGs=
 github.com/weaveworks/policy-agent/pkg/uuid-go v0.0.0-20230411202038-cd1a97b35eda h1:FxNy08+kChBXVWLzlsfVFwgjcdL8CqjVAVkaYeCT6/E=
 github.com/weaveworks/policy-agent/pkg/uuid-go v0.0.0-20230411202038-cd1a97b35eda/go.mod h1:2ZwzI+1qRXCYkb482qNqbZ60dF1y+PuTCyqHfsXPTRU=
 github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
@@ -1825,14 +1823,13 @@ sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNza
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/kustomize/api v0.10.1/go.mod h1:2FigT1QN6xKdcnGS2Ppp1uIWrtWN28Ms8A3OZUZhwr8=
-sigs.k8s.io/kustomize/api v0.11.2 h1:6YvCJHFDwsLwAX7zNHBxMZi3k7dGIXI8G9l0saYQI0E=
-sigs.k8s.io/kustomize/api v0.11.2/go.mod h1:GZuhith5YcqxIDe0GnRJNx5xxPTjlwaLTt/e+ChUtJA=
+sigs.k8s.io/kustomize/api v0.13.4 h1:E38Hfx0G9R9v7vRgKshviPotJQETG0S2gD3JdHLCAsI=
+sigs.k8s.io/kustomize/api v0.13.4/go.mod h1:Bkaavz5RKK6ZzP0zgPrB7QbpbBJKiHuD3BB0KujY7Ls=
 sigs.k8s.io/kustomize/cmd/config v0.10.2/go.mod h1:K2aW7nXJ0AaT+VA/eO0/dzFLxmpFcTzudmAgDwPY1HQ=
 sigs.k8s.io/kustomize/kustomize/v4 v4.4.1/go.mod h1:qOKJMMz2mBP+vcS7vK+mNz4HBLjaQSWRY22EF6Tb7Io=
 sigs.k8s.io/kustomize/kyaml v0.13.0/go.mod h1:FTJxEZ86ScK184NpGSAQcfEqee0nul8oLCK30D47m4E=
-sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc=
-sigs.k8s.io/kustomize/kyaml v0.14.1 h1:c8iibius7l24G2wVAGZn/Va2wNys03GXLjYVIcFVxKA=
-sigs.k8s.io/kustomize/kyaml v0.14.1/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4=
+sigs.k8s.io/kustomize/kyaml v0.14.2 h1:9WSwztbzwGszG1bZTziQUmVMrJccnyrLb5ZMKpJGvXw=
+sigs.k8s.io/kustomize/kyaml v0.14.2/go.mod h1:AN1/IpawKilWD7V+YvQwRGUvuUOOWpjsHu6uHwonSF4=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=

diff --git a/internal/source/kustomize.go b/internal/source/kustomize.go
@@ -161,11 +161,6 @@ func parseKustomizationFile(path string) (*KustomizationFile, error) {
 
 	node := nodes[0]
 
-	in, err = ktypes.FixKustomizationPreUnmarshalling(in)
-	if err != nil {
-		return nil, err
-	}
-
 	var obj ktypes.Kustomization
 	err = yaml.Unmarshal(in, &obj)
 	if err != nil {