Skip to content

Commit

Permalink
Release 0.7.0-rc.1 (#811)
Browse files Browse the repository at this point in the history
  • Loading branch information
yfei1 committed Sep 18, 2019
1 parent 61449fe commit 3c61832
Show file tree
Hide file tree
Showing 21 changed files with 50 additions and 48 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
# If you want information on how to edit this file checkout,
# http://makefiletutorial.com/

BASE_VERSION = 0.0.0-dev
BASE_VERSION = 0.7.0-rc.1
SHORT_SHA = $(shell git rev-parse --short=7 HEAD | tr -d [:punct:])
BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD | tr -d [:punct:])
VERSION = $(BASE_VERSION)-$(SHORT_SHA)
Expand Down Expand Up @@ -884,7 +884,7 @@ ci-reap-namespaces: build/toolchain/bin/reaper$(EXE_EXTENSION)
presubmit: GOLANG_TEST_COUNT = 5
presubmit: clean update-deps third_party/ assets lint build install-toolchain test md-test terraform-test

build/release/: presubmit clean-install-yaml install/yaml/
build/release/: clean-install-yaml update-chart-deps install/yaml/
mkdir -p $(BUILD_DIR)/release/
cp $(REPOSITORY_ROOT)/install/yaml/* $(BUILD_DIR)/release/

Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ artifacts:
- install/yaml/05-jaeger-chart.yaml

substitutions:
_OM_VERSION: "0.0.0-dev"
_OM_VERSION: "0.7.0-rc.1"
_GCB_POST_SUBMIT: "0"
_GCB_LATEST_VERSION: "undefined"
logsBucket: 'gs://open-match-build-logs/'
Expand Down
18 changes: 9 additions & 9 deletions examples/scale/profiles/multifilter.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ import (
)

// multifilterProfiles generates a multiple profiles, each containing a single Pool
// that specifies multiple filters to pick a partitioned player population. Note
// that specifies multiple filters to pick a partitioned player population. Note
// that across all the profiles returned, the entire population is covered and given
// the overlapping nature of filters, multiple profiles returned by this method may
// match to the same set of players.
func multifilterProfiles(cfg config.View) []*pb.MatchProfile {
regions := cfg.GetStringSlice("testConfig.regions")
ratingFilters := makeRangeFilters(&rangeConfig{
name: "Rating",
min: cfg.GetInt("testConfig.minRating"),
max: cfg.GetInt("testConfig.maxRating"),
rangeSize: cfg.GetInt("testConfig.multifilter.rangeSize"),
name: "Rating",
min: cfg.GetInt("testConfig.minRating"),
max: cfg.GetInt("testConfig.maxRating"),
rangeSize: cfg.GetInt("testConfig.multifilter.rangeSize"),
rangeOverlap: cfg.GetInt("testConfig.multifilter.rangeOverlap"),
})

latencyFilters := makeRangeFilters(&rangeConfig{
name: "Latency",
min: 0,
max: 100,
rangeSize: 70,
name: "Latency",
min: 0,
max: 100,
rangeSize: 70,
rangeOverlap: 0,
})

Expand Down
16 changes: 8 additions & 8 deletions examples/scale/profiles/multipool.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@ func multipoolProfiles(cfg config.View) []*pb.MatchProfile {
characters := cfg.GetStringSlice("testConfig.characters")
regions := cfg.GetStringSlice("testConfig.regions")
ratingFilters := makeRangeFilters(&rangeConfig{
name: "Rating",
min: cfg.GetInt("testConfig.minRating"),
max: cfg.GetInt("testConfig.maxRating"),
rangeSize: cfg.GetInt("testConfig.multipool.rangeSize"),
name: "Rating",
min: cfg.GetInt("testConfig.minRating"),
max: cfg.GetInt("testConfig.maxRating"),
rangeSize: cfg.GetInt("testConfig.multipool.rangeSize"),
rangeOverlap: cfg.GetInt("testConfig.multipool.rangeOverlap"),
})

latencyFilters := makeRangeFilters(&rangeConfig{
name: "Latency",
min: 0,
max: 100,
rangeSize: 70,
name: "Latency",
min: 0,
max: 100,
rangeSize: 70,
rangeOverlap: 0,
})

Expand Down
10 changes: 5 additions & 5 deletions examples/scale/profiles/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type rangeConfig struct {
rangeOverlap int
}

// makeRosterSlots generates a roster with the specified name and with the
// makeRosterSlots generates a roster with the specified name and with the
// specified number of empty roster slots.
func makeRosterSlots(name string, count int) *pb.Roster {
roster := &pb.Roster{
Expand All @@ -48,13 +48,13 @@ func makeRosterSlots(name string, count int) *pb.Roster {
return roster
}

// makeRangeFilters generates multiple filters over a given range based on
// makeRangeFilters generates multiple filters over a given range based on
// the size of the range and the overlap specified for the filters.
func makeRangeFilters(config *rangeConfig) []*rangeFilter {
var filters []*rangeFilter
r := config.min
for r <= config.max {
max := r+config.rangeSize
max := r + config.rangeSize
if max > config.max {
r = config.max
}
Expand All @@ -64,9 +64,9 @@ func makeRangeFilters(config *rangeConfig) []*rangeFilter {
min: r,
max: max,
})

r = r + 1 + (config.rangeSize - config.rangeOverlap)
}

return filters
}
}
9 changes: 5 additions & 4 deletions examples/scale/tickets/tickets.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ var (
func Ticket(cfg config.View) *pb.Ticket {
characters := cfg.GetStringSlice("testConfig.characters")
regions := cfg.GetStringSlice("testConfig.regions")
min:= cfg.GetFloat64("testConfig.minRating")
max:= cfg.GetFloat64("testConfig.maxRating")
min := cfg.GetFloat64("testConfig.minRating")
max := cfg.GetFloat64("testConfig.maxRating")
latencyMap := latency(regions)
ticket := &pb.Ticket{
Properties: structs.Struct{
"mmr.rating": structs.Number(normalDist(40, min, max, 20)),
"mmr.rating": structs.Number(normalDist(40, min, max, 20)),
// TODO: Use string attribute value for the character attribute.
characters[rand.Intn(len(characters))]: structs.Number(float64(time.Now().Unix())),
}.S(),
Expand All @@ -53,7 +53,8 @@ func Ticket(cfg config.View) *pb.Ticket {

return ticket
}
// latency generates a latency mapping of each region to a latency value. It picks

// latency generates a latency mapping of each region to a latency value. It picks
// one region with latency between 0ms to 100ms and sets latencies to all other regions
// to a value between 100ms to 300ms.
func latency(regions []string) map[string]float64 {
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ require (
github.com/alicebob/miniredis/v2 v2.8.1-0.20190618082157-e29950035715
github.com/cenkalti/backoff v2.1.1+incompatible
github.com/fsnotify/fsnotify v1.4.7
github.com/go-logfmt/logfmt v0.4.0 // indirect
github.com/golang/protobuf v1.3.2
github.com/gomodule/redigo v1.7.1-0.20190322064113-39e2c31b7ca3
github.com/google/gofuzz v1.0.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions install/helm/open-match/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# limitations under the License.

apiVersion: v1
appVersion: "0.0.0-dev"
version: 0.0.0-dev
appVersion: "0.7.0-rc.1"
version: 0.7.0-rc.1
name: open-match
description: Flexible, extensible, and scalable video game matchmaking.
keywords:
Expand Down
Binary file not shown.
Binary file modified install/helm/open-match/charts/open-match-demo-0.0.0-dev.tgz
Binary file not shown.
Binary file modified install/helm/open-match/charts/open-match-telemetry-0.0.0-dev.tgz
Binary file not shown.
Binary file modified install/helm/open-match/charts/open-match-test-0.0.0-dev.tgz
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ evaluator:

image:
registry: gcr.io/open-match-public-images
tag: 0.0.0-dev
tag: 0.7.0-rc.1
pullPolicy: Always

configs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ demo:

image:
registry: gcr.io/open-match-public-images
tag: 0.0.0-dev
tag: 0.7.0-rc.1
pullPolicy: Always

# TODO: Split tls configs into a separate config file. For now Open Match assumes core components share the same secure mode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ scaleBackend:

image:
registry: gcr.io/open-match-public-images
tag: 0.0.0-dev
tag: 0.7.0-rc.1
pullPolicy: Always

configs:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

image:
registry: gcr.io/open-match-public-images
tag: 0.0.0-dev
tag: 0.7.0-rc.1
pullPolicy: Always

# https://github.com/helm/charts/tree/master/stable/prometheus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ kubernetes:

image:
registry: gcr.io/open-match-public-images
tag: 0.0.0-dev
tag: 0.7.0-rc.1
pullPolicy: Always
2 changes: 1 addition & 1 deletion install/helm/open-match/templates/om-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ data:
httpport: "{{ .Values.evaluator.httpPort }}"
synchronizer:
enabled: false
enabled: true
registrationIntervalMs: 3000ms
proposalCollectionIntervalMs: 2000ms
Expand Down
2 changes: 1 addition & 1 deletion install/helm/open-match/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function: &function
# Specifies a unified image registry, image tag, and imagePullPolicy for all components defined above.
image:
registry: gcr.io/open-match-public-images
tag: 0.0.0-dev
tag: 0.7.0-rc.1
pullPolicy: Always

# Specifies the supported customizable indices per Match
Expand Down
8 changes: 4 additions & 4 deletions internal/statestore/redis_indices_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func TestExtractIndexFilters(t *testing.T) {
description: "range",
pool: &pb.Pool{
FloatRangeFilters: []*pb.FloatRangeFilter{
&pb.FloatRangeFilter{
{
Attribute: "foo",
Min: -1,
Max: 1,
Expand All @@ -139,7 +139,7 @@ func TestExtractIndexFilters(t *testing.T) {
description: "bool false",
pool: &pb.Pool{
BoolEqualsFilters: []*pb.BoolEqualsFilter{
&pb.BoolEqualsFilter{
{
Attribute: "foo",
Value: false,
},
Expand All @@ -157,7 +157,7 @@ func TestExtractIndexFilters(t *testing.T) {
description: "bool true",
pool: &pb.Pool{
BoolEqualsFilters: []*pb.BoolEqualsFilter{
&pb.BoolEqualsFilter{
{
Attribute: "foo",
Value: true,
},
Expand All @@ -175,7 +175,7 @@ func TestExtractIndexFilters(t *testing.T) {
description: "string equals",
pool: &pb.Pool{
StringEqualsFilters: []*pb.StringEqualsFilter{
&pb.StringEqualsFilter{
{
Attribute: "foo",
Value: "bar",
},
Expand Down
12 changes: 6 additions & 6 deletions third_party/swaggerui/config.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"urls": [
{"name": "Frontend", "url": "https://open-match.dev/api/v0.0.0-dev/frontend.swagger.json"},
{"name": "Backend", "url": "https://open-match.dev/api/v0.0.0-dev/backend.swagger.json"},
{"name": "Mmlogic", "url": "https://open-match.dev/api/v0.0.0-dev/mmlogic.swagger.json"},
{"name": "MatchFunction", "url": "https://open-match.dev/api/v0.0.0-dev/matchfunction.swagger.json"},
{"name": "Synchronizer", "url": "https://open-match.dev/api/v0.0.0-dev/synchronizer.swagger.json"},
{"name": "Evaluator", "url": "https://open-match.dev/api/v0.0.0-dev/evaluator.swagger.json"}
{"name": "Frontend", "url": "https://open-match.dev/api/v0.7.0-rc.1/frontend.swagger.json"},
{"name": "Backend", "url": "https://open-match.dev/api/v0.7.0-rc.1/backend.swagger.json"},
{"name": "Mmlogic", "url": "https://open-match.dev/api/v0.7.0-rc.1/mmlogic.swagger.json"},
{"name": "MatchFunction", "url": "https://open-match.dev/api/v0.7.0-rc.1/matchfunction.swagger.json"},
{"name": "Synchronizer", "url": "https://open-match.dev/api/v0.7.0-rc.1/synchronizer.swagger.json"},
{"name": "Evaluator", "url": "https://open-match.dev/api/v0.7.0-rc.1/evaluator.swagger.json"}
]
}

0 comments on commit 3c61832

Please sign in to comment.