Merge branch 'master' into up-add2

pull/5935/head
Thomas Strömberg 2019-12-10 10:45:53 -08:00 committed by GitHub
commit ef51dfe8bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 50 additions and 3 deletions

View File

@ -584,7 +584,11 @@ site: site/themes/docsy/assets/vendor/bootstrap/package.js out/hugo/hugo ## Serv
.PHONY: out/mkcmp
out/mkcmp:
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $@ cmd/performance/main.go
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $@ cmd/performance/mkcmp/main.go
.PHONY: out/performance-monitor
out/performance-monitor:
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $@ cmd/performance/monitor/monitor.go
.PHONY: help
help:

View File

@ -16,7 +16,7 @@ limitations under the License.
package main
import "k8s.io/minikube/cmd/performance/cmd"
import "k8s.io/minikube/cmd/performance/mkcmp/cmd"
func main() {
cmd.Execute()

View File

@ -0,0 +1,40 @@
/*
Copyright 2019 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package main
import (
"context"
"log"
"time"
)
func main() {
for {
if err := analyzePerformance(context.Background()); err != nil {
log.Printf("error executing performance analysis: %v", err)
}
time.Sleep(10 * time.Minute)
}
}
// analyzePerformance is responsible for:
// 1. collecting PRs to run performance analysis on
// 2. running mkcmp against those PRs
// 3. commenting results on those PRs
func analyzePerformance(ctx context.Context) error {
return nil
}

View File

@ -89,7 +89,8 @@ spec:
spec:
containers:
- name: kubernetes-dashboard
image: kubernetesui/dashboard:v2.0.0-beta6
# WARNING: This must match pkg/minikube/bootstrapper/images/images.go
image: kubernetesui/dashboard:v2.0.0-beta8
ports:
- containerPort: 9090
protocol: TCP

View File

@ -145,6 +145,8 @@ func CachedImages(imageRepositoryStr string, kubernetesVersionStr string) []stri
images = append(images, []string{
imageRepository + "kube-addon-manager" + ArchTag(false) + "v9.0.2",
// This must match deploy/addons/dashboard/dashboard-dp.yaml
"kubernetesui/dashboard:v2.0.0-beta8",
minikubeRepository + "storage-provisioner" + ArchTag(false) + "v1.8.1",
}...)