GONRG-4455: update helm charts

devops/gcp/configmap/templates/partition-secret-on-prem.yaml

+{{ if .Values.conf.on_prem_enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name:  "{{ .Values.conf.secret }}"
+  namespace: "{{ .Release.Namespace }}"
+  labels:
+    app: "{{ .Values.conf.app_name }}"
+type: Opaque
+data:
+  OSM_POSTGRES_PASSWORD: "{{ .Values.secret.osm_postgres_password }}"
+  OSM_POSTGRES_URL: "{{ .Values.secret.osm_postgres_url }}"
+  OSM_POSTGRES_USERNAME: "{{ .Values.secret.osm_postgres_username }}"
+{{ end }}

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

@@ -6,9 +6,14 @@ metadata:
   name: "{{ .Values.conf.configmap }}"
   namespace: "{{ .Release.Namespace }}"
 data:
+  LOG_LEVEL: "{{ .Values.data.log_level }}"
+  SPRING_PROFILES_ACTIVE: "{{ .Values.data.spring_profiles_active }}"
+  {{- if .Values.conf.on_prem_enabled }}
+  PARTITION_PROPERTY_KIND: "{{ .Values.data.partition_property_kind }}"
+  PARTITION_NAMESPACE: "{{ .Values.data.partition_namespace }}"
+  {{- else }}
   GOOGLE_CLOUD_PROJECT: "{{ .Values.data.google_cloud_project }}"
   PARTITION_ADMIN_ACCOUNTS: "{{ .Values.data.partition_admin_accounts }}"
   GOOGLE_AUDIENCES: "{{ .Values.data.google_audiences }}"
-  LOG_LEVEL: "{{ .Values.data.log_level }}"
   SERVICE_ACCOUNT_TAIL: "{{ .Values.data.service_account_tail }}"
-  SPRING_PROFILES_ACTIVE: "{{ .Values.data.spring_profiles_active }}"
+  {{- end }}

devops/gcp/configmap/values.yaml

@@ -4,9 +4,17 @@ data:
   google_audiences: ""
   log_level: "INFO"
   service_account_tail: ".iam.gserviceaccount.com"
+  partition_property_kind: ""
+  partition_namespace: ""
   spring_profiles_active: "gcp"
-  
+
+secret:
+  osm_postgres_password: ""
+  osm_postgres_url: ""
+  osm_postgres_username: ""
 
 conf:
   configmap: "partition-config"
+  secret: "partition-secret"
   app_name: "partition"
+  on_prem_enabled: false

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

@@ -25,6 +25,10 @@ spec:
           envFrom:
           - configMapRef:
               name: "{{ .Values.conf.configmap }}"
+          {{- if .Values.conf.on_prem_enabled }}
+          - secretRef:
+              name: "{{ .Values.conf.secret }}"
+          {{- end }}
           securityContext:
             allowPrivilegeEscalation: false
             runAsUser: 0

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/values.yaml

@@ -13,6 +13,7 @@ data:
 
 conf:
   configmap: "partition-config"
+  secret: "partition-secret"
   app_name: "partition"
   on_prem_enabled: false