Skip to content
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

Redis helm chart #1581

Closed
wants to merge 48 commits into from
Closed
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7a7d32d
update helm chart link and version
ashutosji Feb 15, 2023
7e65207
minor change
ashutosji Feb 23, 2023
b61baed
update dependencies
ashutosji Apr 3, 2023
0f5c33c
dependency issue
ashutosji Apr 3, 2023
2d0d73f
removing missing seperator error
ashutosji Apr 3, 2023
97454fe
checking
ashutosji Apr 3, 2023
1eb099d
checking again
ashutosji Apr 3, 2023
a13433f
testing
ashutosji Apr 3, 2023
ef00623
test1
ashutosji Apr 3, 2023
abcdd1b
trying to pass test services
ashutosji Apr 3, 2023
f56651b
testing dependency error
ashutosji Apr 6, 2023
b99fc17
trying to remove error
ashutosji Apr 11, 2023
ae09e45
checking
ashutosji Apr 11, 2023
01b1135
testinggg
ashutosji Apr 11, 2023
75aad8f
add mod tidy to test:services target
joeholley Apr 18, 2023
73c029a
merge in changes from ashutosji:redis-helm-chart
joeholley Apr 18, 2023
210af22
Bump helm version to remove lookup error https://github.com/bitnami/c…
joeholley Jul 4, 2023
b592590
pin to bullseye for testing, package names have changed in bookworm
joeholley Jul 4, 2023
01b002f
update to new redis fullname var scope
joeholley Jul 4, 2023
f6bf9e5
test new gke auth plugin
joeholley Jul 4, 2023
a778ed1
move gke auth plugin install to docker file
joeholley Jul 4, 2023
d85c01e
update timeout for failing installation test
joeholley Jul 5, 2023
24693c7
increase timeout to see if deploy succeeds in CI
joeholley Jul 5, 2023
79c774e
increase timeout to see if deploy succeeds in CI
joeholley Jul 5, 2023
ea8d1ee
Revert " increase timeout to see if deploy succeeds in CI"
joeholley Jul 6, 2023
7d60f75
Revert " increase timeout to see if deploy succeeds in CI"
joeholley Jul 6, 2023
0feac89
Update values for new redis chart; disable sentinel
joeholley Jul 11, 2023
68376e6
Revert "update timeout for failing installation test"
joeholley Jul 12, 2023
63d8569
update template to account for new redis chart and om default configm…
joeholley Jul 24, 2023
2a9a0d2
Remove beta from gcloud command, bump GKE version for ci/cd cluster
joeholley Jul 24, 2023
8ad6d28
Merge Ashtosh's changes and mine
joeholley Jul 24, 2023
24f3df4
typo
joeholley Jul 24, 2023
4d32b8c
Making dockerfile consistent with conventions
joeholley Jul 25, 2023
3bdde81
Tidy-up
joeholley Jul 25, 2023
d327ace
Process of elimination to find out what is introducing the build fail…
joeholley Jul 25, 2023
ce9f279
Noninteractive mode for apt-get
joeholley Jul 25, 2023
5251c37
Re-enable markdown tests via awesomebot, whitelist failing docker hub…
joeholley Jul 26, 2023
1b96882
Overhaul ci dockerfile for readability and to work with debian bookworm
joeholley Jul 26, 2023
a1d783e
Bring Go version up to the one used in dockerfile.ci
joeholley Jul 26, 2023
6151083
Whitespace fix
joeholley Jul 26, 2023
76a275f
Fix for failing md-test build target
joeholley Jul 26, 2023
ca43336
Validating regression of dep downloads
joeholley Jul 26, 2023
08ec17a
https://go.dev/blog/go116-module-changes GO111MODULE is default ON fr…
joeholley Jul 27, 2023
650bcd8
formatting
joeholley Jul 27, 2023
83b3da2
testing
joeholley Jul 27, 2023
74d06d1
somewhat confusing error message
joeholley Jul 27, 2023
ace64d1
testing dependencies
joeholley Jul 27, 2023
232bc97
testing dependencies
joeholley Jul 27, 2023
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: 1 addition & 2 deletions Dockerfile.base-build
Original file line number Diff line number Diff line change
@@ -13,8 +13,7 @@
# limitations under the License.

