Merge branch 'develop' into feature-105-hashstore

README.md

@@ -1,5 +1,7 @@
 # DataONE Indexer
 
+Also see [RELEASE-NOTES.md](./RELEASE-NOTES.md)
+
 The DataONE Indexer is a system that processes index tasks created by other components. The DataONE
 Indexer comprises three main subsystems, each defined by its own helm subsystem chart:
 

RELEASE-NOTES.md

@@ -0,0 +1,28 @@
+# dataone-indexer Release Notes
+
+## dataone-indexer version 3.0.2 & helm chart version 1.0.2
+
+* Release date: 2024-07-29
+* dataone-indexer version 3.0.2
+  * Bug fix - RabbitMQ Channel timeouts (PR #119)
+* helm chart version 1.0.2
+  * Bump Application version to 3.0.2
+  * Make .Values.rabbitmq.auth.existingPasswordSecret a required value
+
+## dataone-indexer version 3.0.1 & helm chart version 1.0.1
+
+* Release date: 2024-07-08
+* dataone-indexer version 3.0.1
+  * Bump rmq amqp client to 5.21.0
+  * Add healthcheck code
+  * Exit app if unrecoverable exception occurs when started from `main()` method
+* helm chart version 1.0.1
+  * Change `.Values.idxworker.cn_url` to `.Values.global.d1ClientCnUrl`
+  * Get `fullname` from metacat chart or provide in values.yaml
+  * Add simple 'exec' liveness probe. Remove readiness probe
+
+## dataone-indexer version 3.0.0 & helm chart version 1.0.0
+
+* Release date: 2024-04-25
+* dataone-indexer version 3.0.0 -- first release of dataone-indexer
+* helm chart version 1.0.0 -- first release of helm chart

docker/Dockerfile

@@ -38,4 +38,4 @@ USER 1000
 LABEL org.opencontainers.image.source="https://github.com/dataoneorg/dataone-indexer"
 
 # Run the Worker process
-CMD ./entrypoint.sh
+CMD ["./entrypoint.sh"]

helm/Chart.lock

@@ -6,4 +6,4 @@ dependencies:
   repository: https://charts.bitnami.com/bitnami
   version: 6.2.3
 digest: sha256:8a0c7f616956207f7a5161ec1f5f3b58c432b8c8051ad4ef927dacee81c52be9
-generated: "2022-10-26T16:58:14.484158-08:00"
+generated: "2024-05-27T16:09:36.080811-07:00"

helm/Chart.yaml

@@ -21,13 +21,13 @@ 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: 1.0.1-develop
+version: 1.0.2
 
 # 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.1-SNAPSHOT"
+appVersion: "3.0.2"
 
 # Chart dependencies
 dependencies:

helm/config/dataone-indexer.properties

@@ -29,7 +29,7 @@ index.thread.number={{ .Values.idxworker.pool_size }}
 
 dataone.indexing.performance.logging.enabled=false
 
-D1Client.CN_URL={{ .Values.idxworker.cn_url }}
+D1Client.CN_URL={{ .Values.global.d1ClientCnUrl }}
 
 index.resourcemap.namespace=http://www.w3.org/TR/rdf-syntax-grammar;
 {{- print "" }}http://www.openarchives.org/ore/terms

helm/templates/deployment.yaml

@@ -90,7 +90,7 @@ spec:
             - name: RABBITMQ_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.rabbitmq.auth.existingPasswordSecret }}
+                  name: {{  required "rabbitmq.auth.existingPasswordSecret IS REQUIRED" .Values.rabbitmq.auth.existingPasswordSecret }}
                   key: rabbitmq-password
                   optional: false
             {{- if .Values.solr.auth.enabled }}

helm/values.yaml

@@ -24,6 +24,10 @@ global:
   ##
   ephemeralVolumeStorageClass: csi-cephfs-sc-ephemeral
 
+  ## @param global.d1ClientCnUrl URL of the CN
+  ##
+  d1ClientCnUrl: "https://cn.dataone.org/cn"
+
 
 ## @section Dataone-Indexer Application-Specific Properties
 
@@ -126,10 +130,6 @@ idxworker:
   ##
   mn_url: ""
 
-  ## @param idxworker.cn_url URL of the CN
-  ##
-  cn_url: "https://cn.dataone.org/cn"
-
   ## @param idxworker.solrHostname hostname of the solr service to use
   ## Leave unset (solrHostname: "") to automatically populate when using solr bitnami subchart
   ##
@@ -248,6 +248,9 @@ solr:
   extraVolumes:
     - name: solr-config
       configMap:
+        ## @param solr.extraVolumes.configMap.name must be edited to include your release name!
+        ## format:  releasename-indexer-configfiles
+        ##
         name: d1index-indexer-configfiles
         defaultMode: 0777
   extraVolumeMounts:

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dataone</groupId>
     <artifactId>dataone-index-worker</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.2</version>
     <packaging>jar</packaging>
     <name>dataone-index-worker</name>
     <url>http://maven.apache.org</url>
@@ -197,7 +197,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-reload4j</artifactId>
             <version>1.7.36</version>
             <exclusions>
                 <exclusion>
@@ -435,6 +435,15 @@
                 </includes>
             </resource>
         </resources>
+
+        <extensions>
+            <!-- Enabling the use of SSH; see `<distributionManagement>` section -->
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh-external</artifactId>
+                <version>3.5.3</version>
+            </extension>
+        </extensions>
     </build>
     <scm>
         <url>https://repository.dataone.org/software/cicore</url>
@@ -448,4 +457,15 @@
             <url>LICENSE.txt</url>
         </license>
     </licenses>
+<!-- Config for mvn deploy to upload to repo. Also see `<build><extensions>` section         -->
+<!-- Also requires authentication info in ~/.m2/settings.xml;                                -->
+<!--   see: https://maven.apache.org/guides/mini/guide-deployment-security-settings.html     -->
+<!--   ...but note pvt key location should be an absolute path (/home/myname/...), NOT ~/... -->
+    <distributionManagement>
+        <repository>
+            <id>dataone.org</id>
+            <name>DataONE Repository</name>
+            <url>scpexe://maven.dataone.org/var/www/maven</url>
+        </repository>
+    </distributionManagement>
 </project>