From 5a30d276c6aa421a3b5b2f1c451580384b577ea4 Mon Sep 17 00:00:00 2001 From: Narek Engibaryan Date: Sun, 5 May 2024 13:48:53 +0300 Subject: [PATCH 1/3] OSS version feature --- nxrm-ha/templates/statefulset.yaml | 8 +++++++- nxrm-ha/values.yaml | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nxrm-ha/templates/statefulset.yaml b/nxrm-ha/templates/statefulset.yaml index 65a3159..78ff0c1 100644 --- a/nxrm-ha/templates/statefulset.yaml +++ b/nxrm-ha/templates/statefulset.yaml @@ -151,12 +151,18 @@ spec: -Dnexus.datastore.nexus.jdbcUrl=jdbc:postgresql://${DB_HOST}:{{ .Values.statefulset.container.env.nexusDBPort }}/${DB_NAME}{{ .Values.statefulset.container.env.jdbcUrlParams }} \ -Dnexus.datastore.nexus.username=${DB_USER} \ -Dnexus.datastore.nexus.password=${DB_PASSWORD}" - {{ else }} + {{ else if .Values.secret.license.enabled }} value: "{{ .Values.statefulset.container.env.install4jAddVmParams }} -Dnexus.licenseFile=${LICENSE_FILE} \ -Dnexus.datastore.enabled=true -Djava.util.prefs.userRoot=${NEXUS_DATA}/javaprefs \ -Dnexus.datastore.nexus.jdbcUrl=jdbc:postgresql://${DB_HOST}:{{ .Values.statefulset.container.env.nexusDBPort }}/${DB_NAME}{{ .Values.statefulset.container.env.jdbcUrlParams }} \ -Dnexus.datastore.nexus.username=${DB_USER} \ -Dnexus.datastore.nexus.password=${DB_PASSWORD}" + {{ else }} + value: "{{ .Values.statefulset.container.env.install4jAddVmParams }} \ + -Dnexus.datastore.enabled=true -Djava.util.prefs.userRoot=${NEXUS_DATA}/javaprefs \ + -Dnexus.datastore.nexus.jdbcUrl=jdbc:postgresql://${DB_HOST}:{{ .Values.statefulset.container.env.nexusDBPort }}/${DB_NAME}{{ .Values.statefulset.container.env.jdbcUrlParams }} \ + -Dnexus.datastore.nexus.username=${DB_USER} \ + -Dnexus.datastore.nexus.password=${DB_PASSWORD}" {{ end }} {{- if .Values.statefulset.container.additionalEnv }} {{ toYaml .Values.statefulset.container.additionalEnv | nindent 12 }} diff --git a/nxrm-ha/values.yaml b/nxrm-ha/values.yaml index 1a053be..090cbfa 100644 --- a/nxrm-ha/values.yaml +++ b/nxrm-ha/values.yaml @@ -188,6 +188,7 @@ secret: enabled: false # Enable to apply nexus-admin-secret.yaml which allows you to the initial admin password for nexus repository adminPassword: yourinitialnexuspassword #You should change this when you login for the first time license: + enabled: true name: nexus-repo-license.lic licenseSecret: enabled: false From 3336bedb2b073368f713772fd41b8e6d5a0d1b11 Mon Sep 17 00:00:00 2001 From: Narek Engibaryan Date: Sun, 5 May 2024 14:57:34 +0300 Subject: [PATCH 2/3] Added -Dnexus.loadAsOSS=true --- nxrm-ha/templates/statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nxrm-ha/templates/statefulset.yaml b/nxrm-ha/templates/statefulset.yaml index 78ff0c1..1877004 100644 --- a/nxrm-ha/templates/statefulset.yaml +++ b/nxrm-ha/templates/statefulset.yaml @@ -158,7 +158,7 @@ spec: -Dnexus.datastore.nexus.username=${DB_USER} \ -Dnexus.datastore.nexus.password=${DB_PASSWORD}" {{ else }} - value: "{{ .Values.statefulset.container.env.install4jAddVmParams }} \ + value: "{{ .Values.statefulset.container.env.install4jAddVmParams }} -Dnexus.loadAsOSS=true \ -Dnexus.datastore.enabled=true -Djava.util.prefs.userRoot=${NEXUS_DATA}/javaprefs \ -Dnexus.datastore.nexus.jdbcUrl=jdbc:postgresql://${DB_HOST}:{{ .Values.statefulset.container.env.nexusDBPort }}/${DB_NAME}{{ .Values.statefulset.container.env.jdbcUrlParams }} \ -Dnexus.datastore.nexus.username=${DB_USER} \ From 04285b05376993c0c81ae53801fccd983562b561 Mon Sep 17 00:00:00 2001 From: Narek Engibaryan Date: Sun, 5 May 2024 15:10:59 +0300 Subject: [PATCH 3/3] Added comment --- nxrm-ha/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nxrm-ha/values.yaml b/nxrm-ha/values.yaml index 090cbfa..e08193b 100644 --- a/nxrm-ha/values.yaml +++ b/nxrm-ha/values.yaml @@ -188,7 +188,7 @@ secret: enabled: false # Enable to apply nexus-admin-secret.yaml which allows you to the initial admin password for nexus repository adminPassword: yourinitialnexuspassword #You should change this when you login for the first time license: - enabled: true + enabled: true # Disable to start OSS version name: nexus-repo-license.lic licenseSecret: enabled: false @@ -235,4 +235,4 @@ nexus: config: enabled: false mountPath: /sonatype-nexus-conf - data: [] \ No newline at end of file + data: []