Merge pull request #148 from DataONEorg/feature-141-3.1.0-release-prep

Feature 141 3.1.0 release prep

docker/Dockerfile

@@ -23,7 +23,7 @@ RUN groupadd -g 1000 d1indexer && useradd -u 1000 -g 1000 d1indexer \
 
 # The most recently built jar file is copied from the maven build directory to this dir by maven, so that
 # it can be copied to the image.
-COPY ../target/dataone-index-worker-${TAG}-shaded.jar .
+COPY ./target/dataone-index-worker-${TAG}-shaded.jar .
 COPY ./docker/entrypoint.sh .
 
 # Change the ownership of the jar and sh files

helm/config/dataone-indexer.properties

@@ -43,7 +43,7 @@ index.solr.versionConflict.max.attempts={{ default 50 .Values.idxworker.solrVerC
 
 # Storage properties
 storage.className={{ default "org.dataone.hashstore.filehashstore.FileHashStore" .Values.idxworker.storage.hashStoreClassName }}
-storage.hashstore.rootDirectory={{ default "./target/hashstore" .Values.idxworker.storage.hashStoreRootDir }}
+storage.hashstore.rootDirectory={{ default "/var/metacat/hashstore" .Values.idxworker.storage.hashStoreRootDir }}
 storage.hashstore.defaultNamespace={{ default "https://ns.dataone.org/service/types/v2.0#SystemMetadata" .Values.idxworker.storage.hashStoreDefaultNamespace }}
 # The following three properties must NOT be modified after the hash store is initialized
 storage.hashstore.fileNameAlgorithm={{ default "SHA-256" .Values.idxworker.storage.hashStoreAlgorithm }}

helm/values.yaml

@@ -32,10 +32,23 @@ global:
 ## @section Dataone-Indexer Application-Specific Properties
 
 image:
+  ## @param image.repository repository that the image will be pulled from
+  ##
   repository: ghcr.io/dataoneorg/dataone-index-worker
+
+  ## @param image.pullPolicy image pull policy - Always, Never, or IfNotPresent
+  ##
   pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  #tag: ""
+
+  ## @param image.tag Overrides the image tag. Will default to the chart appVersion if set to ""
+  ##
+  tag: ""
+
+  ## @param image.debug Specify if container debugging should be enabled (sets log level to "DEBUG")
+  ## Set to true if you would like to see extra information in metacat/tomcat logs.
+  ## * * WARNING - FOR TESTING ONLY! * * May result in secrets being printed to logs in plain text.
+  ##
+  debug: false
 
 imagePullSecrets: []
 
@@ -181,6 +194,15 @@ idxworker:
   ##
   tripleDbDirectory: /etc/dataone/tdb-cache
 
+  storage:
+    hashStoreClassName: "org.dataone.hashstore.filehashstore.FileHashStore"
+    hashStoreRootDir: "/var/metacat/hashstore"
+    hashStoreDefaultNamespace: "https://ns.dataone.org/service/types/v2.0#SystemMetadata"
+    # The following three properties must NOT be modified after the hashstore is initialized
+    hashStoreAlgorithm: "SHA-256"
+    hashStoreDirWidth: 2
+    hashStoreDirDepth: 3
+
 ## @section RabbitMQ Bitnami Sub-Chart Configuration
 ##
 rabbitmq:
@@ -200,7 +222,7 @@ rabbitmq:
     ## @param rabbitmq.existingPasswordSecret the k8s secret holding the rabbitmq password
     ## (must be associated with key: 'rabbitmq-password')
     ##
-    existingPasswordSecret: ""
+    existingPasswordSecret: "ssss"
 
 
 ## @section Solr Bitnami Sub-Chart Configuration

src/main/resources/log4j2.properties

@@ -34,7 +34,7 @@ appender.consoleAppender.layout.pattern=dataone-indexer %d{yyyyMMdd-HH:mm:ss}: [
 ##################################
 # the root logger configuration  #
 ##################################
-rootLogger.level=INFO
+rootLogger.level={{ ternary "DEBUG" "ERROR" .Values.image.debug }}
 rootLogger.appenderRef.console.ref=consoleAppender
 
 ################################################################################