Merge branch 'GONRG-4426-modify-helm' into 'master'

GONRG-4426: Modify helm/bootstrap for catalog service

See merge request !124

devops/gcp/configmap/templates/crs-catalog-configmap.yaml

@@ -8,5 +8,7 @@ metadata:
 data:
   LOG_LEVEL: "{{ .Values.data.log_level }}"
   ENTITLEMENT_URL: "{{ .Values.data.entitlement_url }}"
+  {{- if not .Values.conf.on_prem_enabled }}
   CRS_CATALOG_HOSTNAME: "{{ .Values.data.crs_catalog_host_name }}"
   PARTITION_API: "{{ .Values.data.partition_api }}"
+  {{- end }}

devops/gcp/configmap/values.yaml

@@ -6,3 +6,4 @@ data:
 conf:
   configmap: "crs-catalog-config"
   app_name: "crs-catalog"
+  on_prem_enabled: false

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

+{{- if .Values.conf.on_prem_enabled }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: "{{ .Values.data.serviceAccountName }}"
+  namespace: "{{ .Release.Namespace }}"
+{{- end }}

devops/gcp/deploy/templates/service.yaml

@@ -3,7 +3,9 @@ kind: Service
 metadata:
   name: "{{ .Values.conf.app_name }}"
   annotations:
+  {{- if not .Values.conf.on_prem_enabled }}
     cloud.google.com/neg: '{"ingress": true}'
+  {{- end }}
   namespace: "{{ .Release.Namespace }}"
   labels:
     app: "{{ .Values.conf.app_name }}"

devops/gcp/deploy/values.yaml

@@ -4,9 +4,10 @@ data:
   limits_cpu: "1"
   limits_memory: "1G"
   serviceAccountName: ""
-  imagePullPolicy: "IfNotPresent"
   image: ""
+  imagePullPolicy: "IfNotPresent"
 
 conf:
   configmap: "crs-catalog-config"
   app_name: "crs-catalog"
+  on_prem_enabled: false