Merge pull request #85 from DataONEorg/feature-70-mc3.0.0-release-work

update version numbers for release
DataONEorg · Apr 24, 2024 · 11e6a72 · 11e6a72
2 parents e80f3ed + 0a84f3e
commit 11e6a72
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -21,21 +21,21 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0
+version: 1.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "3.0.0-SNAPSHOT"
+appVersion: "3.0.0"
 
 # Chart dependencies
 dependencies:
-  - name: rabbitmq
+  - name: rabbitmq      # rabbitmq version 3.10.5 is deployed by chart version 10.1.14
     repository: https://charts.bitnami.com/bitnami
     version: 10.1.14
     condition: rabbitmq.enabled, global.rabbitmq.enabled
   - name: solr
     repository: https://charts.bitnami.com/bitnami
-    version: 6.2.3
+    version: 6.2.3      # solr version 9.0.0 is deployed by chart version 6.2.3
     condition: solr.enabled, global.solr.enabled
diff --git a/helm/config/dataone-indexer.properties b/helm/config/dataone-indexer.properties
@@ -36,11 +36,7 @@ index.resourcemap.namespace=http://www.w3.org/TR/rdf-syntax-grammar;
 
 dataone.mn.registration.serviceType.url={{ .Values.idxworker.d1_serviceType_url }}
 
-#Time (milliseconds) that resource map processor waits for solr doc readiness of its components
-index.resourcemap.waitingComponent.time=800
-#Number of times the resource map processor waits for the solr doc readiness of its components
-index.resourcemap.waitingComponent.max.attempts=25
-#Time (milliseconds) indexer will wait to grab a newer version of solr doc after a version conflict
-index.solr.versionConflict.waiting.time=500
-#Number of the times the indexer tries to get a newer version of solr doc after a version conflict
-index.solr.versionConflict.max.attempts=25
+index.resourcemap.waitingComponent.time={{ default 800 .Values.idxworker.resourcemapWaitMs }}
+index.resourcemap.waitingComponent.max.attempts={{ default 25 .Values.idxworker.resourcemapMaxTries }}
+index.solr.versionConflict.waiting.time={{ default 1000 .Values.idxworker.solrVerConflictWaitMs }}
+index.solr.versionConflict.max.attempts={{ default 50 .Values.idxworker.solrVerConflictMaxTries }}
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -123,6 +123,26 @@ idxworker:
   ##
   solrHostname: ""
 
+  ## @param idxworker.solrVerConflictWaitMs wait time (mS) before indexer grabs a newer version
+  ## of solr doc after a version conflict
+  ##
+  solrVerConflictWaitMs: 1000
+
+  ## @param idxworker.solrVerConflictMaxTries Number of tries to get a newer version of solr doc
+  ## after a version conflict
+  ##
+  solrVerConflictMaxTries: 50
+
+  ## @param idxworker.resourcemapWaitMs resource map processor wait time (mS) for solr doc readiness
+  ## of its components
+  ##
+  resourcemapWaitMs: 800
+
+  ## @param idxworker.resourcemapMaxTries resource map processor number of tries for solr doc
+  ## readiness of its components
+  ##
+  resourcemapMaxTries: 25
+
   ## @param idxworker.rabbitmqHostname hostname of the rabbitmq service to use
   ## Leave unset (rabbitmqHostname: "") to automatically populate when using rmq bitnami subchart
   ##