Skip to content

Commit b00f71b

Browse files
syntxerrorsyntxerror
authored
Merge pull request #2 from googleforgames/master
merge master into jonfoust/master
2 parents 9da32a8 + eb85b98 commit b00f71b

File tree

8 files changed

+246
-58
lines changed

8 files changed

+246
-58
lines changed

‎Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# If you want information on how to edit this file checkout,
2525
# http://makefiletutorial.com/
2626

27-
BASE_VERSION = 1.0.0
27+
BASE_VERSION = 1.1.0
2828
SHORT_SHA = $(shell git rev-parse --short=7 HEAD | tr -d [:punct:])
2929
VERSION_SUFFIX = $(SHORT_SHA)
3030
BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD | tr -d [:punct:])
@@ -204,6 +204,7 @@ node_modules/: build/toolchain/nodejs/
204204
-rm -r $(REPOSITORY_ROOT)/package.json $(REPOSITORY_ROOT)/package-lock.json
205205
-rm -rf $(REPOSITORY_ROOT)/node_modules/
206206
echo "{}" > $(REPOSITORY_ROOT)/package.json
207+
$(NODEJS_BIN)/npm install postcss-scss
207208
$(NODEJS_BIN)/npm install postcss-cli autoprefixer
208209
$(TOOLCHAIN_DIR)/nodejs/bin/npm install postcss-cli autoprefixer
209210

‎cloudbuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ steps:
113113
path: '/go'
114114

115115
substitutions:
116-
_OM_VERSION: "1.0.0"
116+
_OM_VERSION: "1.1.0"
117117
_GCB_POST_SUBMIT: "0"
118118
_GCB_LATEST_VERSION: "undefined"
119119
logsBucket: 'gs://open-match-site-build-logs/'

‎site/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ github_docs_repo = "https://github.com/googleforgames/open-match-docs"
7474
gcs_engine_id = "008748710159674449076:sqoelpnrdoe"
7575

7676
release_branch = "master"
77-
release_version = "1.0.0"
77+
release_version = "1.1.0"
7878
slack_link = "https://join.slack.com/t/open-match/shared_invite/enQtNDM1NjcxNTY4MTgzLTM5ZWQxNjc1YWI3MzJmN2RiMWJmYWI0ZjFiNzNkZmNkMWQ3YWU5OGVkNzA5Yzc4OGVkOGU5MTc0OTA5ZTA5NDU"
7979

8080
# User interface configuration

