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 ff2bcde69c5dad9900fd5a1cd096b7390e1d82bd..0000000000000000000000000000000000000000 --- 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 f73727afca893814a6e740b5625ff5e1a8a8c7ad..37d60cdb6c70529e5f7c5af46eb69186843a59e3 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 9f75d6d0de04e5c0cfd3325ace2c93cbb944203e..1891b1454dd67b0008d2f4af3923e5cb5fbd9861 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 diff --git a/partition-core/pom.xml b/partition-core/pom.xml index 63dd43b3a37d1a96152fabf9f36639a5678bb853..a6a6e93790c4a1402648e93ab25adf5e2d578556 100644 --- a/partition-core/pom.xml +++ b/partition-core/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>partition</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/pom.xml b/pom.xml index fb0dd4050cfbcb4a43de3b3bd6fc7a0f3e75fd1e..d7447f994c1c9ac589b5c1f948d3fb40f60ec7ff 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.opengroup.osdu</groupId> <artifactId>partition</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <description>Partition Service</description> <properties> diff --git a/provider/partition-aws/pom.xml b/provider/partition-aws/pom.xml index a527e91e916e317fc81e476b0dc9dea35ea18a40..095a982fa4499d9459c2efad48bb6ff65b6ab32a 100644 --- a/provider/partition-aws/pom.xml +++ b/provider/partition-aws/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>partition</artifactId> <groupId>org.opengroup.osdu</groupId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/provider/partition-azure/pom.xml b/provider/partition-azure/pom.xml index 004189152c9d9f0461eb7cac9a508295c02d155e..304e199039993ac0d9b81cfe950619a1ace759d0 100644 --- a/provider/partition-azure/pom.xml +++ b/provider/partition-azure/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>partition</artifactId> <groupId>org.opengroup.osdu</groupId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/provider/partition-gcp/pom.xml b/provider/partition-gcp/pom.xml index cbe8995bedc15e51f968be75186b2440b5f7460b..42ad2f76b4cccf1204c5bfed3fa860c954e66eca 100644 --- a/provider/partition-gcp/pom.xml +++ b/provider/partition-gcp/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>partition</artifactId> <groupId>org.opengroup.osdu</groupId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/provider/partition-ibm/pom.xml b/provider/partition-ibm/pom.xml index 6a84269f1573fa65d7ae81e916e70a569ec80003..5c329a5c828184543ac46e141e34e97867518689 100644 --- a/provider/partition-ibm/pom.xml +++ b/provider/partition-ibm/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>partition</artifactId> <groupId>org.opengroup.osdu</groupId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/provider/partition-reference/pom.xml b/provider/partition-reference/pom.xml index dafb5104f83385f0c6a7d33c0040af691b3a8847..024d798d96ba4ed68dbaa21e5227c661ad3ef5af 100644 --- a/provider/partition-reference/pom.xml +++ b/provider/partition-reference/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>partition</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu</groupId> <artifactId>partition-reference</artifactId> <description>Partition service on Hybrid Cloud</description> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> diff --git a/testing/partition-test-aws/pom.xml b/testing/partition-test-aws/pom.xml index 824ca814c75735dd46d654cdebdb614d355a7a60..33b74c70b5ff0d1805a2421c6c918e6100239a0d 100644 --- a/testing/partition-test-aws/pom.xml +++ b/testing/partition-test-aws/pom.xml @@ -19,14 +19,14 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>os-partition-testing</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-aws</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -65,7 +65,7 @@ <dependency> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-core</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/testing/partition-test-azure/pom.xml b/testing/partition-test-azure/pom.xml index 3510343709cdf7ded8b459eecd1164241fab4c45..bdafae95cc5ece4b4f404bd737260ec0aed24352 100644 --- a/testing/partition-test-azure/pom.xml +++ b/testing/partition-test-azure/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>os-partition-testing</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-azure</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -65,7 +65,7 @@ <dependency> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-core</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/testing/partition-test-core/pom.xml b/testing/partition-test-core/pom.xml index 46ee03c61c9e8afab082cf98ecfddb71b9e69347..0465a4da370c325410a1bb1fac8b3b72dc4c5dd6 100644 --- a/testing/partition-test-core/pom.xml +++ b/testing/partition-test-core/pom.xml @@ -20,13 +20,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>os-partition-testing</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-core</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/testing/partition-test-gcp/pom.xml b/testing/partition-test-gcp/pom.xml index d382df18b65f4924870de20042f661cf879c03d6..44e027beaf953c59d405467ce641aa5252a6da65 100644 --- a/testing/partition-test-gcp/pom.xml +++ b/testing/partition-test-gcp/pom.xml @@ -6,13 +6,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>os-partition-testing</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-gcp</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -57,7 +57,7 @@ <dependency> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-core</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/testing/partition-test-ibm/pom.xml b/testing/partition-test-ibm/pom.xml index 161c08df2244d9112813bc8a39488f5ef2d5faeb..760ee8c521e4886ac054f0eb6f22108e338ef771 100644 --- a/testing/partition-test-ibm/pom.xml +++ b/testing/partition-test-ibm/pom.xml @@ -6,13 +6,13 @@ <parent> <groupId>org.opengroup.osdu</groupId> <artifactId>os-partition-testing</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-ibm</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> @@ -58,7 +58,7 @@ <dependency> <groupId>org.opengroup.osdu.partition</groupId> <artifactId>partition-test-core</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/testing/pom.xml b/testing/pom.xml index 40e9f72678d1fec18fe3ce1537bdd168f3b8a6e4..6530222ca3e54bedab5453c7d865c8b01c5a07b3 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -18,7 +18,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.opengroup.osdu</groupId> <artifactId>os-partition-testing</artifactId> - <version>0.14.0-SNAPSHOT</version> + <version>0.15.0-SNAPSHOT</version> <description>Root partition test project</description> <packaging>pom</packaging>