diff --git a/Makefile b/Makefile index 0be68c2f8..32e81e154 100644 --- a/Makefile +++ b/Makefile @@ -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) @@ -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/ diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 0fc47bf56..48f6c9689 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -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/' diff --git a/examples/scale/profiles/multifilter.go b/examples/scale/profiles/multifilter.go index a1cd74737..a5b5298bd 100644 --- a/examples/scale/profiles/multifilter.go +++ b/examples/scale/profiles/multifilter.go @@ -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, }) diff --git a/examples/scale/profiles/multipool.go b/examples/scale/profiles/multipool.go index 9c2f4d51c..58fb1fcb3 100644 --- a/examples/scale/profiles/multipool.go +++ b/examples/scale/profiles/multipool.go @@ -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, }) diff --git a/examples/scale/profiles/util.go b/examples/scale/profiles/util.go index be26163b4..e0e1154df 100644 --- a/examples/scale/profiles/util.go +++ b/examples/scale/profiles/util.go @@ -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{ @@ -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 } @@ -64,9 +64,9 @@ func makeRangeFilters(config *rangeConfig) []*rangeFilter { min: r, max: max, }) - + r = r + 1 + (config.rangeSize - config.rangeOverlap) } return filters -} \ No newline at end of file +} diff --git a/examples/scale/tickets/tickets.go b/examples/scale/tickets/tickets.go index dc0cf7659..932d6c9fd 100644 --- a/examples/scale/tickets/tickets.go +++ b/examples/scale/tickets/tickets.go @@ -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(), @@ -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 { diff --git a/go.mod b/go.mod index 43d817aa0..efd6d11fb 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/install/helm/open-match/Chart.yaml b/install/helm/open-match/Chart.yaml index e1c0c9889..d0b1e9fe5 100644 --- a/install/helm/open-match/Chart.yaml +++ b/install/helm/open-match/Chart.yaml @@ -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: diff --git a/install/helm/open-match/charts/open-match-customize-0.0.0-dev.tgz b/install/helm/open-match/charts/open-match-customize-0.0.0-dev.tgz index 103c6b177..d393946f1 100644 Binary files a/install/helm/open-match/charts/open-match-customize-0.0.0-dev.tgz and b/install/helm/open-match/charts/open-match-customize-0.0.0-dev.tgz differ diff --git a/install/helm/open-match/charts/open-match-demo-0.0.0-dev.tgz b/install/helm/open-match/charts/open-match-demo-0.0.0-dev.tgz index 228988d5f..1b9c4341f 100644 Binary files a/install/helm/open-match/charts/open-match-demo-0.0.0-dev.tgz and b/install/helm/open-match/charts/open-match-demo-0.0.0-dev.tgz differ diff --git a/install/helm/open-match/charts/open-match-telemetry-0.0.0-dev.tgz b/install/helm/open-match/charts/open-match-telemetry-0.0.0-dev.tgz index 8affac2af..ef18389fa 100644 Binary files a/install/helm/open-match/charts/open-match-telemetry-0.0.0-dev.tgz and b/install/helm/open-match/charts/open-match-telemetry-0.0.0-dev.tgz differ diff --git a/install/helm/open-match/charts/open-match-test-0.0.0-dev.tgz b/install/helm/open-match/charts/open-match-test-0.0.0-dev.tgz index 27603cd11..a01c07a39 100644 Binary files a/install/helm/open-match/charts/open-match-test-0.0.0-dev.tgz and b/install/helm/open-match/charts/open-match-test-0.0.0-dev.tgz differ diff --git a/install/helm/open-match/subcharts/open-match-customize/values.yaml b/install/helm/open-match/subcharts/open-match-customize/values.yaml index 4588bf9b3..3ac2adcc1 100644 --- a/install/helm/open-match/subcharts/open-match-customize/values.yaml +++ b/install/helm/open-match/subcharts/open-match-customize/values.yaml @@ -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: diff --git a/install/helm/open-match/subcharts/open-match-demo/values.yaml b/install/helm/open-match/subcharts/open-match-demo/values.yaml index 6befbb045..0a272288c 100644 --- a/install/helm/open-match/subcharts/open-match-demo/values.yaml +++ b/install/helm/open-match/subcharts/open-match-demo/values.yaml @@ -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 diff --git a/install/helm/open-match/subcharts/open-match-scale/values.yaml b/install/helm/open-match/subcharts/open-match-scale/values.yaml index 3bfdcc9f7..50e3124f0 100644 --- a/install/helm/open-match/subcharts/open-match-scale/values.yaml +++ b/install/helm/open-match/subcharts/open-match-scale/values.yaml @@ -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: diff --git a/install/helm/open-match/subcharts/open-match-telemetry/values.yaml b/install/helm/open-match/subcharts/open-match-telemetry/values.yaml index a020bfedd..ba3f14e9e 100644 --- a/install/helm/open-match/subcharts/open-match-telemetry/values.yaml +++ b/install/helm/open-match/subcharts/open-match-telemetry/values.yaml @@ -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 diff --git a/install/helm/open-match/subcharts/open-match-test/values.yaml b/install/helm/open-match/subcharts/open-match-test/values.yaml index 80048f5ea..f75be5b46 100644 --- a/install/helm/open-match/subcharts/open-match-test/values.yaml +++ b/install/helm/open-match/subcharts/open-match-test/values.yaml @@ -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 diff --git a/install/helm/open-match/templates/om-configmap.yaml b/install/helm/open-match/templates/om-configmap.yaml index e50f09d0a..9a2c6bd94 100644 --- a/install/helm/open-match/templates/om-configmap.yaml +++ b/install/helm/open-match/templates/om-configmap.yaml @@ -74,7 +74,7 @@ data: httpport: "{{ .Values.evaluator.httpPort }}" synchronizer: - enabled: false + enabled: true registrationIntervalMs: 3000ms proposalCollectionIntervalMs: 2000ms diff --git a/install/helm/open-match/values.yaml b/install/helm/open-match/values.yaml index e0f8767ae..970b55c33 100644 --- a/install/helm/open-match/values.yaml +++ b/install/helm/open-match/values.yaml @@ -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 diff --git a/internal/statestore/redis_indices_test.go b/internal/statestore/redis_indices_test.go index 630711278..c9d99dd25 100644 --- a/internal/statestore/redis_indices_test.go +++ b/internal/statestore/redis_indices_test.go @@ -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, @@ -139,7 +139,7 @@ func TestExtractIndexFilters(t *testing.T) { description: "bool false", pool: &pb.Pool{ BoolEqualsFilters: []*pb.BoolEqualsFilter{ - &pb.BoolEqualsFilter{ + { Attribute: "foo", Value: false, }, @@ -157,7 +157,7 @@ func TestExtractIndexFilters(t *testing.T) { description: "bool true", pool: &pb.Pool{ BoolEqualsFilters: []*pb.BoolEqualsFilter{ - &pb.BoolEqualsFilter{ + { Attribute: "foo", Value: true, }, @@ -175,7 +175,7 @@ func TestExtractIndexFilters(t *testing.T) { description: "string equals", pool: &pb.Pool{ StringEqualsFilters: []*pb.StringEqualsFilter{ - &pb.StringEqualsFilter{ + { Attribute: "foo", Value: "bar", }, diff --git a/third_party/swaggerui/config.json b/third_party/swaggerui/config.json index e8fc19010..37d73e0fe 100644 --- a/third_party/swaggerui/config.json +++ b/third_party/swaggerui/config.json @@ -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"} ] } \ No newline at end of file