# When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
FROM golang:1.19.5
ENV GO111MODULE=on
FROM golang:1.20.6

WORKDIR /go/src/open-match.dev/open-match

77 changes: 45 additions & 32 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -11,49 +11,62 @@
# 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.
FROM debian:bookworm

FROM debian
# set env vars
ARG DEBIAN_FRONTEND=noninteractive
ENV OPEN_MATCH_CI_MODE=1
ENV KUBECONFIG=$HOME/.kube/config
ENV GOPATH=/go
ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH

RUN apt-get update
RUN apt-get install -y -qq git make python3 virtualenv curl sudo unzip apt-transport-https ca-certificates curl software-properties-common gnupg2
RUN apt-get update -y \
&& apt-get install -y -qq --no-install-recommends \
apt-utils \
git \
make \
python3 \
virtualenv \
curl \
sudo \
unzip \
apt-transport-https \
ca-certificates \
curl \
software-properties-common \
gnupg2 \
libc6
RUN mkdir -p /usr/share/keyrings/

# Docker
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | sudo apt-key add -
RUN sudo apt-key fingerprint 0EBFCD88
RUN sudo add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/debian \
stretch \
stable"
RUN sudo apt-get update
RUN sudo apt-get install -y -qq docker-ce docker-ce-cli containerd.io
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.gpg] https://download.docker.com/linux/debian bookworm stable" | tee -a /etc/apt/sources.list.d/docker.list \
&& curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker.gpg \
&& apt-get update -y \
&& apt-get install -y -qq \
docker-ce \
docker-ce-cli \
containerd.io

# Cloud SDK
RUN export CLOUD_SDK_REPO="cloud-sdk-stretch" && \
echo "deb http://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
apt-get update -y && apt-get install google-cloud-sdk google-cloud-sdk-app-engine-go -y -qq && \
sudo apt-get update -y && \
sudo apt-get install -y google-cloud-sdk-gke-gcloud-auth-plugin
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list \
&& curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
&& apt-get update -y \
&& apt-get install -y -qq google-cloud-cli

# Install Golang
# https://github.com/docker-library/golang/blob/master/1.14/stretch/Dockerfile
RUN mkdir -p /toolchain/golang
WORKDIR /toolchain/golang
RUN sudo rm -rf /usr/local/go/
RUN rm -rf /usr/local/go/

# When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
RUN curl -L https://golang.org/dl/go1.19.5.linux-amd64.tar.gz | sudo tar -C /usr/local -xz

ENV GOPATH /go
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

RUN sudo mkdir -p "$GOPATH/src" "$GOPATH/bin" \
&& sudo chmod -R 777 "$GOPATH"

# Prepare toolchain and workspace
RUN mkdir -p /toolchain
# reference: https://github.com/docker-library/golang/blob/master/1.20/bookworm/Dockerfile
RUN curl -L https://golang.org/dl/go1.20.6.linux-amd64.tar.gz | tar -C /usr/local -xz
RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" \
&& chmod -R 777 "$GOPATH"

# Prepare toolchain, workspace, homedir
RUN mkdir -p \
/toolchain \
/workspace \
$HOME/.kube/
WORKDIR /workspace
ENV OPEN_MATCH_CI_MODE=1
ENV KUBECONFIG=$HOME/.kube/config
RUN mkdir -p $HOME/.kube/
36 changes: 18 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
@@ -62,8 +62,8 @@ YEAR_MONTH = $(shell date -u +'%Y%m')
YEAR_MONTH_DAY = $(shell date -u +'%Y%m%d')
MAJOR_MINOR_VERSION = $(shell echo $(BASE_VERSION) | cut -d '.' -f1).$(shell echo $(BASE_VERSION) | cut -d '.' -f2)
PROTOC_VERSION = 3.19.4
HELM_VERSION = 3.8.0
KUBECTL_VERSION = 1.21.5
HELM_VERSION = 3.12.1
KUBECTL_VERSION = 1.27.3
MINIKUBE_VERSION = latest
GOLANGCI_VERSION = 1.18.0
KIND_VERSION = 0.5.1
@@ -77,7 +77,7 @@ CHART_TESTING_VERSION = 2.4.0
REDIS_DEV_PASSWORD = helloworld

