Skip to content

Commit bfbb83f

Browse files
100mik100mik
committed
Remove options that can be manipulated downstream
Signed-off-by: Soumik Majumder <[email protected]>
1 parent 6247224 commit bfbb83f

File tree

13 files changed

+15
-46
lines changed

13 files changed

+15
-46
lines changed

‎cli/pkg/kctrl/cmd/app/delete.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ func NewDeleteCmd(o *DeleteOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
5757
AllowDisableWait: true,
5858
DefaultInterval: 1 * time.Second,
5959
DefaultTimeout: 5 * time.Minute,
60-
WaitByDefault: true,
6160
})
6261

6362
return cmd

‎cli/pkg/kctrl/cmd/app/kick.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func NewKickCmd(o *KickOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comman
5050
AllowDisableWait: true,
5151
DefaultInterval: 1 * time.Second,
5252
DefaultTimeout: 5 * time.Minute,
53-
WaitByDefault: true,
5453
})
5554

5655
return cmd

‎cli/pkg/kctrl/cmd/core/config_factory.go‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ type ConfigFactoryImpl struct {
2929

3030
qps float32
3131
burst int
32-
33-
defaultKubeconfigOverridePath string
34-
defaultKubeconfigOverrideContext string
3532
}
3633

3734
var _ ConfigFactory = &ConfigFactoryImpl{}
@@ -52,11 +49,6 @@ func (f *ConfigFactoryImpl) ConfigureYAMLResolver(resolverFunc func() (string, e
5249
f.yamlResolverFunc = resolverFunc
5350
}
5451

55-
func (f *ConfigFactoryImpl) ConfigureKubeconfigOverrides(defaultKubeconfigOverridePath string, defaultKubeconfigOverrideContext string) {
56-
f.defaultKubeconfigOverridePath = defaultKubeconfigOverridePath
57-
f.defaultKubeconfigOverrideContext = defaultKubeconfigOverrideContext
58-
}
59-
6052
func (f *ConfigFactoryImpl) ConfigureClient(qps float32, burst int) {
6153
f.qps = qps
6254
f.burst = burst
@@ -131,11 +123,6 @@ func (f *ConfigFactoryImpl) clientConfig() (bool, clientcmd.ClientConfig, error)
131123
loadingRules := clientcmd.NewDefaultClientConfigLoadingRules()
132124
overrides := &clientcmd.ConfigOverrides{}
133125

134-
if len(path) == 0 && len(context) == 0 && f.defaultKubeconfigOverrideContext != "" && f.defaultKubeconfigOverridePath != "" {
135-
path = f.defaultKubeconfigOverridePath
136-
context = f.defaultKubeconfigOverrideContext
137-
}
138-
139126
if len(path) > 0 {
140127
loadingRules.ExplicitPath = path
141128
}

‎cli/pkg/kctrl/cmd/core/examples.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ type PackageCommandTreeOpts struct {
1515
Color bool
1616
JSON bool
1717

18-
DefaultKubeconfigOverridePath string
19-
DefaultKubeconfigOverrideContext string
20-
21-
DefaultServiceAcccountName string
22-
WaitByDefault bool
23-
AllowSharedNamespaces bool
18+
AlwaysAllowTogglingWait bool
2419
}
2520

2621
type Example struct {

‎cli/pkg/kctrl/cmd/core/secure_namespace_flags.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ type SecureNamespaceFlags struct {
1818
AllowedSharedNamespaces bool
1919
}
2020

21-
func (s *SecureNamespaceFlags) Set(cmd *cobra.Command, defaultVal bool) {
22-
cmd.Flags().BoolVar(&s.AllowedSharedNamespaces, "dangerous-allow-use-of-shared-namespace", defaultVal, "Allow use of shared namespaces")
21+
func (s *SecureNamespaceFlags) Set(cmd *cobra.Command) {
22+
cmd.Flags().BoolVar(&s.AllowedSharedNamespaces, "dangerous-allow-use-of-shared-namespace", false, "Allow use of shared namespaces")
2323
}
2424

2525
func (s *SecureNamespaceFlags) CheckForDisallowedSharedNamespaces(namespace string) error {

‎cli/pkg/kctrl/cmd/core/wait_flags.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ type WaitFlagsOpts struct {
1919
AllowDisableWait bool
2020
DefaultInterval time.Duration
2121
DefaultTimeout time.Duration
22-
WaitByDefault bool
2322
}
2423

2524
func (f *WaitFlags) Set(cmd *cobra.Command, flagsFactory FlagsFactory, opts *WaitFlagsOpts) {
26-
if opts.AllowDisableWait || !opts.WaitByDefault {
27-
cmd.Flags().BoolVar(&f.Enabled, "wait", opts.WaitByDefault, "Wait for reconciliation to complete")
25+
if opts.AllowDisableWait {
26+
cmd.Flags().BoolVar(&f.Enabled, "wait", true, "Wait for reconciliation to complete")
2827
}
29-
f.Enabled = opts.WaitByDefault
28+
f.Enabled = true
3029
cmd.Flags().DurationVar(&f.CheckInterval, "wait-check-interval", opts.DefaultInterval, "Amount of time to sleep between checks while waiting")
3130
cmd.Flags().DurationVar(&f.Timeout, "wait-timeout", opts.DefaultTimeout, "Maximum amount of time to wait in wait phase")
3231
}

‎cli/pkg/kctrl/cmd/kctrl.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func NewKctrlCmd(o *KctrlOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Comm
7676
cmdcore.RestOfCommandsHelpGroup,
7777
}))
7878

79-
pkgOpts := cmdcore.PackageCommandTreeOpts{BinaryName: "kctrl", Color: true, JSON: true, WaitByDefault: true}
79+
pkgOpts := cmdcore.PackageCommandTreeOpts{BinaryName: "kctrl", Color: true, JSON: true}
8080

8181
setGlobalFlags(o, cmd, flagsFactory, pkgOpts)
8282

@@ -227,7 +227,6 @@ func AttachGlobalFlags(o *KctrlOptions, cmd *cobra.Command, flagsFactory cmdcore
227227

228228
func AttachKctrlPackageCommandTree(cmd *cobra.Command, confUI *ui.ConfUI, opts cmdcore.PackageCommandTreeOpts) {
229229
configFactory := cmdcore.NewConfigFactoryImpl()
230-
configFactory.ConfigureKubeconfigOverrides(opts.DefaultKubeconfigOverridePath, opts.DefaultKubeconfigOverrideContext)
231230
depsFactory := cmdcore.NewDepsFactoryImpl(configFactory, confUI)
232231
options := NewKctrlOptions(confUI, configFactory, depsFactory)
233232
flagsFactory := cmdcore.NewFlagsFactory(configFactory, depsFactory)

‎cli/pkg/kctrl/cmd/package/installed/create_or_update.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func NewCreateCmd(o *CreateOrUpdateOptions, flagsFactory cmdcore.FlagsFactory) *
8888
cmdcore.PackageManagementCommandsHelpGroup.Key: cmdcore.PackageManagementCommandsHelpGroup.Value},
8989
}
9090
o.NamespaceFlags.SetWithPackageCommandTreeOpts(cmd, flagsFactory, o.pkgCmdTreeOpts)
91-
o.SecureNamespaceFlags.Set(cmd, o.pkgCmdTreeOpts.AllowSharedNamespaces)
91+
o.SecureNamespaceFlags.Set(cmd)
9292

9393
if !o.pkgCmdTreeOpts.PositionalArgs {
9494
cmd.Flags().StringVarP(&o.Name, "package-install", "i", "", "Set installed package name (required)")
@@ -99,7 +99,7 @@ func NewCreateCmd(o *CreateOrUpdateOptions, flagsFactory cmdcore.FlagsFactory) *
9999

100100
cmd.Flags().StringVarP(&o.packageName, "package", "p", "", "Set package name (required)")
101101
cmd.Flags().StringVarP(&o.version, "version", "v", "", "Set package version (required)")
102-
cmd.Flags().StringVar(&o.serviceAccountName, "service-account-name", o.pkgCmdTreeOpts.DefaultServiceAcccountName, "Name of an existing service account used to install underlying package contents, optional")
102+
cmd.Flags().StringVar(&o.serviceAccountName, "service-account-name", "", "Name of an existing service account used to install underlying package contents, optional")
103103
cmd.Flags().StringVar(&o.valuesFile, "values-file", "", "The path to the configuration values file, optional")
104104
cmd.Flags().BoolVar(&o.values, "values", true, "Add or keep values supplied to package install, optional")
105105
cmd.Flags().BoolVar(&o.DryRun, "dry-run", false, "Print YAML for resources being applied to the cluster without applying them, optional")
@@ -108,7 +108,6 @@ func NewCreateCmd(o *CreateOrUpdateOptions, flagsFactory cmdcore.FlagsFactory) *
108108
AllowDisableWait: true,
109109
DefaultInterval: 1 * time.Second,
110110
DefaultTimeout: 30 * time.Minute,
111-
WaitByDefault: o.pkgCmdTreeOpts.WaitByDefault,
112111
})
113112
o.YttOverlayFlags.Set(cmd)
114113

@@ -135,7 +134,7 @@ func NewInstallCmd(o *CreateOrUpdateOptions, flagsFactory cmdcore.FlagsFactory)
135134
cmdcore.PackageManagementCommandsHelpGroup.Key: cmdcore.PackageManagementCommandsHelpGroup.Value},
136135
}
137136
o.NamespaceFlags.SetWithPackageCommandTreeOpts(cmd, flagsFactory, o.pkgCmdTreeOpts)
138-
o.SecureNamespaceFlags.Set(cmd, o.pkgCmdTreeOpts.AllowSharedNamespaces)
137+
o.SecureNamespaceFlags.Set(cmd)
139138

140139
if !o.pkgCmdTreeOpts.PositionalArgs {
141140
cmd.Flags().StringVarP(&o.Name, "package-install", "i", "", "Set installed package name (required)")
@@ -146,7 +145,7 @@ func NewInstallCmd(o *CreateOrUpdateOptions, flagsFactory cmdcore.FlagsFactory)
146145

147146
cmd.Flags().StringVarP(&o.packageName, "package", "p", "", "Set package name (required)")
148147
cmd.Flags().StringVarP(&o.version, "version", "v", "", "Set package version (required)")
149-
cmd.Flags().StringVar(&o.serviceAccountName, "service-account-name", o.pkgCmdTreeOpts.DefaultServiceAcccountName, "Name of an existing service account used to install underlying package contents, optional")
148+
cmd.Flags().StringVar(&o.serviceAccountName, "service-account-name", "", "Name of an existing service account used to install underlying package contents, optional")
150149
cmd.Flags().StringVar(&o.valuesFile, "values-file", "", "The path to the configuration values file, optional")
151150
cmd.Flags().BoolVar(&o.values, "values", true, "Add or keep values supplied to package install, optional")
152151
cmd.Flags().BoolVar(&o.DryRun, "dry-run", false, "Print YAML for resources being applied to the cluster without applying them, optional")
@@ -155,7 +154,6 @@ func NewInstallCmd(o *CreateOrUpdateOptions, flagsFactory cmdcore.FlagsFactory)
155154
AllowDisableWait: true,
156155
DefaultInterval: 1 * time.Second,
157156
DefaultTimeout: 30 * time.Minute,
158-
WaitByDefault: o.pkgCmdTreeOpts.WaitByDefault,
159157
})
160158
o.YttOverlayFlags.Set(cmd)
161159

