Skip to content

Commit 4cff790

Browse files
author
Priya Wadhwa
committed
fixed merge conflict
2 parents 6538306 + bc3db0d commit 4cff790

Some content is hidden

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

69 files changed

+1257
-321
lines changed

‎.github/workflows/iso.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@ jobs:
6464
echo workspace $GITHUB_WORKSPACE
6565
echo "end of debug stuff"
6666
echo $(which jq)
67-
# iso needs golang 1.11.3
68-
- uses: actions/setup-go@v2
69-
with:
70-
go-version: '1.11.13'
71-
stable: true
7267
- name: Build ISO
7368
run: |
7469
whoami
@@ -146,4 +141,4 @@ jobs:
146141
if [ "$numFail" -gt 0 ];then echo "*** $numFail Failed ***";exit 2;fi
147142
if [ "$numPass" -eq 0 ];then echo "*** 0 Passed! ***";exit 2;fi
148143
if [ "$numPass" -lt 32 ];then echo "*** Failed to pass at least 32 ! ***";exit 2;fi
149-
if [ "$numPass" -eq 0 ];then echo "*** Passed! ***";exit 0;fi
144+
if [ "$numPass" -eq 0 ];then echo "*** Passed! ***";exit 0;fi

‎.github/workflows/master.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ jobs:
412412
echo "---------------- ${numFail} Failures :( ----------------------------"
413413
echo $failedTests
414414
echo "-------------------------------------------------------"
415-
If ($numFail -gt 0){ exit 2 }
415+
If ($numFail -gt 0){ exit 2 }
416416
If ($numPass -eq 0){ exit 2 }
417417
If ($numPass -lt 33){ exit 2 }
418418
If ($numFail -eq 0){ exit 0 }
@@ -429,7 +429,7 @@ jobs:
429429
shell: powershell
430430
run: |
431431
echo $env:computerName
432-
ls
432+
ls
433433
$ErrorActionPreference = "SilentlyContinue"
434434
cd minikube_binaries
435435
ls
@@ -464,14 +464,14 @@ jobs:
464464
$docker_running = $?
465465
}
466466
Write-Output "Docker is running"
467-
docker system prune -f
467+
docker system prune -f
468468
- name: Info
469469
continue-on-error: true
470470
shell: powershell
471471
run: |
472472
$ErrorActionPreference = "SilentlyContinue"
473473
cd minikube_binaries
474-
ls
474+
ls
475475
echo $env:computername
476476
Get-WmiObject -class Win32_ComputerSystem
477477
- uses: actions/setup-go@v2
@@ -483,7 +483,7 @@ jobs:
483483
shell: powershell
484484
run: |
485485
$ErrorActionPreference = "SilentlyContinue"
486-
(New-Object Net.WebClient).DownloadFile("https://github.com/medyagh/gopogh/releases/download/v0.2.4/gopogh.exe", "C:\ProgramData\chocolatey\bin\gopogh.exe")
486+
(New-Object Net.WebClient).DownloadFile("https://github.com/medyagh/gopogh/releases/download/v0.2.4/gopogh.exe", "C:\ProgramData\chocolatey\bin\gopogh.exe")
487487
choco install -y kubernetes-cli
488488
choco install -y jq
489489
choco install -y caffeine
@@ -549,7 +549,7 @@ jobs:
549549
echo "---------------- ${numFail} Failures :( ----------------------------"
550550
echo $failedTests
551551
echo "-------------------------------------------------------"
552-
If ($numFail -gt 0){ exit 2 }
552+
If ($numFail -gt 0){ exit 2 }
553553
If ($numPass -eq 0){ exit 2 }
554554
If ($numPass -lt 33){ exit 2 }
555555
If ($numFail -eq 0){ exit 0 }
@@ -775,11 +775,11 @@ jobs:
775775
run: |
776776
hostname
777777
VBoxManage --version
778-
sysctl hw.physicalcpu hw.logicalcpu
778+
sysctl hw.physicalcpu hw.logicalcpu
779779
- name: Disable firewall
780780
run: |
781781
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
782-
sudo /usr/libexec/ApplicationFirewall/socketfilterfw -k
782+
sudo /usr/libexec/ApplicationFirewall/socketfilterfw -k
783783
- name: Download Binaries
784784
uses: actions/download-artifact@v1
785785
with:
@@ -966,7 +966,7 @@ jobs:
966966
run: |
967967
hostname
968968
VBoxManage --version
969-
sysctl hw.physicalcpu hw.logicalcpu
969+
sysctl hw.physicalcpu hw.logicalcpu
970970
- name: Disable firewall
971971
run: |
972972
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
@@ -1150,7 +1150,7 @@ jobs:
11501150
run: |
11511151
hostname
11521152
VBoxManage --version
1153-
sysctl hw.physicalcpu hw.logicalcpu
1153+
sysctl hw.physicalcpu hw.logicalcpu
11541154
- name: Disable firewall
11551155
run: |
11561156
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
@@ -1247,4 +1247,4 @@ jobs:
12471247
- uses: actions/upload-artifact@v1
12481248
with:
12491249
name: all_reports
1250-
path: all_reports
1250+
path: all_reports