ENABLE_SECURITY_HARDENING = 0
GO = GO111MODULE=on go
GO = go
# Defines the absolute local directory of the open-match project
REPOSITORY_ROOT := $(patsubst %/,%,$(dir $(abspath $(MAKEFILE_LIST))))
BUILD_DIR = $(REPOSITORY_ROOT)/build
@@ -100,7 +100,6 @@ GCP_ZONE = us-west1-a
GCP_LOCATION = $(GCP_ZONE)
EXE_EXTENSION =
GCP_LOCATION_FLAG = --zone $(GCP_ZONE)
GO111MODULE = on
GOLANG_TEST_COUNT = 1
SWAGGERUI_PORT = 51500
PROMETHEUS_PORT = 9090
@@ -229,10 +228,10 @@ build-images: $(foreach IMAGE,$(IMAGES),build-$(IMAGE)-image)
# Include all-protos here so that all dependencies are guaranteed to be downloaded after the base image is created.
# This is important so that the repository does not have any mutations while building individual images.
build-base-build-image: docker $(ALL_PROTOS)
DOCKER_BUILDKIT=1 docker build -f Dockerfile.base-build -t open-match-base-build -t $(REGISTRY)/openmatch-base-build:$(TAG) -t $(REGISTRY)/openmatch-base-build:$(ALTERNATE_TAG) .
docker build -f Dockerfile.base-build -t open-match-base-build -t $(REGISTRY)/openmatch-base-build:$(TAG) -t $(REGISTRY)/openmatch-base-build:$(ALTERNATE_TAG) .

$(foreach CMD,$(CMDS),build-$(CMD)-image): build-%-image: docker build-base-build-image
DOCKER_BUILDKIT=1 docker build \
docker build \
-f Dockerfile.cmd \
$(IMAGE_BUILD_ARGS) \
--build-arg=IMAGE_TITLE=$* \
@@ -241,10 +240,10 @@ $(foreach CMD,$(CMDS),build-$(CMD)-image): build-%-image: docker build-base-buil
.

build-mmf-go-soloduel-image: docker build-base-build-image
DOCKER_BUILDKIT=1 docker build -f examples/functions/golang/soloduel/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(ALTERNATE_TAG) .
docker build -f examples/functions/golang/soloduel/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(ALTERNATE_TAG) .

build-mmf-go-backfill-image: docker build-base-build-image
DOCKER_BUILDKIT=1 docker build -f examples/functions/golang/backfill/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-backfill:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-backfill:$(ALTERNATE_TAG) .
docker build -f examples/functions/golang/backfill/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-backfill:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-backfill:$(ALTERNATE_TAG) .

#######################################
## # Builds and pushes images to your container registry.
@@ -293,7 +292,7 @@ $(foreach IMAGE,$(IMAGES),clean-$(IMAGE)-image): clean-%-image:

