Skip to content

Commit

Permalink
Merge branch 'master' into up-add2
Browse files Browse the repository at this point in the history
  • Loading branch information
tstromberg authored Dec 10, 2019
2 parents a84db18 + 434648c commit ef51dfe
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 3 deletions.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/performance/main.go → cmd/performance/mkcmp/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
40 changes: 40 additions & 0 deletions cmd/performance/pr-bot/bot.go
Original file line number Diff line number Diff line change
@@ -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
}
3 changes: 2 additions & 1 deletion deploy/addons/dashboard/dashboard-dp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions pkg/minikube/bootstrapper/images/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}...)

Expand Down

0 comments on commit ef51dfe

Please sign in to comment.