Removed scale chart configmap (#1120)

install/helm/open-match/subcharts/open-match-scale/templates/scale-configmap.yaml

@@ -1,108 +0,0 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: scale-configmap
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    component: config
-    release: {{ .Release.Name }}
-data:
-  matchmaker_config_default.yaml: |-
-    api:
-      backend:
-        hostname: "{{ .Values.backend.hostName }}"
-        grpcport: "{{ .Values.backend.grpcPort }}"
-        httpport: "{{ .Values.backend.httpPort }}"
-      frontend:
-        hostname: "{{ .Values.frontend.hostName }}"
-        grpcport: "{{ .Values.frontend.grpcPort }}"
-        httpport: "{{ .Values.frontend.httpPort }}"
-      scale:
-        httpport: "51509"
-{{- if .Values.global.tls.enabled }}
-      tls:
-        trustedCertificatePath: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
-        certificatefile: "{{.Values.global.tls.server.mountPath}}/public.cert"
-        privatekey: "{{.Values.global.tls.server.mountPath}}/private.key"
-        rootcertificatefile: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
-{{- end }}
-
-    logging:
-      level: debug
-      {{- if .Values.global.telemetry.stackdriverMetrics.enabled }}
-      format: stackdriver
-      {{- else }}
-      format: text
-      {{- end }}
-      rpc: {{ .Values.global.logging.rpc.enabled }}
-    # Open Match applies the exponential backoff strategy for its retryable gRPC calls.
-    # The settings below are the default backoff configuration used in Open Match.
-    # See https://github.com/cenkalti/backoff/blob/v3/exponential.go for detailed explanations
-    backoff:
-      # The initial retry interval (in milliseconds)
-      initialInterval: 100ms
-      # maxInterval caps the maximum time elapsed for a retry interval
-      maxInterval: 500ms
-      # The next retry interval is multiplied by this multiplier
-      multiplier: 1.5
-      # Randomize the retry interval
-      randFactor: 0.5
-      # maxElapsedTime caps the retry time (in milliseconds)
-      maxElapsedTime: 3000ms
-
-    telemetry:
-      zpages:
-        enable: "{{ .Values.global.telemetry.zpages.enabled }}"
-      jaeger:
-        enable: "{{ .Values.global.telemetry.jaeger.enabled }}"
-        samplerFraction: {{ .Values.global.telemetry.jaeger.samplerFraction }}
-        agentEndpoint: "{{ .Values.global.telemetry.jaeger.agentEndpoint }}"
-        collectorEndpoint: "{{ .Values.global.telemetry.jaeger.collectorEndpoint }}"
-      prometheus:
-        enable: "{{ .Values.global.telemetry.prometheus.enabled }}"
-        endpoint: "{{ .Values.global.telemetry.prometheus.endpoint }}"
-        serviceDiscovery: "{{ .Values.global.telemetry.prometheus.serviceDiscovery }}"
-      stackdriverMetrics:
-        enable: "{{ .Values.global.telemetry.stackdriverMetrics.enabled }}"
-        gcpProjectId: "{{ .Values.global.gcpProjectId }}"
-        prefix: "{{ .Values.global.telemetry.stackdriverMetrics.prefix }}"
-      reportingPeriod: "{{ .Values.global.telemetry.reportingPeriod }}"
-
-  matchmaker_config_override.yaml: |-
-    testConfig:
-      profile: "{{ .Values.testConfig.profile }}"
-      regions:
-      {{- range .Values.testConfig.regions }}
-        - {{ . }}
-      {{- end }}
-      characters:
-      {{- range .Values.testConfig.characters }}
-        - {{ . }}
-      {{- end }}
-      minRating: "{{ .Values.testConfig.minRating }}"
-      maxRating: "{{ .Values.testConfig.maxRating }}"
-      ticketsPerMatch: "{{ .Values.testConfig.ticketsPerMatch }}"
-      multifilter:
-        rangeSize: "{{ .Values.testConfig.multifilter.rangeSize }}"
-        rangeOverlap: "{{ .Values.testConfig.multifilter.rangeOverlap }}"
-      multipool:
-        rangeSize: "{{ .Values.testConfig.multipool.rangeSize }}"
-        rangeOverlap: "{{ .Values.testConfig.multipool.rangeOverlap }}"
-        characterCount: "{{ .Values.testConfig.multipool.characterCount }}"
-

install/helm/open-match/subcharts/open-match-scale/values.yaml

@@ -28,29 +28,8 @@ configs:
   default:
     volumeName: om-config-volume-default
     mountPath: /app/config/default
-    configName: scale-configmap
-  scale-configmap:
-    volumeName: scale-config-volume
+    configName: om-configmap-default
+  override:
+    volumeName: om-config-volume-override
     mountPath: /app/config/override
-    configName: scale-configmap
-
-testConfig:
-  profile: scaleprofiles
-  regions:
-    - region.europe-west1
-    - region.europe-west2
-    - region.europe-west3
-    - region.europe-west4
-  characters:
-    - cleric
-    - knight
-  minRating: 0
-  maxRating: 100
-  ticketsPerMatch: 8
-  multifilter:
-    rangeSize: 10
-    rangeOverlap: 5
-  multipool:
-    rangeSize: 10
-    rangeOverlap: 5
-    characterCount: 4
+    configName: om-configmap-override