#####################################################################################################################
update-chart-deps: build/toolchain/bin/helm$(EXE_EXTENSION)
(cd $(REPOSITORY_ROOT)/install/helm/open-match; $(HELM) repo add incubator https://charts.helm.sh/incubator; $(HELM) repo add bitnami-full-index https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami;$(HELM) dependency update)
(cd $(REPOSITORY_ROOT)/install/helm/open-match; $(HELM) repo add incubator https://charts.helm.sh/incubator; $(HELM) repo add bitnami https://charts.bitnami.com/bitnami;$(HELM) dependency update)

lint-chart: build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/ct$(EXE_EXTENSION)
(cd $(REPOSITORY_ROOT)/install/helm; $(HELM) lint $(OPEN_MATCH_HELM_NAME))
@@ -640,12 +639,11 @@ delete-kind-cluster: build/toolchain/bin/kind$(EXE_EXTENSION) build/toolchain/bi
create-cluster-role-binding:
$(KUBECTL) create clusterrolebinding myname-cluster-admin-binding --clusterrole=cluster-admin --user=$(GCLOUD_ACCOUNT_EMAIL)

create-gke-cluster: GKE_VERSION = 1.25.5-gke.2000 # gcloud beta container get-server-config --zone us-west1-a
create-gke-cluster: GKE_CLUSTER_SHAPE_FLAGS = --machine-type n1-standard-8 --enable-autoscaling --min-nodes 1 --num-nodes 6 --max-nodes 10 --disk-size 50
create-gke-cluster: GKE_FUTURE_COMPAT_FLAGS = --no-enable-basic-auth --no-issue-client-certificate --enable-ip-alias --metadata disable-legacy-endpoints=true --enable-autoupgrade
create-gke-cluster: build/toolchain/bin/kubectl$(EXE_EXTENSION) gcloud
$(GCLOUD) $(GCP_PROJECT_FLAG) container clusters create $(GKE_CLUSTER_NAME) $(GCP_LOCATION_FLAG) $(GKE_CLUSTER_SHAPE_FLAGS) $(GKE_FUTURE_COMPAT_FLAGS) $(GKE_CLUSTER_FLAGS) \
--cluster-version $(GKE_VERSION) \
$(GCLOUD) $(GCP_PROJECT_FLAG) container clusters create $(GKE_CLUSTER_NAME) $(GCP_LOCATION_FLAG) $(GKE_CLUSTER_SHAPE_FLAGS) $(GKE_FUTURE_COMPAT_FLAGS) $(GKE_CLUSTER_FLAGS) \
--cluster-version 1.27.2-gke.2100 \
--image-type cos_containerd \
--tags open-match \
--workload-pool $(GCP_PROJECT_ID).svc.id.goog
@@ -655,7 +653,7 @@ delete-gke-cluster: gcloud
-$(GCLOUD) $(GCP_PROJECT_FLAG) container clusters delete $(GKE_CLUSTER_NAME) $(GCP_LOCATION_FLAG) $(GCLOUD_EXTRA_FLAGS)

create-mini-cluster: build/toolchain/bin/minikube$(EXE_EXTENSION)
$(MINIKUBE) start -p openmatch --memory 6144 --cpus 4 --disk-size 50g --kubernetes-version=v1.21.5
$(MINIKUBE) start -p openmatch --memory 6144 --cpus 4 --disk-size 50g --kubernetes-version=v1.27.3

delete-mini-cluster: build/toolchain/bin/minikube$(EXE_EXTENSION)
-$(MINIKUBE) delete -p openmatch
@@ -741,8 +739,9 @@ build: assets
define test_folder
$(if $(wildcard $(1)/go.mod), \
cd $(1) && \
$(GO) test -p 1 -cover -test.count $(GOLANG_TEST_COUNT) -race ./... && \
$(GO) test -p 1 -cover -test.count $(GOLANG_TEST_COUNT) -run IgnoreRace$$ ./... \
$(GO) mod tidy && \
$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -race ./... && \
$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -run IgnoreRace$$ ./... \
)
$(foreach dir, $(wildcard $(1)/*/.), $(call test_folder, $(dir)))
endef
@@ -778,7 +777,7 @@ vet:
$(GO) vet ./...

golangci: build/toolchain/bin/golangci-lint$(EXE_EXTENSION)
GO111MODULE=on $(GOLANGCI) run --config=$(REPOSITORY_ROOT)/.golangci.yaml
$(GOLANGCI) run --config=$(REPOSITORY_ROOT)/.golangci.yaml

## # Run linter on Go code, charts and terraform
## make lint
@@ -797,7 +796,7 @@ $(foreach CMD,$(CMDS),build/cmd/$(CMD)): build/cmd/%: build/cmd/%/BUILD_PHONY bu

build/cmd/%/BUILD_PHONY:
mkdir -p $(BUILD_DIR)/cmd/$*
CGO_ENABLED=0 $(GO) build -v -installsuffix cgo -o $(BUILD_DIR)/cmd/$*/run open-match.dev/open-match/cmd/$*
CGO_ENABLED=0 $(GO) build -a -v -installsuffix cgo -o $(BUILD_DIR)/cmd/$*/run open-match.dev/open-match/cmd/$*

# Default is that nothing needs to be copied into the direcotry
build/cmd/%/COPY_PHONY:
@@ -1025,7 +1024,8 @@ third_party/swaggerui/:

sync-deps:
$(GO) clean -modcache
$(GO) mod download
$(GO) mod tidy
$(GO) mod download -x

define tutorial_folder
$(if $(wildcard $(1)/go.mod), \
26 changes: 19 additions & 7 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -48,19 +48,27 @@

steps:
- id: 'Docker Image: open-match-build'
name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/$PROJECT_ID/open-match-build', '-f', 'Dockerfile.ci', '.']
name: gcr.io/kaniko-project/executor:latest
args: [
"--destination=gcr.io/$PROJECT_ID/open-match-build",
"--dockerfile=Dockerfile.ci",
"--cache=true",
"--cache-ttl=3600h",
]
waitFor: ['-']
#name: gcr.io/cloud-builders/docker
#args: ['build', '-t', 'gcr.io/$PROJECT_ID/open-match-build', '-f', 'Dockerfile.ci', '.']
#waitFor: ['-']

- id: 'Build: Clean'
name: 'gcr.io/$PROJECT_ID/open-match-build'
args: ['make', 'clean-third-party', 'clean-protos', 'clean-swagger-docs']
waitFor: ['Docker Image: open-match-build']

# - id: 'Test: Markdown'
# name: 'gcr.io/$PROJECT_ID/open-match-build'
# args: ['make', 'md-test']
# waitFor: ['Build: Clean']
- id: 'Test: Markdown'
name: 'gcr.io/$PROJECT_ID/open-match-build'
args: ['make', 'md-test']
waitFor: ['Build: Clean']

- id: 'Setup: Download Dependencies'
name: 'gcr.io/$PROJECT_ID/open-match-build'
@@ -69,6 +77,7 @@ steps:
- name: 'go-vol'
path: '/go'
waitFor: ['Build: Clean']
#waitFor: ['Build: Initialize Toolchain']

- id: 'Build: Initialize Toolchain'
name: 'gcr.io/$PROJECT_ID/open-match-build'
@@ -77,6 +86,9 @@ steps:
- name: 'go-vol'
path: '/go'
waitFor: ['Setup: Download Dependencies']
#waitFor: ['Build: Clean']



- id: 'Test: Terraform Configuration'
name: 'gcr.io/$PROJECT_ID/open-match-build'
@@ -98,7 +110,7 @@ steps:

- id: 'Build: Binaries'
name: 'gcr.io/$PROJECT_ID/open-match-build'
args: ['make', 'GOPROXY=off', 'build', 'all', '-j12']
args: ['make', '_CHARTS_BUCKET=${_CHARTS_BUCKET}', 'GOPROXY=off', 'build', 'all', '-j12']
volumes:
- name: 'go-vol'
path: '/go'
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ module open-match.dev/open-match
// limitations under the License.

// When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
go 1.19
go 1.20

require (
contrib.go.opencensus.io/exporter/jaeger v0.2.1
4 changes: 2 additions & 2 deletions install/helm/open-match/Chart.yaml
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ version: 0.0.0-dev
name: open-match
dependencies:
- name: redis
version: 16.3.1
repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
version: 17.7.3
repository: https://charts.bitnami.com/bitnami
condition: open-match-core.redis.enabled
- name: open-match-telemetry
version: 0.0.0-dev
4 changes: 2 additions & 2 deletions install/helm/open-match/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@ resources:
{{- if .Values.redis.auth.enabled }}
- name: redis-password
secret:
secretName: {{ include "call-nested" (list . "redis" "redis.fullname") }}
secretName: {{ include "call-nested" (list . "redis" "common.names.fullname") }}
{{- end -}}
{{- end -}}

@@ -240,7 +240,7 @@ http://{{ include "call-nested" (list . "open-match-telemetry.jaeger" "jaeger.co

{{/*
Call templates from sub-charts in a synthesized context, workaround for https://github.com/helm/helm/issues/3920
Mainly useful for things like `{{ include "call-nested" (list . "redis" "redis.fullname") }}`
Mainly useful for things like `{{ include "call-nested" (list . "redis" "common.names.fullname") }}`
https://github.com/helm/helm/issues/4535#issuecomment-416022809
https://github.com/helm/helm/issues/4535#issuecomment-477778391
*/}}
14 changes: 13 additions & 1 deletion install/helm/open-match/templates/om-configmap-default.yaml
Original file line number Diff line number Diff line change
@@ -95,12 +95,24 @@ data:
sentinelPort: {{ .Values.redis.sentinel.port }}
sentinelMaster: {{ .Values.redis.sentinel.masterSet }}
sentinelHostname: {{ include "call-nested" (list . "redis" "common.names.fullname") }}
sentinelUsePassword: {{ .Values.redis.auth.sentinel }}
sentinelUsePassword: {{ .Values.redis.sentinel.usePassword }}
{{- else}}
# Open Match's default Redis setups
hostname: {{ include "call-nested" (list . "redis" "common.names.fullname") }}-master.{{ .Release.Namespace }}.svc.cluster.local
{{- if .Values.redis.redisPort }}
# source value: redis.redisPort = {{ .Values.redis.redisPort }}
port: {{ .Values.redis.redisPort }}
{{- else if index .Values "open-match-core" "redis" "port" }}
# source value: open-match-core.redis.port = {{ index .Values "open-match-core" "redis" "port"}}
port: {{ index .Values "open-match-core" "redis" "port" }}
{{- end }}
{{- if .Values.redis.user }}
# source value: redis.user = {{ .Values.redis.user }}
user: {{ .Values.redis.user }}
{{- else if index .Values "open-match-core" "redis" "user" }}
# source value: open-match-core.redis.user = {{ index .Values "open-match-core" "redis" "user"}}
user: {{ index .Values "open-match-core" "redis" "user"}}
{{- end }}
{{- end}}
{{- else }}
# BYO Redis setups
23 changes: 1 addition & 22 deletions install/helm/open-match/values-production.yaml
Original file line number Diff line number Diff line change
@@ -106,19 +106,12 @@ configs:
# https://hub.helm.sh/charts/stable/redis
# https://github.com/helm/charts/tree/master/stable/redis
redis:
redisPort: 6379
architecture: standalone
auth:
enabled: false
sentinel: false
usePasswordFiles: false
secretMountPath: /opt/bitnami/redis/secrets
configmap: |
maxclients 100000
maxmemory 500000000
sentinel:
enabled: true
masterSet: om-redis-master
port: 26379
master:
disableCommands: [] # don't disable 'FLUSH-' commands
resources:
@@ -132,20 +125,6 @@ redis:
enabled: false
metrics:
enabled: true
serviceAccount:
create: true
replica:
disableCommands: [] # don't disable 'FLUSH-' commands
replicaCount: 3
persistence:
enabled: false
resources:
requests:
memory: 1Gi
cpu: 1
limits:
memory: 2Gi
cpu: 2
sysctlImage:
# Enable this setting in production if you are running Open Match under Linux environment
enabled: true
Loading