Merge pull request #122 from DataONEorg/develop

Release 3.0.2 & chart 1.0.2 merge to main

RELEASE-NOTES.md

@@ -1,19 +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
-* 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.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
-* helm chart version 1.0.0 -- first release of helm chart
 * 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.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
+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"
+appVersion: "3.0.2"
 
 # Chart dependencies
 dependencies:

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

@@ -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</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>