diff --git a/helm/polaris/ci/persistence-values.yaml b/helm/polaris/ci/persistence-values.yaml index 5f684d3500..9807217ba9 100644 --- a/helm/polaris/ci/persistence-values.yaml +++ b/helm/polaris/ci/persistence-values.yaml @@ -35,6 +35,5 @@ logging: persistence: type: relational-jdbc relationalJdbc: - dbKind: postgres secret: name: polaris-persistence diff --git a/helm/polaris/templates/configmap.yaml b/helm/polaris/templates/configmap.yaml index 82443fdfec..6d12fbd7e1 100644 --- a/helm/polaris/templates/configmap.yaml +++ b/helm/polaris/templates/configmap.yaml @@ -53,11 +53,6 @@ data: {{- $_ = set $map "polaris.persistence.eclipselink.persistence-unit" .Values.persistence.eclipseLink.persistenceUnit -}} {{- $_ = set $map "polaris.persistence.eclipselink.configuration-file" (printf "%s/persistence.xml" .Values.image.configDir ) -}} {{- end -}} - {{- if eq .Values.persistence.type "relational-jdbc" -}} - {{- if .Values.persistence.relationalJdbc.dbKind -}} - {{- $_ = set $map "quarkus.datasource.db-kind" .Values.persistence.relationalJdbc.dbKind -}} - {{- end -}} - {{- end -}} {{- /* File IO */ -}} {{- $_ = set $map "polaris.file-io.type" .Values.fileIo.type -}} diff --git a/helm/polaris/tests/deployment_test.yaml b/helm/polaris/tests/deployment_test.yaml index 00c5eb52cd..1b8c942bb2 100644 --- a/helm/polaris/tests/deployment_test.yaml +++ b/helm/polaris/tests/deployment_test.yaml @@ -1022,7 +1022,7 @@ tests: - it: should set relational-jdbc persistence environment variables set: - persistence: { type: "relational-jdbc", dbKind: postgres, relationalJdbc: { secret: { name: "polaris-persistence" } } } + persistence: { type: "relational-jdbc", relationalJdbc: { secret: { name: "polaris-persistence" } } } asserts: - contains: path: spec.template.spec.containers[0].env diff --git a/helm/polaris/values.yaml b/helm/polaris/values.yaml index e6308a95d3..d985582f45 100644 --- a/helm/polaris/values.yaml +++ b/helm/polaris/values.yaml @@ -526,8 +526,6 @@ persistence: type: in-memory # relational-jdbc # -- The configuration for the relational-jdbc persistence manager. relationalJdbc: - # -- The type of database to use. Valid values are: h2, postgres. - dbKind: postgres # h2 # -- The secret name to pull the database connection properties from. secret: # -- The secret name to pull the database connection properties from.