From 214b052ce9393ec919beba4b8a5fa410c86a5180 Mon Sep 17 00:00:00 2001
From: "Igor Zimovets (EPAM)" <igor_zimovets@epam.com>
Date: Thu, 7 Apr 2022 17:35:54 +0000
Subject: [PATCH] GONRG-4690 refactor helm charts
---
.../templates/partition-secret-on-prem.yaml | 14 --------------
devops/gcp/configmap/values.yaml | 6 ------
devops/gcp/deploy/values.yaml | 2 +-
3 files changed, 1 insertion(+), 21 deletions(-)
delete mode 100644 devops/gcp/configmap/templates/partition-secret-on-prem.yaml
diff --git a/devops/gcp/configmap/templates/partition-secret-on-prem.yaml b/devops/gcp/configmap/templates/partition-secret-on-prem.yaml
deleted file mode 100644
index ff2bcde69..000000000
--- a/devops/gcp/configmap/templates/partition-secret-on-prem.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{{ 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 }}
diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml
index f73727afc..37d60cdb6 100644
--- a/devops/gcp/configmap/values.yaml
+++ b/devops/gcp/configmap/values.yaml
@@ -8,13 +8,7 @@ data:
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
diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml
index 9f75d6d0d..1891b1454 100644
--- a/devops/gcp/deploy/values.yaml
+++ b/devops/gcp/deploy/values.yaml
@@ -13,7 +13,7 @@ data:
conf:
configmap: "partition-config"
- secret: "partition-secret"
+ secret: "partition-postgres-secret"
app_name: "partition"
on_prem_enabled: false
--
GitLab