diff --git a/README.md b/README.md index 7937959..28b4604 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ The SonarQube Capability expects the database listed below to exist in the clust - A Postgres database is running on port `5432` and accessible to the cluster - This database can be logged into via the username `sonarqube` -- This database instance has a psql database created matching what is defined in the deploy time variable `SONARQUBE_DB`. Default is `sonarqubedb` +- This database instance has a psql database created named `sonarqubedb` - The `sonarqube` user has read/write access to above mentioned database - Create `sonarqube-postgres` service in `sonarqube` namespace that points to the psql database - Create `sonarqube-postgres` secret in `sonarqube` namespace with the key `password` that contains the password to the `sonarqube` user for the psql database diff --git a/sonarqube-flux-values.yaml b/sonarqube-flux-values.yaml index 25038f7..9dbce3e 100644 --- a/sonarqube-flux-values.yaml +++ b/sonarqube-flux-values.yaml @@ -72,7 +72,7 @@ application: jdbcOverwrite: enable: true - jdbcUrl: jdbc:postgresql://sonarqube-postgres.sonarqube.svc.cluster.local:5432/###ZARF_VAR_SONARQUBE_DB### + jdbcUrl: jdbc:postgresql://sonarqube-postgres.sonarqube.svc.cluster.local:5432/sonarqubedb jdbcUsername: sonarqube jdbcSecretName: sonarqube-postgres jdbcSecretPasswordKey: password @@ -90,6 +90,6 @@ application: existingSecret: "sonarqube-postgres" existingSecretPasswordKey: "password" postgresqlUsername: "sonarqube" - postgresqlDatabase: "###ZARF_VAR_SONARQUBE_DB###" + postgresqlDatabase: "sonarqubedb" service: port: 5432 diff --git a/values-sonarqube.yaml b/values-sonarqube.yaml deleted file mode 100644 index ac2988e..0000000 --- a/values-sonarqube.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# hostname is deprecated and replaced with domain. But if hostname exists then use it. -domain: bigbang.dev - -# Define variables to help with conditionals later - -OpenShift: - enabled: false - -istio: - enabled: true - sonarqube: - gateways: - - istio-system/tenant - injection: enabled - -monitoring: - enabled: true - -networkPolicies: - enabled: true - ingressLabels: - app: null - istio: null - -image: - pullPolicy: IfNotPresent - pullSecret: private-registry -postgresql: - # Use internal database, defaults are fine - enabled: true - service: - port: 5432 diff --git a/zarf.yaml b/zarf.yaml index 657c3bb..9ea2247 100644 --- a/zarf.yaml +++ b/zarf.yaml @@ -11,8 +11,6 @@ variables: default: "[]" - name: SONARQUBE_CREATE_NAMESPACE default: "true" - - name: SONARQUBE_DB - default: "sonarqubedb" - name: DOMAIN default: "bigbang.dev"