‎.github/workflows/pr.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ jobs:
410410
echo "---------------- ${numFail} Failures :( ----------------------------"
411411
echo $failedTests
412412
echo "-------------------------------------------------------"
413-
If ($numFail -gt 0){ exit 2 }
413+
If ($numFail -gt 0){ exit 2 }
414414
If ($numPass -eq 0){ exit 2 }
415415
If ($numPass -lt 33){ exit 2 }
416416
If ($numFail -eq 0){ exit 0 }
@@ -427,7 +427,7 @@ jobs:
427427
shell: powershell
428428
run: |
429429
echo $env:computerName
430-
ls
430+
ls
431431
$ErrorActionPreference = "SilentlyContinue"
432432
cd minikube_binaries
433433
ls
@@ -462,14 +462,14 @@ jobs:
462462
$docker_running = $?
463463
}
464464
Write-Output "Docker is running"
465-
docker system prune -f
465+
docker system prune -f
466466
- name: Info
467467
continue-on-error: true
468468
shell: powershell
469469
run: |
470470
$ErrorActionPreference = "SilentlyContinue"
471471
cd minikube_binaries
472-
ls
472+
ls
473473
echo $env:computername
474474
Get-WmiObject -class Win32_ComputerSystem
475475
- uses: actions/setup-go@v2
@@ -481,7 +481,7 @@ jobs:
481481
shell: powershell
482482
run: |
483483
$ErrorActionPreference = "SilentlyContinue"
484-
(New-Object Net.WebClient).DownloadFile("https://github.com/medyagh/gopogh/releases/download/v0.2.4/gopogh.exe", "C:\ProgramData\chocolatey\bin\gopogh.exe")
484+
(New-Object Net.WebClient).DownloadFile("https://github.com/medyagh/gopogh/releases/download/v0.2.4/gopogh.exe", "C:\ProgramData\chocolatey\bin\gopogh.exe")
485485
choco install -y kubernetes-cli
486486
choco install -y jq
487487
choco install -y caffeine
@@ -547,7 +547,7 @@ jobs:
547547
echo "---------------- ${numFail} Failures :( ----------------------------"
548548
echo $failedTests
549549
echo "-------------------------------------------------------"
550-
If ($numFail -gt 0){ exit 2 }
550+
If ($numFail -gt 0){ exit 2 }
551551
If ($numPass -eq 0){ exit 2 }
552552
If ($numPass -lt 33){ exit 2 }
553553
If ($numFail -eq 0){ exit 0 }
@@ -773,11 +773,11 @@ jobs:
773773
run: |
774774
hostname
775775
VBoxManage --version
776-
sysctl hw.physicalcpu hw.logicalcpu
776+
sysctl hw.physicalcpu hw.logicalcpu
777777
- name: Disable firewall
778778
run: |
779779
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
780-
sudo /usr/libexec/ApplicationFirewall/socketfilterfw -k
780+
sudo /usr/libexec/ApplicationFirewall/socketfilterfw -k
781781
- name: Download Binaries
782782
uses: actions/download-artifact@v1
783783
with:
@@ -964,7 +964,7 @@ jobs:
964964
run: |
965965
hostname
966966
VBoxManage --version
967-
sysctl hw.physicalcpu hw.logicalcpu
967+
sysctl hw.physicalcpu hw.logicalcpu
968968
- name: Disable firewall
969969
run: |
970970
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
@@ -1148,7 +1148,7 @@ jobs:
11481148
run: |
11491149
hostname
11501150
VBoxManage --version
1151-
sysctl hw.physicalcpu hw.logicalcpu
1151+
sysctl hw.physicalcpu hw.logicalcpu
11521152
- name: Disable firewall
11531153
run: |
11541154
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
@@ -1245,4 +1245,4 @@ jobs:
12451245
- uses: actions/upload-artifact@v1
12461246
with:
12471247
name: all_reports
1248-
path: all_reports
1248+
path: all_reports

‎Makefile