@@ -181,7 +179,7 @@ func NewUpdateCmd(o *CreateOrUpdateOptions, flagsFactory cmdcore.FlagsFactory) *
181179
cmdcore.PackageManagementCommandsHelpGroup.Key: cmdcore.PackageManagementCommandsHelpGroup.Value},
182180
}
183181
o.NamespaceFlags.SetWithPackageCommandTreeOpts(cmd, flagsFactory, o.pkgCmdTreeOpts)
184-
o.SecureNamespaceFlags.Set(cmd, o.pkgCmdTreeOpts.AllowSharedNamespaces)
182+
o.SecureNamespaceFlags.Set(cmd)
185183

186184
if !o.pkgCmdTreeOpts.PositionalArgs {
187185
cmd.Flags().StringVarP(&o.Name, "package-install", "i", "", "Set installed package name")
@@ -199,7 +197,6 @@ func NewUpdateCmd(o *CreateOrUpdateOptions, flagsFactory cmdcore.FlagsFactory) *
199197
AllowDisableWait: true,
200198
DefaultInterval: 1 * time.Second,
201199
DefaultTimeout: 30 * time.Minute,
202-
WaitByDefault: o.pkgCmdTreeOpts.WaitByDefault,
203200
})
204201
o.YttOverlayFlags.Set(cmd)
205202

‎cli/pkg/kctrl/cmd/package/installed/delete.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,9 @@ func NewDeleteCmd(o *DeleteOptions, flagsFactory cmdcore.FlagsFactory) *cobra.Co
7272
}
7373

7474
o.WaitFlags.Set(cmd, flagsFactory, &cmdcore.WaitFlagsOpts{
75-
AllowDisableWait: false,
75+
AllowDisableWait: false || o.pkgCmdTreeOpts.AlwaysAllowTogglingWait,
7676
DefaultInterval: 1 * time.Second,
7777
DefaultTimeout: 5 * time.Minute,
78-
WaitByDefault: o.pkgCmdTreeOpts.WaitByDefault,
7978
})
8079

8180
return cmd

‎cli/pkg/kctrl/cmd/package/installed/pause_or_kick.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ func NewKickCmd(o *PauseOrKickOptions, flagsFactory cmdcore.FlagsFactory) *cobra
9696
AllowDisableWait: true,
9797
DefaultInterval: 2 * time.Second,
9898
DefaultTimeout: 5 * time.Minute,
99-
WaitByDefault: o.pkgCmdTreeOpts.WaitByDefault,
10099
})
101100

102101
return cmd

0 commit comments

Comments
 (0)