GONRG-2627: minor improvements for helms

devops/gcp/configmap/Chart.yaml

@@ -22,4 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-

devops/gcp/configmap/templates/storage-variables.yml

@@ -2,9 +2,9 @@ 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:
   AUTHORIZE_API: "http://{{ .Values.conf.ent_name }}.{{ .Release.Namespace }}{{ .Values.data.authorize_api }}"
   LOG_LEVEL: "{{ .Values.data.log_level }}"
@@ -15,5 +15,3 @@ data:
   REDIS_STORAGE_HOST: "{{ .Values.data.redis_storage_host }}"
   CRS_API: "{{ .Values.data.crs_api }}"
   DEFAULT_DATA_COUNTRY: "{{ .Values.data.default_data_country }}"
----
-

devops/gcp/configmap/values.yaml

-# Default values for legal-configmap.
+# Default values for storage-configmap.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
 data:
   authorize_api: ".svc.cluster.local/entitlements/v1/"
-  log_level: "INFO"
+  log_level: ""
   legaltag_api: ".svc.cluster.local/api/legal/v1"
-  google_audiences: "519000754840-r12fqsd3e12aqep8c5f3j3t3emv8jeg1.apps.googleusercontent.com"
+  google_audiences: ""
   redis_group_host: ""
   redis_storage_host: ""
   default_data_country: "US"
@@ -17,4 +17,3 @@ conf:
   legal_name: ""
   configmap: "storage-config"
   app_name: "storage"
-

devops/gcp/deploy/Chart.yaml

@@ -22,4 +22,3 @@ version: 0.1.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "1.16.0"
-

devops/gcp/deploy/templates/storage-deploy.yml

@@ -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,53 +17,10 @@ spec:
     spec:
       containers:
       - name: "{{ .Values.conf.app_name }}"
-        image: "{{ .Values.storage.image }}"
-        env:
-        - name: "AUTHORIZE_API"
-          valueFrom:
-            configMapKeyRef:
-              key: AUTHORIZE_API
-              name: "{{ .Values.conf.configmap }}"
-        - name: "LOG_LEVEL"
-          valueFrom:
-            configMapKeyRef:
-              key: LOG_LEVEL
-              name: "{{ .Values.conf.configmap }}"
-        - name: "STORAGE_HOSTNAME"
-          valueFrom:
-            configMapKeyRef:
-              key: STORAGE_HOSTNAME
-              name: "{{ .Values.conf.configmap }}"
-        - name: "LEGALTAG_API"
-          valueFrom:
-            configMapKeyRef:
-              key: LEGALTAG_API
-              name: "{{ .Values.conf.configmap }}"
-        - name: "GOOGLE_AUDIENCES"
-          valueFrom:
-            configMapKeyRef:
-              key: GOOGLE_AUDIENCES
-              name: "{{ .Values.conf.configmap }}"
-        - name: "REDIS_GROUP_HOST"
-          valueFrom:
-            configMapKeyRef:
-              key: REDIS_GROUP_HOST
-              name: "{{ .Values.conf.configmap }}"
-        - name: "REDIS_STORAGE_HOST"
-          valueFrom:
-            configMapKeyRef:
-              key: REDIS_STORAGE_HOST
-              name: "{{ .Values.conf.configmap }}"
-        - name: "CRS_API"
-          valueFrom:
-            configMapKeyRef:
-              key: CRS_API
-              name: "{{ .Values.conf.configmap }}"
-        - name: "DEFAULT_DATA_COUNTRY"
-          valueFrom:
-            configMapKeyRef:
-              key: DEFAULT_DATA_COUNTRY
-              name: "{{ .Values.conf.configmap }}"
+        image: "{{ .Values.data.image }}"
+        envFrom:
+        - configMapRef:
+            name: "{{ .Values.conf.configmap }}"
         securityContext:
           allowPrivilegeEscalation: false
           runAsUser: 0
@@ -71,10 +28,10 @@ spec:
         - containerPort: 8080
         resources:
           requests:
-            cpu: "{{ .Values.storage.requests_cpu }}"
-            memory: "{{ .Values.storage.requests_memory }}"
+            cpu: "{{ .Values.data.requests_cpu }}"
+            memory: "{{ .Values.data.requests_memory }}"
           limits:
-            cpu: "{{ .Values.storage.limits_cpu }}"
-            memory: "{{ .Values.storage.limits_memory }}"
-      serviceAccountName: "{{ .Values.storage.serviceAccountName }}"
+            cpu: "{{ .Values.data.limits_cpu }}"
+            memory: "{{ .Values.data.limits_memory }}"
+      serviceAccountName: "{{ .Values.data.serviceAccountName }}"
 

devops/gcp/deploy/templates/storage-service.yml

@@ -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 }}"
@@ -16,4 +16,3 @@ spec:
       name: http
   selector:
     app: "{{ .Values.conf.app_name }}"
-

devops/gcp/deploy/templates/storage-virtual-service.yml

@@ -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,5 +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 storage-deploy.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-storage:
+data:
   requests_cpu: "0.25"
   requests_memory: "128M"
   limits_cpu: "0.5"
@@ -13,5 +13,3 @@ storage:
 conf:
   configmap: "storage-config"
   app_name: "storage"
-
-