Merge branch 'GONRG-4553-modify-helm-for-anthos' into 'master'

GONRG-4553: refactor helm for anthos

See merge request !174

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

@@ -7,6 +7,8 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 data:
   LOG_LEVEL: "{{ .Values.data.log_level }}"
+  SPRING_PROFILES_ACTIVE: "{{ .Values.data.spring_profiles_active }}"
+  {{- if not .Values.conf.on_prem_enabled }}
   GOOGLE_CLOUD_PROJECT: "{{ .Values.data.google_cloud_project }}"
   GOOGLE_AUDIENCES: "{{ .Values.data.google_audiences }}"
   RECORDS_CHANGE_PUBSUB_ENDPOINT: "{{ .Values.data.records_change_pubsub_endpoint }}"
@@ -14,4 +16,4 @@ data:
   KEY_RING: "{{ .Values.data.key_ring }}"
   KMS_KEY: "{{ .Values.data.kms_key }}"
   SUBSCRIBER_PRIVATE_KEY_ID: "{{ .Values.data.subscriber_private_key_id }}"
-  SPRING_PROFILES_ACTIVE: "{{ .Values.data.spring_profiles_active }}"
+  {{- end }}

devops/gcp/configmap/values.yaml

@@ -17,3 +17,4 @@ data:
 conf:
   configmap: "register-config"
   app_name: "register"
+  on_prem_enabled: false

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

@@ -24,6 +24,16 @@ spec:
         envFrom:
         - configMapRef:
             name: "{{ .Values.conf.configmap }}"
+        {{- if .Values.conf.on_prem_enabled }}
+        - secretRef:
+            name: "{{ .Values.conf.rabbitmq_secret_name }}"
+        - secretRef:
+            name: "{{ .Values.conf.register_postgres_secret_name }}"
+        - secretRef:
+            name: "{{ .Values.conf.register_keycloak_secret_name }}"
+        - secretRef:
+            name: "{{ .Values.conf.register_kms_secret_name }}"
+        {{- end }}
         securityContext:
           allowPrivilegeEscalation: false
           runAsUser: 0

devops/gcp/deploy/templates/register-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/values.yaml

@@ -13,4 +13,9 @@ data:
 
 conf:
   configmap: "register-config"
+  rabbitmq_secret_name: ""
+  register_postgres_secret_name: ""
+  register_keycloak_secret_name: ""
+  register_kms_secret_name: ""
   app_name: "register"
+  on_prem_enabled: false