Skip to content

Commit dd8e244

Browse files
author
Jijie Wei
committed
add delete setter cmd from kustomize
1 parent 3134e8f commit dd8e244

File tree

4 files changed

+32
-17
lines changed

4 files changed

+32
-17
lines changed

‎commands/configcmd.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ func GetConfigCommand(name string) *cobra.Command {
6464
createSetter.Long = cfgdocs.CreateSetterShort + "\n" + cfgdocs.CreateSetterLong
6565
createSetter.Example = cfgdocs.CreateSetterExamples
6666

67+
deleteSetter := DeleteSetterCommand(name)
68+
deleteSetter.Short = cfgdocs.DeleteSetterShort
69+
deleteSetter.Long = cfgdocs.DeleteSetterShort + "\n" + cfgdocs.DeleteSetterLong
70+
deleteSetter.Example = cfgdocs.DeleteSetterExamples
71+
6772
createSubstitution := CreateSubstCommand(name)
6873
createSubstitution.Short = cfgdocs.CreateSubstShort
6974
createSubstitution.Long = cfgdocs.CreateSubstShort + "\n" + cfgdocs.CreateSubstLong
@@ -94,7 +99,7 @@ func GetConfigCommand(name string) *cobra.Command {
9499
tree.Long = cfgdocs.TreeShort + "\n" + cfgdocs.TreeLong
95100
tree.Example = cfgdocs.TreeExamples
96101

97-
cfgCmd.AddCommand(an, cat, count, createSetter, createSubstitution, fmt,
102+
cfgCmd.AddCommand(an, cat, count, createSetter, deleteSetter, createSubstitution, fmt,
98103
grep, listSetters, set, tree)
99104
return cfgCmd
100105
}
@@ -104,6 +109,11 @@ func CreateSetterCommand(parent string) *cobra.Command {
104109
return configcobra.CreateSetter(parent)
105110
}
106111

112+
func DeleteSetterCommand(parent string) *cobra.Command {
113+
fieldmeta.SetShortHandRef(ShortHandRef)
114+
return configcobra.DeleteSetter(parent)
115+
}
116+
107117
func CreateSubstCommand(parent string) *cobra.Command {
108118
fieldmeta.SetShortHandRef(ShortHandRef)
109119
return configcobra.CreateSubstitution(parent)

‎e2e/e2e_test.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ func TestKptGetSet(t *testing.T) {
5151
"Kptfile": {
5252
` setBy: package-default
5353
value: "5"`,
54-
` value: "7"`,
54+
` value: "7"
55+
isSet: true`,
5556
},
5657
},
5758
},
@@ -62,7 +63,8 @@ func TestKptGetSet(t *testing.T) {
6263
"Kptfile": {
6364
` setBy: package-default
6465
value: "5"`,
65-
` value: "7"`,
66+
` value: "7"
67+
isSet: true`,
6668
},
6769
},
6870
},
@@ -72,7 +74,8 @@ func TestKptGetSet(t *testing.T) {
7274
"Kptfile": {
7375
` setBy: package-default
7476
value: "5"`,
75-
` value: "7"`,
77+
` value: "7"
78+
isSet: true`,
7679
},
7780
},
7881
},
@@ -83,7 +86,8 @@ func TestKptGetSet(t *testing.T) {
8386
"Kptfile": {
8487
` setBy: package-default
8588
value: "5"`,
86-
` value: "7"`,
89+
` value: "7"
90+
isSet: true`,
8791
},
8892
},
8993
},
@@ -95,7 +99,8 @@ func TestKptGetSet(t *testing.T) {
9599
` setBy: package-default
96100
value: "5"`,
97101
` setBy: foo
98-
value: "7"`,
102+
value: "7"
103+
isSet: true`,
99104
},
100105
},
101106
},
@@ -113,7 +118,8 @@ func TestKptGetSet(t *testing.T) {
113118
"Kptfile": {
114119
` setBy: package-default
115120
value: "5"`,
116-
` value: "7"`,
121+
` value: "7"
122+
isSet: true`,
117123
},
118124
},
119125
},
@@ -378,6 +384,7 @@ openAPI:
378384
name: replicas
379385
value: "4"
380386
setBy: pw
387+
isSet: true
381388
`,
382389
expectedResources: `
383390
apiVersion: apps/v1

‎go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ require (
77
github.com/go-errors/errors v1.0.1
88
github.com/go-openapi/spec v0.19.5
99
github.com/gogo/protobuf v1.3.1 // indirect
10-
github.com/google/addlicense v0.0.0-20200622132530-df58acafd6d5 // indirect
1110
github.com/olekukonko/tablewriter v0.0.4
1211
github.com/pkg/errors v0.9.1
1312
github.com/posener/complete/v2 v2.0.1-alpha.12
@@ -25,6 +24,6 @@ require (
2524
// Once there is a 0.18 release, we can import a semver release.
2625
k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd
2726
sigs.k8s.io/cli-utils v0.15.0
28-
sigs.k8s.io/kustomize/cmd/config v0.3.0
29-
sigs.k8s.io/kustomize/kyaml v0.3.1-0.20200618190311-fb6830c98a78
27+
sigs.k8s.io/kustomize/cmd/config v0.0.0-20200629173832-441581b74521
28+
sigs.k8s.io/kustomize/kyaml v0.3.2
3029
)

‎go.sum

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
199199
github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
200200
github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
201201
github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
202-
github.com/google/addlicense v0.0.0-20200622132530-df58acafd6d5 h1:m6Z1Cm53o4VecQFxKCnvULGfIT0Igo3MX131i+00IIo=
203-
github.com/google/addlicense v0.0.0-20200622132530-df58acafd6d5/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA=
204202
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
205203
github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
206204
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -644,19 +642,20 @@ modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
644642
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
645643
modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs=
646644
modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
645+
sigs.k8s.io/cli-utils v0.12.0 h1:+CvYwQAEtKvcx/NaUVF9rDKvY91VwJj+i7D2lWBMYc0=
647646
sigs.k8s.io/cli-utils v0.12.0/go.mod h1:H35YA5iJIM7EVNgqDTjX2dgt4wE23zmnXOTSTlyD+PE=
648647
sigs.k8s.io/cli-utils v0.15.0 h1:QiGX8wfBaegKQhejZg2EsqCPYGtyavIpEjNTMdpzUlY=
649648
sigs.k8s.io/cli-utils v0.15.0/go.mod h1:H35YA5iJIM7EVNgqDTjX2dgt4wE23zmnXOTSTlyD+PE=
650649
sigs.k8s.io/controller-runtime v0.4.0 h1:wATM6/m+3w8lj8FXNaO6Fs/rq/vqoOjO1Q116Z9NPsg=
651650
sigs.k8s.io/controller-runtime v0.4.0/go.mod h1:ApC79lpY3PHW9xj/w9pj+lYkLgwAAUZwfXkME1Lajns=
652651
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
653652
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
654-
sigs.k8s.io/kustomize/cmd/config v0.3.0 h1:MXbJgQXeO45DAdttKjQKUgO7WJ3B8+BopDcMZw/qKbw=
655-
sigs.k8s.io/kustomize/cmd/config v0.3.0/go.mod h1:3fEoJyrBJLE1Nag7glwmpqd+uH0JzMTrpumYxmhbj/8=
653+
sigs.k8s.io/kustomize/cmd/config v0.0.0-20200629173832-441581b74521 h1:5Ph1WKZMOa1/0R4WUtRatC/jwE8YKa/YkRSqHapFCG8=
654+
sigs.k8s.io/kustomize/cmd/config v0.0.0-20200629173832-441581b74521/go.mod h1:0gcINVqp3BKKS/cDUuU5GLxVz0Y4UoW6MBBuEhrTgYU=
656655
sigs.k8s.io/kustomize/kyaml v0.1.4/go.mod h1:461i94nj0h0ylJ6w83jLkR4SqqVhn1iY6fjD0JSTQeE=
657-
sigs.k8s.io/kustomize/kyaml v0.3.0/go.mod h1:LjuK+fiy63C7cz/6I0OqxIth8nZzytzzDOgpjBHCtG8=
658-
sigs.k8s.io/kustomize/kyaml v0.3.1-0.20200618190311-fb6830c98a78 h1:uiGRG+4yLkXIq8/ilseSdQDl1iLp/nPbrujY2Vq2lhM=
659-
sigs.k8s.io/kustomize/kyaml v0.3.1-0.20200618190311-fb6830c98a78/go.mod h1:Z9y2rjGUGzVhgdYtDphESD9Hz+JZKOofKYObQYtMyVI=
656+
sigs.k8s.io/kustomize/kyaml v0.1.13/go.mod h1:72/rLkSi+L/pHM1oCjwrf3ClU+tH5kZQvvdLSqIHwWU=
657+
sigs.k8s.io/kustomize/kyaml v0.3.2 h1:0AorBQuNiz/JwYBOULcjQTltif/vrPRjsEhGkE1FZig=
658+
sigs.k8s.io/kustomize/kyaml v0.3.2/go.mod h1:Z9y2rjGUGzVhgdYtDphESD9Hz+JZKOofKYObQYtMyVI=
660659
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
661660
sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
662661
sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=

0 commit comments

Comments
 (0)