kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename cacheImageConfigKey from cache #5375

pull/5430/head
Y.Horie 2019-09-24 10:37:32 +09:00 committed by u5surf
parent 878c3ca2b6
commit d023ac779e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/minikube/cmd/cache.go
View File

@ -25,7 +25,8 @@ import (
"k8s.io/minikube/pkg/minikube/machine" "k8s.io/minikube/pkg/minikube/machine"
) )
const cache = "cache" // cacheImageConfigKey is the config field name used to store which images we have previously cached
const cacheImageConfigKey = "cache"
// cacheCmd represents the cache command // cacheCmd represents the cache command
var cacheCmd = &cobra.Command{ var cacheCmd = &cobra.Command{
@ -45,7 +46,7 @@ var addCacheCmd = &cobra.Command{
exit.WithError("Failed to cache and load images", err) exit.WithError("Failed to cache and load images", err)
} }
// Add images to config file // Add images to config file
if err := cmdConfig.AddToConfigMap(cache, args); err != nil { if err := cmdConfig.AddToConfigMap(cacheImageConfigKey, args); err != nil {
exit.WithError("Failed to update config", err) exit.WithError("Failed to update config", err)
} }
}, },
@ -58,7 +59,7 @@ var deleteCacheCmd = &cobra.Command{
Long: "Delete an image from the local cache.", Long: "Delete an image from the local cache.",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
// Delete images from config file // Delete images from config file
if err := cmdConfig.DeleteFromConfigMap(cache, args); err != nil { if err := cmdConfig.DeleteFromConfigMap(cacheImageConfigKey, args); err != nil {
exit.WithError("Failed to delete images from config", err) exit.WithError("Failed to delete images from config", err)
} }
// Delete images from cache/images directory // Delete images from cache/images directory
@ -73,7 +74,7 @@ func imagesInConfigFile() ([]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if values, ok := configFile[cache]; ok { if values, ok := configFile[cacheImageConfigKey]; ok {
var images []string var images []string
for key := range values.(map[string]interface{}) { for key := range values.(map[string]interface{}) {
images = append(images, key) images = append(images, key)

2
cmd/minikube/cmd/cache_list.go
View File

@ -40,7 +40,7 @@ var listCacheCmd = &cobra.Command{
Short: "List all available images from the local cache.", Short: "List all available images from the local cache.",
Long: "List all available images from the local cache.", Long: "List all available images from the local cache.",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
images, err := cmdConfig.ListConfigMap(cache) images, err := cmdConfig.ListConfigMap(cacheImageConfigKey)
if err != nil { if err != nil {
exit.WithError("Failed to get image map", err) exit.WithError("Failed to get image map", err)
} }