Skip to content

Commit 807963a

Browse files
tstrombergtstromberg
committed
Use r for mockRunner instead of h
2 parents 53a246b + 0b21fc3 commit 807963a

File tree

129 files changed

+1424
-771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+1424
-771
lines changed

‎Makefile

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ MINIKUBE_MARKDOWN_FILES := README.md docs CONTRIBUTING.md CHANGELOG.md
7878
MINIKUBE_BUILD_TAGS := container_image_ostree_stub containers_image_openpgp
7979
MINIKUBE_INTEGRATION_BUILD_TAGS := integration $(MINIKUBE_BUILD_TAGS)
8080
SOURCE_DIRS = cmd pkg test
81+
SOURCE_PACKAGES = ./cmd/... ./pkg/... ./test/...
8182

8283
# $(call DOCKER, image, command)
8384
define DOCKER
@@ -175,7 +176,7 @@ test-iso:
175176

176177
.PHONY: test-pkg
177178
test-pkg/%:
178-
go test -v -test.timeout=30m $(REPOPATH)/$* --tags="$(MINIKUBE_BUILD_TAGS)"
179+
go test -v -test.timeout=60m $(REPOPATH)/$* --tags="$(MINIKUBE_BUILD_TAGS)"
179180

180181
.PHONY: depend
181182
depend: out/minikube.d out/test.d out/docker-machine-driver-hyperkit.d out/storage-provisioner.d out/docker-machine-driver-kvm2.d
@@ -188,15 +189,15 @@ drivers: out/docker-machine-driver-hyperkit out/docker-machine-driver-kvm2
188189

189190
.PHONY: integration
190191
integration: out/minikube
191-
go test -v -test.timeout=30m $(REPOPATH)/test/integration --tags="$(MINIKUBE_INTEGRATION_BUILD_TAGS)" $(TEST_ARGS)
192+
go test -v -test.timeout=60m $(REPOPATH)/test/integration --tags="$(MINIKUBE_INTEGRATION_BUILD_TAGS)" $(TEST_ARGS)
192193

193194
.PHONY: integration-none-driver
194195
integration-none-driver: e2e-linux-amd64 out/minikube-linux-amd64
195-
sudo -E out/e2e-linux-amd64 -testdata-dir "test/integration/testdata" -minikube-start-args="--vm-driver=none" -test.v -test.timeout=30m -binary=out/minikube-linux-amd64 $(TEST_ARGS)
196+
sudo -E out/e2e-linux-amd64 -testdata-dir "test/integration/testdata" -minikube-start-args="--vm-driver=none" -test.v -test.timeout=60m -binary=out/minikube-linux-amd64 $(TEST_ARGS)
196197

197198
.PHONY: integration-versioned
198199
integration-versioned: out/minikube
199-
go test -v -test.timeout=30m $(REPOPATH)/test/integration --tags="$(MINIKUBE_INTEGRATION_BUILD_TAGS) versioned" $(TEST_ARGS)
200+
go test -v -test.timeout=60m $(REPOPATH)/test/integration --tags="$(MINIKUBE_INTEGRATION_BUILD_TAGS) versioned" $(TEST_ARGS)
200201

201202
.PHONY: test
202203
out/test.d: pkg/minikube/assets/assets.go
@@ -218,7 +219,8 @@ e2e-cross: e2e-linux-amd64 e2e-darwin-amd64 e2e-windows-amd64.exe
218219

219220
.PHONY: checksum
220221
checksum:
221-
for f in out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe out/minikube.iso; do \
222+
for f in out/minikube-linux-amd64 out/minikube-darwin-amd64 out/minikube-windows-amd64.exe out/minikube.iso \
223+
out/docker-machine-driver-kvm2 out/docker-machine-driver-hyperkit; do \
222224
if [ -f "$${f}" ]; then \
223225
openssl sha256 "$${f}" | awk '{print $$2}' > "$${f}.sha256" ; \
224226
fi ; \
@@ -236,6 +238,20 @@ gendocs: out/docs/minikube.md
236238
fmt:
237239
@gofmt -l -s -w $(SOURCE_DIRS)
238240

241+
.PHONY: vet
242+
vet:
243+
@go vet $(SOURCE_PACKAGES)
244+
245+
.PHONY: lint
246+
lint:
247+
@golint -set_exit_status $(SOURCE_PACKAGES)
248+
249+
.PHONY: reportcard
250+
reportcard:
251+
goreportcard-cli -v
252+
# "disabling misspell on large repo..."
253+
-misspell -error $(SOURCE_DIRS)
254+
239255
.PHONY: mdlint
240256
mdlint:
241257
@$(MARKDOWNLINT) $(MINIKUBE_MARKDOWN_FILES)
@@ -379,5 +395,6 @@ install-kvm: out/docker-machine-driver-kvm2
379395
cp out/docker-machine-driver-kvm2 $(GOBIN)/docker-machine-driver-kvm2
380396

