[Cloud Deploy] Bare minimum to create a Cloud Deploy pipeline to release Website and mixer

deploy/helm_charts/envs/mixer_autopush.yaml

@@ -1,5 +1,7 @@
 # Helm config
 mixer:
+  image:
+    tag: ""
   hostProject: datcom-mixer-autopush
   serviceName: autopush.api.datacommons.org
   cacheSVFormula: true

deploy/helm_charts/envs/mixer_dev.yaml

@@ -21,6 +21,9 @@ nodes: 2
 serviceGroups:
   svg:
     replicas: 2
+    resources:
+      memoryRequest: "4G"
+      memoryLimit: "4G"
   recon:
     replicas: 4
   observation:

deploy/helm_charts/envs/mixer_staging.yaml

@@ -1,5 +1,7 @@
 # Helm config
 mixer:
+  image:
+    tag: ""
   hostProject: datcom-mixer-staging
   serviceName: staging.api.datacommons.org
 

deploy/helm_charts/mixer/templates/config_maps.yaml

@@ -26,7 +26,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "mixer.fullname" . }}-githash
-  namespace: {{ .Values.namespace.name }}
+  namespace: {{ .Release.Namespace }}
 data:
   mixer_hash.txt: {{ required "mixer githash is required" .Values.mixer.githash | quote }}
 
@@ -36,9 +36,9 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "mixer.fullname" . }}-store-config
-  namespace: {{ .Values.namespace.name }}
+  namespace: {{ .Release.Namespace }}
 data:
-  bigquery.version: {{ required "kgStoreConfig.bigqueryVersion is required." .Values.kgStoreConfig.bigqueryVersion }}
+  bigquery.version: {{ required "kgStoreConfig.bigqueryVersion is required." .Values.kgStoreConfig.bigqueryVersion | quote }}
   base_bigtable_info.yaml: {{  required "baseBigtableInfo is required." .Values.kgStoreConfig.baseBigtableInfo | quote }}
   custom_bigtable_info.yaml: {{ .Values.kgStoreConfig.customBigtableInfo | quote }}
   spanner_graph_info.yaml: {{ .Values.kgStoreConfig.spannerGraphInfo | quote }}
@@ -51,7 +51,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "mixer.fullname" . }}-mixer-config
-  namespace: {{ .Values.namespace.name }}
+  namespace: {{ .Release.Namespace }}
 data:
   hostProject: {{ required "Mixer GCP project is required." .Values.mixer.hostProject }}
   serviceName:  {{ required "Mixer service name is required." .Values.mixer.serviceName }}
@@ -62,9 +62,9 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ include "mixer.fullname" . }}-schema-mapping
-  namespace: {{ .Values.namespace.name }}
+  namespace: {{ .Release.Namespace }}
 data:
-  {{ range $key, $val := .Values.mixer.schemaConfigs }}
-  {{ $key }}: |
-    {{ $val | nindent 4 }}
-  {{ end  }}
+  base.mcf: |
+{{ (index .Values.mixer.schemaConfigs "base.mcf") | nindent 4 }}
+  encode.mcf: |
+{{ (index .Values.mixer.schemaConfigs "encode.mcf") | nindent 4 }}

deploy/helm_charts/mixer/templates/deployment.yaml

@@ -28,7 +28,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "mixer.fullname" $ }}-{{ $serviceName }}
-  namespace: {{ $.Values.namespace.name }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     service:  {{ include "mixer.fullname" $ }}-{{ $serviceName }}
     {{- include "mixer.labels" $ | nindent 4 }}
@@ -74,7 +74,7 @@ spec:
             name: service-config-configmap
       containers:
         - name: mixer
-          image:  "{{ $.Values.mixer.image.repository }}:{{ $.Values.mixer.image.tag | default $.Chart.AppVersion }}"
+          image:  "{{ $.Values.mixer.image.repository }}{{- if $.Values.mixer.image.tag -}}:{{ $.Values.mixer.image.tag }}{{- end }}"
           imagePullPolicy: {{ $.Values.mixer.image.pullPolicy }}
           resources:
             limits:
@@ -146,6 +146,7 @@ spec:
                 configMapKeyRef:
                   name: {{ include "mixer.fullname" $ }}-store-config
                   key: redis_info.yaml
+                  optional: true
             - name: MIXER_HASH
               valueFrom:
                 configMapKeyRef:
@@ -168,7 +169,7 @@ spec:
             periodSeconds: 10
             initialDelaySeconds: 10
         - name: esp
-          image:  "{{ $.Values.esp.image.repository }}:{{ $.Values.esp.image.tag | default $.Chart.AppVersion }}"
+          image:  "{{ $.Values.esp.image.repository }}{{- if $.Values.esp.image.tag -}}:{{ $.Values.esp.image.tag }}{{- end }}"
           imagePullPolicy: {{ $.Values.esp.image.pullPolicy }}
           resources:
             limits:

deploy/helm_charts/mixer/templates/ingress.yaml

@@ -28,7 +28,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .Values.ingress.name }}
-  namespace: {{ .Values.namespace.name }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "mixer.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}

deploy/helm_charts/mixer/templates/service.yaml

@@ -25,7 +25,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "mixer.fullname" $ }}-{{ $serviceName }}
-  namespace: {{ $.Values.namespace.name }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     service: {{ include "mixer.fullname" $ }}-{{ $serviceName }}
     {{- include "mixer.labels" $ | nindent 4 }}
@@ -51,7 +51,7 @@ apiVersion: cloud.google.com/v1
 kind: BackendConfig
 metadata:
   name: {{ include "mixer.fullname" . }}-backendconfig
-  namespace: {{ .Values.namespace.name }}
+  namespace: {{ .Release.Namespace }}
 spec:
   # Timeout for load balancer and the GKE pod connection
   timeoutSec: 300

deploy/helm_charts/mixer/templates/serviceaccount.yaml

@@ -28,7 +28,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Values.serviceAccount.name }}
-  namespace: {{ .Values.namespace.name }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "mixer.labels" . | nindent 4 -}}
   annotations:

deploy/helm_charts/mixer/values.yaml

@@ -26,7 +26,7 @@ fullnameOverride: ""
 # Set enabled to false to deploy into an existing namespace.
 namespace:
   create: false
-  name: "mixer"
+  name: "{{ .Values.namespace.name }}"
 
 # Everything custom DC related.
 customDC:
@@ -60,11 +60,11 @@ mixer:
   image:
     repository: gcr.io/datcom-ci/datacommons-mixer
     pullPolicy: IfNotPresent
-    tag: "latest"
+    tag: ""
 
   schemaConfigs:
-    base.mcf:
-    encode.mcf:
+    base.mcf: ""
+    encode.mcf: ""
 
 esp:
   image: