Skip to content

Commit d4dbb59

Browse files
committed
Fail Apply/Preview for Required Setters
1 parent f6bdeba commit d4dbb59

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed

cmd/apply/cmdapply.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"sigs.k8s.io/cli-utils/pkg/apply"
1919
"sigs.k8s.io/cli-utils/pkg/common"
2020
"sigs.k8s.io/cli-utils/pkg/manifestreader"
21+
"sigs.k8s.io/kustomize/kyaml/setters2"
2122
)
2223

2324
func GetApplyRunner(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *ApplyRunner {
@@ -85,6 +86,7 @@ type ApplyRunner struct {
8586
}
8687

8788
func (r *ApplyRunner) RunE(cmd *cobra.Command, args []string) error {
89+
cmdutil.CheckErr(setters2.CheckRequiredSettersSet())
8890
prunePropPolicy, err := convertPropagationPolicy(r.prunePropagationPolicy)
8991
if err != nil {
9092
return err

cmd/preview/cmdpreview.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"sigs.k8s.io/cli-utils/pkg/apply/event"
1616
"sigs.k8s.io/cli-utils/pkg/common"
1717
"sigs.k8s.io/cli-utils/pkg/manifestreader"
18+
"sigs.k8s.io/kustomize/kyaml/setters2"
1819
)
1920

2021
var (
@@ -36,6 +37,7 @@ func NewCmdPreview(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *co
3637
Short: i18n.T("Preview the apply of a configuration"),
3738
Args: cobra.MaximumNArgs(1),
3839
Run: func(cmd *cobra.Command, args []string) {
40+
cmdutil.CheckErr(setters2.CheckRequiredSettersSet())
3941
var ch <-chan event.Event
4042
cmdutil.CheckErr(destroyer.Initialize(cmd, args))
4143
// if destroy flag is set in preview, transmit it to destroyer DryRun flag

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
88
github.com/google/uuid v1.1.1
99
github.com/pkg/errors v0.9.1
10-
github.com/spf13/cobra v0.0.5
10+
github.com/spf13/cobra v1.0.0
1111
github.com/stretchr/testify v1.4.0
1212
go.uber.org/atomic v1.4.0 // indirect
1313
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
@@ -23,6 +23,6 @@ require (
2323
k8s.io/kubectl v0.0.0-20191219154910-1528d4eea6dd
2424
k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
2525
sigs.k8s.io/controller-runtime v0.4.0
26-
sigs.k8s.io/kustomize/kyaml v0.1.4
26+
sigs.k8s.io/kustomize/kyaml v0.3.5-0.20200706010650-855ce1a8db6c
2727
sigs.k8s.io/yaml v1.2.0
2828
)

0 commit comments

Comments
 (0)