‎site/content/en/docs/Guides/Production/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ Open Match project provides a recommended helm config file for production setups
9090
helm install my-release -n open-match open-match/open-match -f values-production.yaml
9191
```
9292

93-
## Use Enovy or other load balancing solution if you plan to connect to Open Match via an out-of-cluster client
94-
The above load balancing solution is sufficient if you have both the client and the server deployment within the same cluster. However, some game architectures may requires connecting to Open Match services from an out-of-cluster client. We recommend [Envoy](https://www.envoyproxy.io/) as a solution. Alternatives like Kubernetes Ingress or platform specific L7 Load Balancer can also work.
93+
## Use Envoy or other load balancing solution if you plan to connect to Open Match via an out-of-cluster client
94+
The above load balancing solution is sufficient if you have both the client and the server deployment within the same cluster. However, some game architectures may require connecting to Open Match services from an out-of-cluster client. We recommend [Envoy](https://www.envoyproxy.io/) as a solution. Alternatives like Kubernetes Ingress or platform specific L7 Load Balancer can also work.

‎site/content/en/docs/Installation/helm.md

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -80,42 +80,46 @@ The following tables lists the configurable parameters of the Open Match chart a
8080

8181
| Parameter | Description | Default |
8282
| --------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ---------------------- |
83-
| `query.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the QueryService | `ClusterIP` |
84-
| `query.replicas` | Defines the number of pod replicas for QueryService's Kubernetes deployment | `3` |
85-
| `frontend.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the FrontendService | `ClusterIP` | |
86-
| `frontend.replicas` | Defines the number of pod replicas for FrontendService's Kubernetes deployment | `3` |
87-
| `backend.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the BackendService | `ClusterIP` | |
88-
| `backend.replicas` | Defines the number of pod replicas for BackendService's Kubernetes deployment | `3` |
89-
| `image.pullPolicy` | Global `imagePullPolicy` for all Open Match service deployments | `Always` |
90-
| `image.tag` | Global Docker image tag for all Open Match service deployments | `{{< param release_version >}}` |
91-
| `open-match-core.enabled` | Turn on/off the installation of Open Match core services | `true` |
92-
| `open-match-override.enabled` | Turn on/off the installation of `om-override-configmap` | `false` |
93-
| `open-match-telemetry.enabled` | Turn on/off the installation of Open Match telemetry services | `false` |
94-
| `open-match-scale.enabled` | Turn on/off the installation of Open Match scale testing setups | `false` |
95-
| `global.kubernetes.serviceAccount` | Service account name for the Open Match core services | `open-match-unprivileged-service` |
96-
| `global.kubernetes.service.portType` | Overrides the ServiceTypes for all Open Match core services | `` |
97-
| `global.gcpProjectId` | Overrides the default gcp project id for use with stackdriver | `replace_with_your_project_id` |
98-
| `global.tls.enabled` | Turn on/off TLS encryption for all Open Match traffics | `false` |
99-
| `global.tls.server.mountPath` | The VolumeMount path for TLS server | `/app/secrets/tls/server` |
100-
| `global.tls.rootca.mountPath` | The VolumeMount path for TLS CA | `/app/secrets/tls/rootca` |
101-
| `global.logging.rpc.enabled` | Turn on/off RPC payload logging for all Open Match core services | `false` |
102-
| `global.telemetry.zpages.enabled` | Turn on/off Open Match zPages instrument. | `true` |
103-
| `global.telemetry.jaeger.enabled` | Turn on/off Open Match Jaeger exporter. Also install Jaeger if `open-match-telemetry.enabled` is set to true | `false` |
104-
| `global.telemetry.jaeger.samplerFraction` | Configure a sampler that samples a given fraction of traces | `1` |
105-
| `global.telemetry.jaeger.agentEndpoint` | AgentEndpoint instructs exporter to send spans to jaeger-agent at this address | `open-match-jaeger-agent:6831` |
106-
| `global.telemetry.jaeger.collectorEndpoint` | CollectorEndpoint is the full url to the Jaeger HTTP Thrift collector | `open-match-jaeger-collector:14268/api/traces` |
107-
| `global.telemetry.prometheus.enabled` | Turn on/off Open Match Prometheus exporter. Also install Prometheus if `open-match-telemetry.enabled` is set to true | `false` |
108-
| `global.telemetry.prometheus.endpoint` | Bind the Prometheus exporters to the specified endpoint handler, also configures the `prometheus.io/path` k8s scraping annotations | `/metrics` |
109-
| `global.telemetry.prometheus.serviceDiscovery` | If Prometheus is enabled and `serviceDiscover: true`, add the Prometheus scraping annotations to each Pod of the Open Match core services | `true` |
110-
| `global.telemetry.stackdriverMetrics.enabled` | Turn on/off Open Match Stackdriver Metrics exporter. | `false` |
111-
| `global.telemetry.stackdriverMetrics.prefix` | MetricPrefix overrides the prefix of a Stackdriver metric display names to help you better identifies your metrics | `open_match` |
112-
| `global.telemetry.grafana.enabled` | Turn on/off Open Match Grafana exporter. Also install Grafana if `open-match-telemetry.enabled` is set to true | `false` |
113-
| `global.telemetry.reportingPeriod` | Overrides the reporting periods of Open Match telemetry exporters | `1m` |
114-
| `open-match-telemetry.grafana` | Inherits the values from [Grafana helm chart](https://github.com/helm/charts/tree/master/stable/grafana) | |
115-
| `open-match-telemetry.jaeger` | Inherits the values from [Jaeger helm chart](https://github.com/helm/charts/tree/master/incubator/jaeger) | |
116-
| `open-match-telemetry.prometheus` | Inherits the values from [Prometheus helm chart](https://github.com/helm/charts/tree/master/stable/prometheus) | |
117-
| `redis` | Inherits the values from [Redis helm chart](https://github.com/helm/charts/tree/master/stable/redis) | |
118-
83+
| `query.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the QueryService | `ClusterIP` |
84+
| `query.replicas` | Defines the number of pod replicas for QueryService's Kubernetes deployment | `3` |
85+
| `frontend.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the FrontendService | `ClusterIP` |
86+
| `frontend.replicas` | Defines the number of pod replicas for FrontendService's Kubernetes deployment | `3` |
87+
| `backend.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the BackendService | `ClusterIP` |
88+
| `backend.replicas` | Defines the number of pod replicas for BackendService's Kubernetes deployment | `3` |
89+
| `image.pullPolicy` | Global `imagePullPolicy` for all Open Match service deployments | `Always` |
90+
| `image.tag` | Global Docker image tag for all Open Match service deployments | `{{< param release_version >}}` |
91+
| `open-match-core.enabled` | Turn on/off the installation of Open Match core services | `true` |
92+
| `open-match-core.registrationInterval` | Duration of registration window for evaluation/synchronization cycle. | `250ms` |
93+
| `open-match-core.proposalCollectionInterval` | Length of time after match function has started before it will be canceled. | `20s` |
94+
| `open-match-core.pendingReleaseTimeout` | Defines the time before a ticket returns to the pool after it was fetched. | `1m` |
95+
| `open-match-core.assignedDeleteTimeout` | Time after a ticket has been assigned before it is automatically deleted. | `10m` |
96+
| `open-match-core.queryPageSize` | Maximum number of tickets to return on a single QueryTicketsResponse. | `10000` |
97+
| `open-match-override.enabled` | Turn on/off the installation of `om-override-configmap` | `false` |
98+
| `open-match-telemetry.enabled` | Turn on/off the installation of Open Match telemetry services | `false` |
99+
| `open-match-scale.enabled` | Turn on/off the installation of Open Match scale testing setups | `false` |
100+
| `global.kubernetes.serviceAccount` | Service account name for the Open Match core services | `open-match-unprivileged-service` |
101+
| `global.kubernetes.service.portType` | Overrides the ServiceTypes for all Open Match core services | `` |
102+
| `global.gcpProjectId` | Overrides the default gcp project id for use with stackdriver | `replace_with_your_project_id` |
103+
| `global.tls.enabled` | Turn on/off TLS encryption for all Open Match traffics | `false` |
104+
| `global.tls.server.mountPath` | The VolumeMount path for TLS server | `/app/secrets/tls/server` |
105+
| `global.tls.rootca.mountPath` | The VolumeMount path for TLS CA | `/app/secrets/tls/rootca` |
106+
| `global.logging.rpc.enabled` | Turn on/off RPC payload logging for all Open Match core services | `false` |
107+
| `global.telemetry.zpages.enabled` | Turn on/off Open Match zPages instrument. | `true` |
108+
| `global.telemetry.jaeger.enabled` | Turn on/off Open Match Jaeger exporter. Also install Jaeger if `open-match-telemetry.enabled` is set to true | `false` |
109+
| `global.telemetry.jaeger.samplerFraction` | Configure a sampler that samples a given fraction of traces | `1` |
110+
| `global.telemetry.jaeger.agentEndpoint` | AgentEndpoint instructs exporter to send spans to jaeger-agent at this address | `open-match-jaeger-agent:6831` |
111+
| `global.telemetry.jaeger.collectorEndpoint` | CollectorEndpoint is the full url to the Jaeger HTTP Thrift collector | `open-match-jaeger-collector:14268/api/traces` |
112+
| `global.telemetry.prometheus.enabled` | Turn on/off Open Match Prometheus exporter. Also install Prometheus if `open-match-telemetry.enabled` is set to true | `false` |
113+
| `global.telemetry.prometheus.endpoint` | Bind the Prometheus exporters to the specified endpoint handler, also configures the `prometheus.io/path` k8s scraping annotations | `/metrics` |
114+
| `global.telemetry.prometheus.serviceDiscovery` | If Prometheus is enabled and `serviceDiscover: true`, add the Prometheus scraping annotations to each Pod of the Open Match core services | `true` |
115+
| `global.telemetry.stackdriverMetrics.enabled` | Turn on/off Open Match Stackdriver Metrics exporter. | `false` |
116+
| `global.telemetry.stackdriverMetrics.prefix` | MetricPrefix overrides the prefix of a Stackdriver metric display names to help you better identifies your metrics | `open_match` |
117+
| `global.telemetry.grafana.enabled` | Turn on/off Open Match Grafana exporter. Also install Grafana if `open-match-telemetry.enabled` is set to true | `false` |
118+
| `global.telemetry.reportingPeriod` | Overrides the reporting periods of Open Match telemetry exporters | `1m` |
119+
| `open-match-telemetry.grafana` | Inherits the values from [Grafana helm chart](https://github.com/helm/charts/tree/master/stable/grafana) | |
120+
| `open-match-telemetry.jaeger` | Inherits the values from [Jaeger helm chart](https://github.com/helm/charts/tree/master/incubator/jaeger) | |
121+
| `open-match-telemetry.prometheus` | Inherits the values from [Prometheus helm chart](https://github.com/helm/charts/tree/master/stable/prometheus) | |
122+
| `redis` | Inherits the values from [Redis helm chart](https://github.com/helm/charts/tree/master/stable/redis) | |
119123
## What's Next
120124

121125
Follow the [Getting Started]({{< ref "/docs/Getting Started" >}}) guide to see Open Match in action.

0 commit comments

Comments
 (0)