Add option to control server resource caching (off by default)

Cornelius Weig · Cornelius Weig · commit da2aaca3a850 · 2019-02-14T22:21:05.000+01:00
diff --git a/cmd/root.go b/cmd/root.go
@@ -39,11 +39,11 @@ ketall retrieves all resources which allow to be fetched. This complements the
 usual "kubectl get all" command, which does not list cluster-level resources.
 
 For example:
-  List all resources
+  Get all resources
   $ ketall
 
-  List all resources and do not use cached results
-  $ ketall --no-cache
+  Get all resources and use list of cached server resources
+  $ ketall --cache
 `
 )
 
@@ -68,6 +68,8 @@ func init() {
 	rootCmd.PersistentFlags().StringVar(&ketallOptions.CfgFile, "config", "", "config file (default is $HOME/.kube/ketall.yaml)")
 	rootCmd.PersistentFlags().StringVarP(&v, "verbosity", "v", pkg.DefaultLogLevel.String(), "Log level (debug, info, warn, error, fatal, panic)")
 
+	rootCmd.Flags().BoolVar(&ketallOptions.UseCache, "cache", false, "use cached list of server resources")
+
 	ketallOptions.GenericCliFlags.AddFlags(rootCmd.Flags())
 	ketallOptions.PrintFlags.AddFlags(rootCmd)
 
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -24,7 +24,7 @@ type groupResource struct {
 func GetAllServerResources(ketallOptions *options.KetallOptions) (runtime.Object, error) {
 	flags := ketallOptions.GenericCliFlags
 
-	resNames, err := FetchAvailableResourceNames(flags)
+	resNames, err := FetchAvailableResourceNames(ketallOptions.UseCache, flags)
 	if err != nil {
 		return nil, errors.Wrap(err, "fetch available resources")
 	}
@@ -53,20 +53,17 @@ func GetAllServerResources(ketallOptions *options.KetallOptions) (runtime.Object
 	return response.Object()
 }
 
-// TODO add flag to disable cache: --no-cache
 // TODO add flag to list only namespaced resources: --scope-namespace
 // TODO add flag to list only cluster resources: --scope-cluster
-func FetchAvailableResourceNames(flags *genericclioptions.ConfigFlags) ([]string, error) {
+func FetchAvailableResourceNames(cache bool, flags *genericclioptions.ConfigFlags) ([]string, error) {
 	client, err := flags.ToDiscoveryClient()
 	if err != nil {
 		return nil, errors.Wrap(err, "discovery client")
 	}
 
-	// TODO add option to disable caching
-	/*if !o.Cached {
-		// Always request fresh data from the server
-		discoveryclient.Invalidate()
-	}*/
+	if !cache {
+		client.Invalidate()
+	}
 
 	resources, err := client.ServerPreferredResources()
 	if err != nil {
diff --git a/pkg/options/options.go b/pkg/options/options.go
@@ -10,6 +10,7 @@ type KetallOptions struct {
 	CfgFile         string
 	GenericCliFlags *genericclioptions.ConfigFlags
 	PrintFlags      KAPrintFlags
+	UseCache        bool
 }
 
 func NewCmdOptions() *KetallOptions {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ type KetallOptions struct {`
`10`	`10`	`CfgFile string`
`11`	`11`	`GenericCliFlags *genericclioptions.ConfigFlags`
`12`	`12`	`PrintFlags KAPrintFlags`
	`13`	`+ UseCache bool`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`func NewCmdOptions() *KetallOptions {`