Skip to content

merge master into jonfoust/master #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# If you want information on how to edit this file checkout,
# http://makefiletutorial.com/

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

Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ steps:
path: '/go'

substitutions:
_OM_VERSION: "1.0.0"
_OM_VERSION: "1.1.0"
_GCB_POST_SUBMIT: "0"
_GCB_LATEST_VERSION: "undefined"
logsBucket: 'gs://open-match-site-build-logs/'
Expand Down
2 changes: 1 addition & 1 deletion site/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ github_docs_repo = "https://github.com/googleforgames/open-match-docs"
gcs_engine_id = "008748710159674449076:sqoelpnrdoe"

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

# User interface configuration
Expand Down
4 changes: 2 additions & 2 deletions site/content/en/docs/Guides/Production/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,5 @@ Open Match project provides a recommended helm config file for production setups
helm install my-release -n open-match open-match/open-match -f values-production.yaml
```

## Use Enovy or other load balancing solution if you plan to connect to Open Match via an out-of-cluster client
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.
## Use Envoy or other load balancing solution if you plan to connect to Open Match via an out-of-cluster client
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.
76 changes: 40 additions & 36 deletions site/content/en/docs/Installation/helm.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,42 +80,46 @@ The following tables lists the configurable parameters of the Open Match chart a

| Parameter | Description | Default |
| --------------------------------------------------- | ----------------------------------------------------------------------------------------------- | ---------------------- |
| `query.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the QueryService | `ClusterIP` |
| `query.replicas` | Defines the number of pod replicas for QueryService's Kubernetes deployment | `3` |
| `frontend.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the FrontendService | `ClusterIP` | |
| `frontend.replicas` | Defines the number of pod replicas for FrontendService's Kubernetes deployment | `3` |
| `backend.portType` | Defines Kubernetes [ServiceTypes](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) for the BackendService | `ClusterIP` | |
| `backend.replicas` | Defines the number of pod replicas for BackendService's Kubernetes deployment | `3` |
| `image.pullPolicy` | Global `imagePullPolicy` for all Open Match service deployments | `Always` |
| `image.tag` | Global Docker image tag for all Open Match service deployments | `{{< param release_version >}}` |
| `open-match-core.enabled` | Turn on/off the installation of Open Match core services | `true` |
| `open-match-override.enabled` | Turn on/off the installation of `om-override-configmap` | `false` |
| `open-match-telemetry.enabled` | Turn on/off the installation of Open Match telemetry services | `false` |
| `open-match-scale.enabled` | Turn on/off the installation of Open Match scale testing setups | `false` |
| `global.kubernetes.serviceAccount` | Service account name for the Open Match core services | `open-match-unprivileged-service` |
| `global.kubernetes.service.portType` | Overrides the ServiceTypes for all Open Match core services | `` |
| `global.gcpProjectId` | Overrides the default gcp project id for use with stackdriver | `replace_with_your_project_id` |
| `global.tls.enabled` | Turn on/off TLS encryption for all Open Match traffics | `false` |
| `global.tls.server.mountPath` | The VolumeMount path for TLS server | `/app/secrets/tls/server` |
| `global.tls.rootca.mountPath` | The VolumeMount path for TLS CA | `/app/secrets/tls/rootca` |
| `global.logging.rpc.enabled` | Turn on/off RPC payload logging for all Open Match core services | `false` |
| `global.telemetry.zpages.enabled` | Turn on/off Open Match zPages instrument. | `true` |
| `global.telemetry.jaeger.enabled` | Turn on/off Open Match Jaeger exporter. Also install Jaeger if `open-match-telemetry.enabled` is set to true | `false` |
| `global.telemetry.jaeger.samplerFraction` | Configure a sampler that samples a given fraction of traces | `1` |
| `global.telemetry.jaeger.agentEndpoint` | AgentEndpoint instructs exporter to send spans to jaeger-agent at this address | `open-match-jaeger-agent:6831` |
| `global.telemetry.jaeger.collectorEndpoint` | CollectorEndpoint is the full url to the Jaeger HTTP Thrift collector | `open-match-jaeger-collector:14268/api/traces` |
| `global.telemetry.prometheus.enabled` | Turn on/off Open Match Prometheus exporter. Also install Prometheus if `open-match-telemetry.enabled` is set to true | `false` |
| `global.telemetry.prometheus.endpoint` | Bind the Prometheus exporters to the specified endpoint handler, also configures the `prometheus.io/path` k8s scraping annotations | `/metrics` |
| `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` |
| `global.telemetry.stackdriverMetrics.enabled` | Turn on/off Open Match Stackdriver Metrics exporter. | `false` |
| `global.telemetry.stackdriverMetrics.prefix` | MetricPrefix overrides the prefix of a Stackdriver metric display names to help you better identifies your metrics | `open_match` |
| `global.telemetry.grafana.enabled` | Turn on/off Open Match Grafana exporter. Also install Grafana if `open-match-telemetry.enabled` is set to true | `false` |
| `global.telemetry.reportingPeriod` | Overrides the reporting periods of Open Match telemetry exporters | `1m` |
| `open-match-telemetry.grafana` | Inherits the values from [Grafana helm chart](https://github.com/helm/charts/tree/master/stable/grafana) | |
| `open-match-telemetry.jaeger` | Inherits the values from [Jaeger helm chart](https://github.com/helm/charts/tree/master/incubator/jaeger) | |
| `open-match-telemetry.prometheus` | Inherits the values from [Prometheus helm chart](https://github.com/helm/charts/tree/master/stable/prometheus) | |
| `redis` | Inherits the values from [Redis helm chart](https://github.com/helm/charts/tree/master/stable/redis) | |

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

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