381397
.PHONY: release-kvm-driver
382-
release-kvm-driver: kvm_in_docker install-kvm
398+
release-kvm-driver: kvm_in_docker checksum install-kvm
383399
gsutil cp $(GOBIN)/docker-machine-driver-kvm2 gs://minikube/drivers/kvm/$(VERSION)/
400+
gsutil cp $(GOBIN)/docker-machine-driver-kvm2.sha256 gs://minikube/drivers/kvm/$(VERSION)/

‎cmd/drivers/hyperkit/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// +build darwin
2+
13
/*
24
Copyright 2016 The Kubernetes Authors All rights reserved.
35

‎cmd/minikube/cmd/cache_list.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828

2929
var cacheListFormat string
3030

31+
// CacheListTemplate represents the cache list template
3132
type CacheListTemplate struct {
3233
CacheImage string
3334
}

‎cmd/minikube/cmd/completion.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ var completionCmd = &cobra.Command{
8888
},
8989
}
9090

91+
// GenerateBashCompletion generates the completion for the bash shell
9192
func GenerateBashCompletion(w io.Writer, cmd *cobra.Command) error {
9293
_, err := w.Write([]byte(boilerPlate))
9394
if err != nil {
@@ -102,8 +103,9 @@ func GenerateBashCompletion(w io.Writer, cmd *cobra.Command) error {
102103
return nil
103104
}
104105

106+
// GenerateZshCompletion generates the completion for the zsh shell
105107
func GenerateZshCompletion(out io.Writer, cmd *cobra.Command) error {
106-
zsh_initialization := `#compdef minikube
108+
zshInitialization := `#compdef minikube
107109
108110
__minikube_bash_source() {
109111
alias shopt=':'
@@ -242,7 +244,7 @@ __minikube_convert_bash_to_zsh() {
242244
return err
243245
}
244246

245-
_, err = out.Write([]byte(zsh_initialization))
247+
_, err = out.Write([]byte(zshInitialization))
246248
if err != nil {
247249
return err
248250
}
@@ -257,12 +259,12 @@ __minikube_convert_bash_to_zsh() {
257259
return err
258260
}
259261

260-
zsh_tail := `
262+
zshTail := `
261263
BASH_COMPLETION_EOF
262264
}
263265
__minikube_bash_source <(__minikube_convert_bash_to_zsh)
264266
`
265-
_, err = out.Write([]byte(zsh_tail))
267+
_, err = out.Write([]byte(zshTail))
266268
if err != nil {
267269
return err
268270
}

‎cmd/minikube/cmd/config/addons.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/spf13/cobra"
2121
)
2222

23+
// AddonsCmd represents the addons command
2324
var AddonsCmd = &cobra.Command{
2425
Use: "addons SUBCOMMAND [flags]",
2526
Short: "Modify minikube's kubernetes addons",

‎cmd/minikube/cmd/config/addons_list.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929

3030
var addonListFormat string
3131

32+
// AddonListTemplate represents the addon list template
3233
type AddonListTemplate struct {
3334
AddonName string
3435
AddonStatus string

‎cmd/minikube/cmd/config/config.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ import (
2828
"k8s.io/minikube/pkg/minikube/constants"
2929
)
3030

31+
// Bootstrapper is the name for bootstrapper
3132
const Bootstrapper = "bootstrapper"
3233

3334
type setFn func(string, string) error
3435

36+
// Setting represents a setting
3537
type Setting struct {
3638
name string
3739
set func(config.MinikubeConfig, string, string) error
@@ -49,6 +51,11 @@ var settings = []Setting{
4951
validations: []setFn{IsValidDriver},
5052
callbacks: []setFn{RequiresRestartMsg},
5153
},
54+
{
55+
name: "feature-gates",
56+
set: SetString,
57+
callbacks: []setFn{RequiresRestartMsg},
58+
},
5259
{
5360
name: "v",
5461
set: SetInt,
@@ -247,6 +254,7 @@ var settings = []Setting{
247254
},
248255
}
249256

257+
// ConfigCmd represents the config command
250258
var ConfigCmd = &cobra.Command{
251259
Use: "config SUBCOMMAND [flags]",
252260
Short: "Modify minikube config",

‎cmd/minikube/cmd/config/get.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222

2323
"github.com/spf13/cobra"
24-
"k8s.io/minikube/pkg/minikube/config"
24+
pkgConfig "k8s.io/minikube/pkg/minikube/config"
2525
"k8s.io/minikube/pkg/minikube/console"
2626
)
2727

@@ -36,7 +36,7 @@ var configGetCmd = &cobra.Command{
3636
}
3737

3838
cmd.SilenceUsage = true
39-
val, err := config.Get(args[0])
39+
val, err := Get(args[0])
4040
if err != nil {
4141
return err
4242
}
@@ -52,3 +52,8 @@ var configGetCmd = &cobra.Command{
5252
func init() {
5353
ConfigCmd.AddCommand(configGetCmd)
5454
}
55+
56+
// Get gets a property
57+
func Get(name string) (string, error) {
58+
return pkgConfig.Get(name)
59+
}

‎cmd/minikube/cmd/config/profile.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"k8s.io/minikube/pkg/minikube/exit"
2424
)
2525

26+
// ProfileCmd represents the profile command
2627
var ProfileCmd = &cobra.Command{
2728
Use: "profile MINIKUBE_PROFILE_NAME. You can return to the default minikube profile by running `minikube profile default`",
2829
Short: "Profile sets the current minikube profile",

‎cmd/minikube/cmd/config/prompt.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ func concealableAskForStaticValue(readWriter io.ReadWriter, promptString string,
118118
}
119119
}
120120

121+
// AskForPasswordValue asks for a password value, while hiding the input
121122
func AskForPasswordValue(s string) string {
122123

123124
stdInFd := int(os.Stdin.Fd())

‎cmd/minikube/cmd/config/set.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func init() {
4242
ConfigCmd.AddCommand(configSetCmd)
4343
}
4444

45+
// Set sets a property to a value
4546
func Set(name string, value string) error {
4647
s, err := findSetting(name)
4748
if err != nil {

‎cmd/minikube/cmd/config/util.go

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package config
1818

1919
import (
2020
"fmt"
21+
"os"
2122
"strconv"
2223
"strings"
2324

@@ -26,6 +27,7 @@ import (
2627
"k8s.io/minikube/pkg/minikube/cluster"
2728
"k8s.io/minikube/pkg/minikube/config"
2829
"k8s.io/minikube/pkg/minikube/constants"
30+
"k8s.io/minikube/pkg/minikube/exit"
2931
"k8s.io/minikube/pkg/minikube/machine"
3032
"k8s.io/minikube/pkg/minikube/storageclass"
3133
)
@@ -56,16 +58,19 @@ func findSetting(name string) (Setting, error) {
5658

5759
// Set Functions
5860

61+
// SetString sets a string value
5962
func SetString(m config.MinikubeConfig, name string, val string) error {
6063
m[name] = val
6164
return nil
6265
}
6366

67+
// SetMap sets a map value
6468
func SetMap(m config.MinikubeConfig, name string, val map[string]interface{}) error {
6569
m[name] = val
6670
return nil
6771
}
6872

73+
// SetConfigMap sets a config map value
6974
func SetConfigMap(m config.MinikubeConfig, name string, val string) error {
7075
list := strings.Split(val, ",")
7176
v := make(map[string]interface{})
@@ -76,6 +81,7 @@ func SetConfigMap(m config.MinikubeConfig, name string, val string) error {
7681
return nil
7782
}
7883

84+
// SetInt sets an int value
7985
func SetInt(m config.MinikubeConfig, name string, val string) error {
8086
i, err := strconv.Atoi(val)
8187
if err != nil {
@@ -85,6 +91,7 @@ func SetInt(m config.MinikubeConfig, name string, val string) error {
8591
return nil
8692
}
8793

94+
// SetBool sets a bool value
8895
func SetBool(m config.MinikubeConfig, name string, val string) error {
8996
b, err := strconv.ParseBool(val)
9097
if err != nil {
@@ -118,22 +125,50 @@ func EnableOrDisableAddon(name string, val string) error {
118125
if err != nil {
119126
return errors.Wrap(err, "command runner")
120127
}
128+
129+
cfg, err := config.Load()
130+
if err != nil && !os.IsNotExist(err) {
131+
exit.WithCode(exit.Data, "Unable to load config: %v", err)
132+
}
133+
134+
data := assets.GenerateTemplateData(cfg.KubernetesConfig)
121135
if enable {
122136
for _, addon := range addon.Assets {
123-
if err := cmd.Copy(addon); err != nil {
137+
var addonFile assets.CopyableFile
138+
if addon.IsTemplate() {
139+
addonFile, err = addon.Evaluate(data)
140+
if err != nil {
141+
return errors.Wrapf(err, "evaluate bundled addon %s asset", addon.GetAssetName())
142+
}
143+
144+
} else {
145+
addonFile = addon
146+
}
147+
if err := cmd.Copy(addonFile); err != nil {
124148
return errors.Wrapf(err, "enabling addon %s", addon.AssetName)
125149
}
126150
}
127151
} else {
128152
for _, addon := range addon.Assets {
129-
if err := cmd.Remove(addon); err != nil {
153+
var addonFile assets.CopyableFile
154+
if addon.IsTemplate() {
155+
addonFile, err = addon.Evaluate(data)
156+
if err != nil {
157+
return errors.Wrapf(err, "evaluate bundled addon %s asset", addon.GetAssetName())
158+
}
159+
160+
} else {
161+
addonFile = addon
162+
}
163+
if err := cmd.Remove(addonFile); err != nil {
130164
return errors.Wrapf(err, "disabling addon %s", addon.AssetName)
131165
}
132166
}
133167
}
134168
return nil
135169
}
136170

171+
// EnableOrDisableStorageClasses enables or disables storage classes
137172
func EnableOrDisableStorageClasses(name, val string) error {
138173
enable, err := strconv.ParseBool(val)
139174
if err != nil {

0 commit comments

Comments
 (0)