GONRG-2627: minor improvements for helms

devops/gcp/configmap/templates/configmap.yaml

@@ -2,19 +2,19 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app: {{ .Values.conf.app_name }}
-  name: {{ .Values.conf.configmap }}
-  namespace: {{ .Release.Namespace }}
+    app: "{{ .Values.conf.app_name }}"
+  name: "{{ .Values.conf.configmap }}"
+  namespace: "{{ .Release.Namespace }}"
 data:
   LOG_LEVEL: "{{ .Values.data.log_level }}"
-  ENVIRONMENT: {{ .Values.data.environment }}
-  GOOGLE_CLOUD_PROJECT: {{ .Values.data.google_cloud_project_id }}
+  ENVIRONMENT: "{{ .Values.data.environment }}"
+  GOOGLE_CLOUD_PROJECT: "{{ .Values.data.google_cloud_project_id }}"
   REDIS_GROUP_HOST: "{{ .Values.data.redis_group_host }}"
   REDIS_SEARCH_HOST: "{{ .Values.data.redis_search_host }}"
   REDIS_SEARCH_PORT:  "{{ .Values.data.redis_search_port }}"
-  INDEXER_HOST: {{ .Values.data.indexer_host }}
-  AUTHORIZE_API: {{ .Values.data.authorize_api }}
-  ENTITLEMENTS_HOST: {{ .Values.data.authorize_api }}
+  INDEXER_HOST: "{{ .Values.data.indexer_host }}"
+  AUTHORIZE_API: "{{ .Values.data.authorize_api }}"
+  ENTITLEMENTS_HOST: "{{ .Values.data.authorize_api }}"
   SECURITY_HTTPS_CERTIFICATE_TRUST: "{{ .Values.data.security_https_certificate_trust }}"
   GOOGLE_AUDIENCES: "{{ .Values.data.audiences }}"
   PARTITION_API: "{{ .Values.data.partition_api }}"

devops/gcp/configmap/values.yaml

-# Default values for configmap.
+# Default values for search configmap.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 data:
-  log_level: "INFO"
+  log_level: ""
   environment: "dev"
   google_cloud_project_id: ""
   redis_group_host: ""

devops/gcp/deploy/templates/deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   labels:
     app: "{{ .Values.conf.app_name }}"
   name: "{{ .Values.conf.app_name }}"
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
 spec:
   selector:
     matchLabels:
@@ -17,73 +17,10 @@ spec:
     spec:
       containers:
         - name: "{{ .Values.conf.app_name }}"
-          image: "{{ .Values.app.image }}"
-          env:
-            - name: "LOG_LEVEL"
-              valueFrom:
-                configMapKeyRef:
-                  key: LOG_LEVEL
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "ENVIRONMENT"
-              valueFrom:
-                configMapKeyRef:
-                  key: ENVIRONMENT
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "GOOGLE_CLOUD_PROJECT"
-              valueFrom:
-                configMapKeyRef:
-                  key: GOOGLE_CLOUD_PROJECT
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "REDIS_GROUP_HOST"
-              valueFrom:
-                configMapKeyRef:
-                  key: REDIS_GROUP_HOST
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "REDIS_SEARCH_HOST"
-              valueFrom:
-                configMapKeyRef:
-                  key: REDIS_SEARCH_HOST
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "REDIS_SEARCH_PORT"
-              valueFrom:
-                configMapKeyRef:
-                  key: REDIS_SEARCH_PORT
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "INDEXER_HOST"
-              valueFrom:
-                configMapKeyRef:
-                  key: INDEXER_HOST
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "AUTHORIZE_API"
-              valueFrom:
-                configMapKeyRef:
-                  key: AUTHORIZE_API
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "ENTITLEMENTS_HOST"
-              valueFrom:
-                configMapKeyRef:
-                  key: ENTITLEMENTS_HOST
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "SECURITY_HTTPS_CERTIFICATE_TRUST"
-              valueFrom:
-                configMapKeyRef:
-                  key: SECURITY_HTTPS_CERTIFICATE_TRUST
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "GOOGLE_AUDIENCES"
-              valueFrom:
-                configMapKeyRef:
-                  key: GOOGLE_AUDIENCES
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "PARTITION_API"
-              valueFrom:
-                configMapKeyRef:
-                  key: PARTITION_API
-                  name: "{{ .Values.conf.configmap }}"
-            - name: "POLICY_API"
-              valueFrom:
-                configMapKeyRef:
-                  key: POLICY_API
-                  name: "{{ .Values.conf.configmap }}"
+          image: "{{ .Values.data.image }}"
+          envFrom:
+          - configMapRef:
+              name: "{{ .Values.conf.configmap }}"
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 0
@@ -91,9 +28,9 @@ spec:
             - containerPort: 8080
           resources:
             requests:
-              cpu: "{{ .Values.app.requests_cpu }}"
-              memory: "{{ .Values.app.requests_memory }}"
+              cpu: "{{ .Values.data.requests_cpu }}"
+              memory: "{{ .Values.data.requests_memory }}"
             limits:
-              cpu: "{{ .Values.app.limits_cpu }}"
-              memory: "{{ .Values.app.limits_memory }}"
-      serviceAccountName: "{{ .Values.app.serviceAccountName }}"
+              cpu: "{{ .Values.data.limits_cpu }}"
+              memory: "{{ .Values.data.limits_memory }}"
+      serviceAccountName: "{{ .Values.data.serviceAccountName }}"

devops/gcp/deploy/templates/service.yaml

@@ -4,7 +4,7 @@ metadata:
   name: "{{ .Values.conf.app_name }}"
   annotations:
     cloud.google.com/neg: '{"ingress": true}'
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     app: "{{ .Values.conf.app_name }}"
     service: "{{ .Values.conf.app_name }}"

devops/gcp/deploy/templates/virtual-service.yaml

@@ -2,7 +2,7 @@ apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
   name: "{{ .Values.conf.app_name }}"
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
 spec:
   hosts:
     - "*"
@@ -16,4 +16,4 @@ spec:
         - destination:
             port:
               number: 80
-            host: {{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local
+            host: "{{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local"

devops/gcp/deploy/values.yaml

-# Default values for legal-deploy.
+# Default values for search-deploy.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-app:
+data:
   requests_cpu: "0.25"
   requests_memory: "128M"
   limits_cpu: "1"