+12-6
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,15 @@ html_report: ## Generate HTML report out of the last ran integration test logs.
305305
@go tool test2json -t < "./out/testout_$(COMMIT_SHORT).txt" > "./out/testout_$(COMMIT_SHORT).json"
306306
@gopogh -in "./out/testout_$(COMMIT_SHORT).json" -out ./out/testout_$(COMMIT_SHORT).html -name "$(shell git rev-parse --abbrev-ref HEAD)" -pr "" -repo github.com/kubernetes/minikube/ -details "${COMMIT_SHORT}"
307307
@echo "-------------------------- Open HTML Report in Browser: ---------------------------"
308+
ifeq ($(GOOS),windows)
309+
@echo start $(CURDIR)/out/testout_$(COMMIT_SHORT).html
310+
@echo "-----------------------------------------------------------------------------------"
311+
@start $(CURDIR)/out/testout_$(COMMIT_SHORT).html || true
312+
else
308313
@echo open $(CURDIR)/out/testout_$(COMMIT_SHORT).html
309314
@echo "-----------------------------------------------------------------------------------"
310315
@open $(CURDIR)/out/testout_$(COMMIT_SHORT).html || true
316+
endif
311317

312318
.PHONY: test
313319
test: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go ## Trigger minikube test
@@ -331,7 +337,7 @@ pkg/minikube/assets/assets.go: $(shell find "deploy/addons" -type f)
331337
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
332338
$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
333339
endif
334-
@which go-bindata >/dev/null 2>&1 || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
340+
@which go-bindata >/dev/null 2>&1 || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/go-bindata/go-bindata/...
335341
$(if $(quiet),@echo " GEN $@")
336342
$(Q)PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg assets deploy/addons/...
337343
$(Q)-gofmt -s -w $@
@@ -344,7 +350,7 @@ pkg/minikube/translate/translations.go: $(shell find "translations/" -type f)
344350
ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y)
345351
$(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@)
346352
endif
347-
@which go-bindata >/dev/null 2>&1 || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/jteeuwen/go-bindata/...
353+
@which go-bindata >/dev/null 2>&1 || GO111MODULE=off GOBIN="$(GOPATH)$(DIRSEP)bin" go get github.com/go-bindata/go-bindata/...
348354
$(if $(quiet),@echo " GEN $@")
349355
$(Q)PATH="$(PATH)$(PATHSEP)$(GOPATH)$(DIRSEP)bin" go-bindata -nomemcopy -o $@ -pkg translate translations/...
350356
$(Q)-gofmt -s -w $@
@@ -579,7 +585,7 @@ storage-provisioner-image: out/storage-provisioner-$(GOARCH) ## Build storage-pr
579585
.PHONY: kic-base-image
580586
kic-base-image: ## builds the base image used for kic.
581587
docker rmi -f $(KIC_BASE_IMAGE_GCR)-snapshot || true
582-
docker build -f ./deploy/kicbase/Dockerfile -t local/kicbase:$(KIC_VERSION)-snapshot --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --cache-from $(KIC_BASE_IMAGE_GCR) --target base ./deploy/kicbase
588+
docker build -f ./deploy/kicbase/Dockerfile -t local/kicbase:$(KIC_VERSION)-snapshot --build-arg COMMIT_SHA=${VERSION}-$(COMMIT) --cache-from $(KIC_BASE_IMAGE_GCR) ./deploy/kicbase
583589
docker tag local/kicbase:$(KIC_VERSION)-snapshot $(KIC_BASE_IMAGE_GCR)-snapshot
584590
docker tag local/kicbase:$(KIC_VERSION)-snapshot $(KIC_BASE_IMAGE_GCR)
585591
docker tag local/kicbase:$(KIC_VERSION)-snapshot $(KIC_BASE_IMAGE_HUB)
@@ -747,9 +753,9 @@ site: site/themes/docsy/assets/vendor/bootstrap/package.js out/hugo/hugo ## Serv
747753
out/mkcmp:
748754
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $@ cmd/performance/mkcmp/main.go
749755

750-
.PHONY: out/performance-monitor
751-
out/performance-monitor:
752-
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $@ cmd/performance/monitor/monitor.go
756+
.PHONY: out/performance-bot
757+
out/performance-bot:
758+
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $@ cmd/performance/pr-bot/bot.go
753759

754760
.PHONY: compare
755761
compare: out/mkcmp out/minikube

‎cmd/minikube/cmd/completion.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ import (
2828
"k8s.io/minikube/pkg/minikube/reason"
2929
)
3030

31-
const longDescription = `
32-
Outputs minikube shell completion for the given shell (bash, zsh or fish)
31+
const longDescription = `Outputs minikube shell completion for the given shell (bash, zsh or fish)
3332
3433
This depends on the bash-completion binary. Example installation instructions:
3534
OS X:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232

3333
var addonsConfigureCmd = &cobra.Command{
3434
Use: "configure ADDON_NAME",
35-
Short: "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list ",
36-
Long: "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list ",
35+
Short: "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list",
36+
Long: "Configures the addon w/ADDON_NAME within minikube (example: minikube addons configure registry-creds). For a list of available addons use: minikube addons list",
3737
Run: func(cmd *cobra.Command, args []string) {
3838
if len(args) != 1 {
3939
exit.Message(reason.Usage, "usage: minikube addons configure ADDON_NAME")

0 commit comments

Comments
 (0)