kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #2532 from monopole/upgradeToV040

Browse Source 
Upgrade CLI to API v0.4.0
This commit is contained in:
Jeff Regan
2020-05-24 10:41:56 -07:00
committed by GitHub
parent 13eedd95f9 315f7c6e7f
commit 9e40cc177a
28 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kustomize/go.mod
View File

@@ -12,7 +12,7 @@ require (
k8s.io/apimachinery v0.17.0 k8s.io/apimachinery v0.17.0
k8s.io/client-go v0.17.0 k8s.io/client-go v0.17.0
sigs.k8s.io/controller-runtime v0.4.0 sigs.k8s.io/controller-runtime v0.4.0
sigs.k8s.io/kustomize/api v0.3.3 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/kustomize/cmd/config v0.1.11 sigs.k8s.io/kustomize/cmd/config v0.1.11
sigs.k8s.io/kustomize/cmd/kubectl v0.0.3 sigs.k8s.io/kustomize/cmd/kubectl v0.0.3
sigs.k8s.io/kustomize/kstatus v0.0.1 sigs.k8s.io/kustomize/kstatus v0.0.1

6
kustomize/go.sum
View File

@@ -786,12 +786,10 @@ sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9
sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns= sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
sigs.k8s.io/kustomize/api v0.3.3 h1:E3nUKiTnezsA1NoGA37jWlatjjMq2a/i1UIGAzSZGnk= sigs.k8s.io/kustomize/api v0.4.0 h1:EhlPWA4S1S1UUPzNanVR/SfPQ7g66j+jiN8ovtyby3Y=
sigs.k8s.io/kustomize/api v0.3.3/go.mod h1:JU8ooABgAO6xVDiWThwKtKShI8phhAALPaMfBpmNDOM= sigs.k8s.io/kustomize/api v0.4.0/go.mod h1:NqxqT+wbYHrD0P19Uu4dXiMsVwI1IwQs+MJHlLhmPqQ=
sigs.k8s.io/kustomize/cmd/config v0.1.11 h1:wSVvutGQtgiYWcd4IH5sr8jP4v6zgr9IcUAbA+32ULo= sigs.k8s.io/kustomize/cmd/config v0.1.11 h1:wSVvutGQtgiYWcd4IH5sr8jP4v6zgr9IcUAbA+32ULo=
sigs.k8s.io/kustomize/cmd/config v0.1.11/go.mod h1:w6vK8ulANez23sOTtmdej5KpBU9Ykdomu/W70PC8YMs= sigs.k8s.io/kustomize/cmd/config v0.1.11/go.mod h1:w6vK8ulANez23sOTtmdej5KpBU9Ykdomu/W70PC8YMs=
sigs.k8s.io/kustomize/kyaml v0.1.10 h1:ZZfBnA/kYa9ZxUFIgI9oq3pWKzzA1gGOKgU0Hv/NhVg=
sigs.k8s.io/kustomize/kyaml v0.1.10/go.mod h1:mPmeBSRy0LTMv6fSrYSoi2yIFNZVouGKDsTekE5kdhs=
sigs.k8s.io/kustomize/kyaml v0.1.11 h1:/VvWxVIgH5gG1K4A7trgbyLgO3tRBiAWNhLFVU1HEmo= sigs.k8s.io/kustomize/kyaml v0.1.11 h1:/VvWxVIgH5gG1K4A7trgbyLgO3tRBiAWNhLFVU1HEmo=
sigs.k8s.io/kustomize/kyaml v0.1.11/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU= sigs.k8s.io/kustomize/kyaml v0.1.11/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU=
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=

5
kustomize/internal/commands/kustfile/kustomizationfile.go
View File

@@ -148,7 +148,10 @@ func (mf *kustomizationFile) Read() (*types.Kustomization, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
data = types.FixKustomizationPreUnmarshalling(data) data, err = types.FixKustomizationPreUnmarshalling(data)
if err != nil {
return nil, err
}
var k types.Kustomization var k types.Kustomization
err = yaml.Unmarshal(data, &k) err = yaml.Unmarshal(data, &k)
if err != nil { if err != nil {

4
plugin/builtin/annotationstransformer/go.mod
View File

@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/builtin/annotationstransformer
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/kustomize/kyaml v0.1.11 sigs.k8s.io/kustomize/kyaml v0.1.11
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/configmapgenerator/go.mod
View File

@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/configmapgenerator
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.3.1 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/hashtransformer/go.mod
View File

@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/builtin/hashtransformer
go 1.13 go 1.13
require sigs.k8s.io/kustomize/api v0.3.1 require sigs.k8s.io/kustomize/api v0.4.0
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/imagetagtransformer/go.mod
View File

@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/imagetagtransformer
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.3.1 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/labeltransformer/go.mod
View File

@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/builtin/labeltransformer
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/kustomize/kyaml v0.1.11 sigs.k8s.io/kustomize/kyaml v0.1.11
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/legacyordertransformer/go.mod
View File

@@ -4,7 +4,7 @@ go 1.13
require ( require (
github.com/pkg/errors v0.8.1 github.com/pkg/errors v0.8.1
sigs.k8s.io/kustomize/api v0.3.1 sigs.k8s.io/kustomize/api v0.4.0
) )
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/namespacetransformer/go.mod
View File

@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/builtin/namespacetransformer
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/kustomize/kyaml v0.1.11 sigs.k8s.io/kustomize/kyaml v0.1.11
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/patchjson6902transformer/go.mod
View File

@@ -5,9 +5,9 @@ go 1.13
require ( require (
github.com/evanphx/json-patch v4.5.0+incompatible github.com/evanphx/json-patch v4.5.0+incompatible
github.com/pkg/errors v0.8.1 github.com/pkg/errors v0.8.1
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/kustomize/kyaml v0.1.11 sigs.k8s.io/kustomize/kyaml v0.1.11
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/patchstrategicmergetransformer/go.mod
View File

@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/builtin/patchstrategicmergetransformer
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/kustomize/kyaml v0.1.11 sigs.k8s.io/kustomize/kyaml v0.1.11
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/patchtransformer/go.mod
View File

@@ -5,9 +5,9 @@ go 1.13
require ( require (
github.com/evanphx/json-patch v4.5.0+incompatible github.com/evanphx/json-patch v4.5.0+incompatible
github.com/pkg/errors v0.8.1 github.com/pkg/errors v0.8.1
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/kustomize/kyaml v0.1.11 sigs.k8s.io/kustomize/kyaml v0.1.11
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/prefixsuffixtransformer/go.mod
View File

@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/prefixsuffixtransformer
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.3.1 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/replicacounttransformer/go.mod
View File

@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/replicacounttransformer
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.3.1 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/secretgenerator/go.mod
View File

@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/builtin/secretgenerator
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.3.1 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/builtin/valueaddtransformer/go.mod
View File

@@ -3,9 +3,9 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/valueaddtransformer
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/kustomize/kyaml v0.1.11 sigs.k8s.io/kustomize/kyaml v0.1.11
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../api

4
plugin/someteam.example.com/v1/bashedconfigmap/go.mod
View File

@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/bashedconfigmap
go 1.13 go 1.13
require sigs.k8s.io/kustomize/api v0.3.1 require sigs.k8s.io/kustomize/api v0.4.0
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/chartinflator/go.mod
View File

@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/chartinflator
go 1.13 go 1.13
require sigs.k8s.io/kustomize/api v0.3.1 require sigs.k8s.io/kustomize/api v0.4.0
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/dateprefixer/go.mod
View File

@@ -4,8 +4,8 @@ go 1.13
require ( require (
github.com/pkg/errors v0.8.1 github.com/pkg/errors v0.8.1
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/gogetter/go.mod
View File

@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/gogetter
go 1.13 go 1.13
require sigs.k8s.io/kustomize/api v0.3.1 require sigs.k8s.io/kustomize/api v0.4.0
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/printpluginenv/go.mod
View File

@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/printworkdir
go 1.13 go 1.13
require sigs.k8s.io/kustomize/api v0.3.1 require sigs.k8s.io/kustomize/api v0.4.0
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/replacementtransformer/go.mod
View File

@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/replacementtransform
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/secretsfromdatabase/go.mod
View File

@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/secretsfromdatabase
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/sedtransformer/go.mod
View File

@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/sedtransformer
go 1.13 go 1.13
require sigs.k8s.io/kustomize/api v0.3.1 require sigs.k8s.io/kustomize/api v0.4.0
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/someservicegenerator/go.mod
View File

@@ -3,8 +3,8 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/someservicegenerator
go 1.13 go 1.13
require ( require (
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/stringprefixer/go.mod
View File

@@ -4,8 +4,8 @@ go 1.13
require ( require (
github.com/pkg/errors v0.8.1 github.com/pkg/errors v0.8.1
sigs.k8s.io/kustomize/api v0.0.0 sigs.k8s.io/kustomize/api v0.4.0
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace sigs.k8s.io/kustomize/api v0.0.0 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api

4
plugin/someteam.example.com/v1/validator/go.mod
View File

@@ -2,6 +2,6 @@ module sigs.k8s.io/kustomize/plugin/someteam.example.com/v1/validator
go 1.13 go 1.13
require sigs.k8s.io/kustomize/api v0.3.1 require sigs.k8s.io/kustomize/api v0.4.0
replace sigs.k8s.io/kustomize/api v0.3.1 => ../../../../api replace sigs.k8s.io/kustomize/api v0.4.0 => ../../../../api