Move Platform/Open Match to Cloud Deploy Params (#257)

This was a fun one as we have a Helm chart in play, and that was
non-obvious in terms of how to integrate:

* Remove `kustomize` render, since we don't need it anymore.
* Create Cloud Parameters that match the Helm configuration variables
  that we need to match in the Helm configuration.
* Also moved cloudbuild.yaml to `script:`

Next is the Agones deployments!

Work on #181

.gitignore

@@ -32,7 +32,6 @@ platform/agones/skaffold.yaml
 # Ignore Terraform generated kustomization files
 **/global-game-*/kustomization.yaml
 **/global-game-*/agones-system.yaml
-platform/open-match/base/kustomization.yaml
 
 # Ignore any tmp files generated
 infrastructure/tmp

infrastructure/open-match.tf

@@ -54,13 +54,3 @@ resource "google_service_networking_connection" "private_service_connection" {
   depends_on = [google_project_service.project]
 }
 
-# Add Redis Host & IP to Open Match kustomization.yaml
-resource "local_file" "open-match-kustomization-file" {
-
-  content = templatefile(
-    "${path.module}/files/open-match/kustomization.yaml.tpl", {
-      redis_host = google_redis_instance.open-match.host
-      redis_port = google_redis_instance.open-match.port
-  })
-  filename = "${path.module}/${var.platform_directory}/open-match/base/kustomization.yaml"
-}

infrastructure/pipelines.tf

@@ -212,6 +212,13 @@ resource "google_clouddeploy_delivery_pipeline" "open-match" {
   serial_pipeline {
     stages {
       target_id = google_clouddeploy_target.open-match-target.target_id
+      deploy_parameters {
+        values = {
+          # values are passed into Cloud Deploy Helm Charts by convention.
+          "open-match-core.redis.hostname" = google_redis_instance.open-match.host
+          "open-match-core.redis.port"     = google_redis_instance.open-match.port
+        }
+      }
     }
   }
 }

platform/cloudbuild.yaml

@@ -20,41 +20,34 @@ steps:
   # newly added clusters are configured properly with ASM.
   - name: gcr.io/google.com/cloudsdktool/cloud-sdk
     id: fleet-membership
-    entrypoint: bash
-    args:
-    - '-c'
-    - |
-        MEMBERSHIPS=$(gcloud container fleet memberships list --format="value(name)" | xargs | sed 's/ /,/g')
-
-        gcloud container fleet mesh update --management automatic --memberships $$MEMBERSHIPS
+    script: |
+      export MEMBERSHIPS=$(gcloud container fleet memberships list --format="value(name)" | xargs | sed 's/ /,/g') && \
+      echo Memberships: $MEMBERSHIPS && \
+      gcloud container fleet mesh update --management automatic --memberships "$MEMBERSHIPS"
 
   - name: gcr.io/google.com/cloudsdktool/cloud-sdk
     id: deploy-agones
-    entrypoint: bash
     dir: agones
-    args:
-      - '-c'
-      - |
-        gcloud deploy releases create deploy-$(date +'%Y%m%d%H%M%S') \
-        --annotations=cloud_build=https://console.cloud.google.com/cloud-build/builds/${BUILD_ID} \
-        --delivery-pipeline agones-deploy-pipeline \
-        --skaffold-file skaffold.yaml \
-        --region us-central1
+    script: |
+      gcloud deploy releases create deploy-$(date +'%Y%m%d%H%M%S') \
+      --annotations=cloud_build=https://console.cloud.google.com/cloud-build/builds/$BUILD_ID \
+      --delivery-pipeline agones-deploy-pipeline \
+      --skaffold-file skaffold.yaml \
+      --region us-central1
+    automapSubstitutions: true
     waitFor:
       - fleet-membership
 
   - name: gcr.io/google.com/cloudsdktool/cloud-sdk
     id: deploy-open-match
-    entrypoint: bash
     dir: open-match
-    args:
-      - '-c'
-      - |
-        gcloud deploy releases create deploy-$(date +'%Y%m%d%H%M%S') \
-        --annotations=cloud_build=https://console.cloud.google.com/cloud-build/builds/${BUILD_ID} \
-        --delivery-pipeline global-game-open-match \
-        --skaffold-file skaffold.yaml \
-        --region us-central1
+    script: |
+      gcloud deploy releases create deploy-$(date +'%Y%m%d%H%M%S') \
+      --annotations=cloud_build=https://console.cloud.google.com/cloud-build/builds/$BUILD_ID \
+      --delivery-pipeline global-game-open-match \
+      --skaffold-file skaffold.yaml \
+      --region us-central1
+    automapSubstitutions: true
     waitFor:
       - fleet-membership
 

platform/open-match/skaffold.yaml

@@ -12,14 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: skaffold/v4beta1
+apiVersion: skaffold/v4beta9
 kind: Config
 manifests:
-  kustomize:
-    paths:
-      - ./base
-    buildArgs:
-      - --enable-helm
+  rawYaml:
+    - open-match.yaml
+    - agones-allocator-vs.yaml
+  helm:
+    releases:
+      - name: open-match
+        namespace: open-match
+        repo: https://open-match.dev/chart/stable
+        remoteChart: open-match
+        version: 1.8.0
+        setValues:
+          prometheus.enabled: false
+          grafana.enabled: false
+          jaeger.enabled: false
+          open-match-override.enabled: true
+          open-match-customize.enabled: true
+          open-match-customize.evaluator.enabled: true
+          open-match-core.redis.enabled: false
+          # open-match-core.redis.hostname: redis -- set through Cloud Deploy by convention
+          # open-match-core.redis.port: 6379 -- set through Cloud Deploy by convention
+          open-match-core.redis.pool.maxIdle: 500
+          open-match-core.redis.pool.maxActive: 500
+          open-match-core.redis.pool.idleTimeout: 0
+          open-match-core.redis.pool.healthCheckTimeout: 300ms
+
 deploy:
   kubectl:
     flags: