From aedcb980371250f8c6fcc80cd528424459f49d0e Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 29 Apr 2024 21:33:08 -0700 Subject: [PATCH 01/16] add simple 'exec' liveness probe --- docker/Dockerfile | 4 ++- helm/templates/deployment.yaml | 32 ++++++------------- .../org/dataone/cn/indexer/IndexWorker.java | 26 +++++++++++++-- 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3bbe2852..4795b98d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,7 +18,8 @@ RUN apt update && apt -y install \ nano #Add a user & group with id=1001 and name=d1indexer -RUN groupadd -g 1000 d1indexer && useradd -u 1000 -g 1000 d1indexer +RUN groupadd -g 1000 d1indexer && useradd -u 1000 -g 1000 d1indexer \ + && touch ./livenessprobe # 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. @@ -28,6 +29,7 @@ COPY ./docker/entrypoint.sh . # Change the ownership of the jar and sh files RUN chown d1indexer dataone-index-worker-${TAG}-shaded.jar RUN chown d1indexer entrypoint.sh +RUN chown d1indexer livenessprobe #Run Container as d1indexer USER 1000 diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 7823dc71..fa2859d1 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -25,8 +25,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- if .Values.affinity }} - affinity: {{- include "idxhelpers.tplvalues.render" (dict "value" .Values.affinity "context" - $) | nindent 8 }} + affinity: {{- include "idxhelpers.tplvalues.render" (dict "value" .Values.affinity "context" $) | nindent 8 }} {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{- include "idxhelpers.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }} @@ -52,15 +51,14 @@ spec: {{- toYaml .Values.securityContext | nindent 12 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - # livenessProbe: - # httpGet: - # path: / - # port: http - # readinessProbe: - # httpGet: - # path: / - # port: http - # initialDelaySeconds: + livenessProbe: + exec: + command: + - /bin/sh + - -c + - test $(($(date +%s) - $(stat -f %m /var/lib/dataone-indexer/livenessprobe))) -lt 20 + initialDelaySeconds: 20 + periodSeconds: 10 resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: @@ -130,18 +128,6 @@ spec: | grep -c " { + Path path = Paths.get("./livenessprobe"); + try { + Files.createFile(path); + Files.setLastModifiedTime(path, FileTime.fromMillis(System.currentTimeMillis())); + logger.info("IndexWorker.startLivenessProbe - starting livenessProbe"); + } catch (IOException e) { + logger.error("IndexWorker.startLivenessProbe - failed to touch file: " + path, e); + } + }; + scheduler.scheduleAtFixedRate(task, 0, 10, TimeUnit.SECONDS); + } + /** * Initialize the RabbitMQ service * @throws IOException From 6e5eef064d268b9cf00e2bf8966f72ebe084c9bb Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:07:01 -0700 Subject: [PATCH 02/16] move liveness probe start to end of main method --- .../org/dataone/cn/indexer/IndexWorker.java | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/dataone/cn/indexer/IndexWorker.java b/src/main/java/org/dataone/cn/indexer/IndexWorker.java index cfc67ad0..d7a8b2c4 100644 --- a/src/main/java/org/dataone/cn/indexer/IndexWorker.java +++ b/src/main/java/org/dataone/cn/indexer/IndexWorker.java @@ -99,8 +99,7 @@ public class IndexWorker { private String specifiedThreadNumberStr = null; private int specifiedThreadNumber = 0; private ExecutorService executor = null; - private ScheduledExecutorService scheduler; - + /** * Commandline main for the IndexWorker to be started. * @param args @@ -114,6 +113,7 @@ public static void main(String[] args) throws IOException, TimeoutException, Ser loadExternalPropertiesFile(propertyFile); IndexWorker worker = new IndexWorker(); worker.start(); + startLivenessProbe(); } /** @@ -228,25 +228,9 @@ public IndexWorker(Boolean initialize) throws IOException, TimeoutException, Ser initIndexParsers(); ObjectManager.getInstance(); OntologyModelService.getInstance(); - startLivenessProbe(); } } - private void startLivenessProbe() { - scheduler = Executors.newScheduledThreadPool(1); - Runnable task = () -> { - Path path = Paths.get("./livenessprobe"); - try { - Files.createFile(path); - Files.setLastModifiedTime(path, FileTime.fromMillis(System.currentTimeMillis())); - logger.info("IndexWorker.startLivenessProbe - starting livenessProbe"); - } catch (IOException e) { - logger.error("IndexWorker.startLivenessProbe - failed to touch file: " + path, e); - } - }; - scheduler.scheduleAtFixedRate(task, 0, 10, TimeUnit.SECONDS); - } - /** * Initialize the RabbitMQ service * @throws IOException @@ -379,7 +363,7 @@ public void run() { }; boolean autoAck = false; rabbitMQchannel.basicConsume(INDEX_QUEUE_NAME, autoAck, consumer); - logger.info("IndexWorker.start - Calling basicConsume and waiting for the comming messages"); + logger.info("IndexWorker.start - Calling basicConsume and waiting for the coming messages"); } /** @@ -496,6 +480,20 @@ private void indexOjbect(IndexQueueMessageParser parser, long deliveryTag, boole public void stop() throws IOException, TimeoutException { rabbitMQchannel.close(); rabbitMQconnection.close(); - logger.info("IndexWorker.stop - stop the index queue conection."); + logger.info("IndexWorker.stop - stop the index queue connection."); + } + + private static void startLivenessProbe() { + ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); + Path path = Paths.get("./livenessprobe"); + Runnable task = () -> { + try { + Files.setLastModifiedTime(path, FileTime.fromMillis(System.currentTimeMillis())); + } catch (IOException e) { + logger.error("IndexWorker.startLivenessProbe - failed to update file: " + path, e); + } + }; + scheduler.scheduleAtFixedRate(task, 0, 10, TimeUnit.SECONDS); + logger.info("IndexWorker.startLivenessProbe - livenessProbe started"); } } From 1fcf6ad6d6d4f70aa1b6c1b4327f2730a4b0a106 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 6 May 2024 18:18:07 -0700 Subject: [PATCH 03/16] fixed naming nuances. getting chart to work in docker desktop --- helm/Chart.lock | 6 +++--- helm/Chart.yaml | 8 +++++--- helm/templates/_helpers.tpl | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/helm/Chart.lock b/helm/Chart.lock index 8b51d1f0..b03a921f 100644 --- a/helm/Chart.lock +++ b/helm/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: rabbitmq repository: https://charts.bitnami.com/bitnami - version: 10.1.14 + version: 14.1.0 - name: solr repository: https://charts.bitnami.com/bitnami version: 6.2.3 -digest: sha256:8a0c7f616956207f7a5161ec1f5f3b58c432b8c8051ad4ef927dacee81c52be9 -generated: "2022-10-26T16:58:14.484158-08:00" +digest: sha256:2d4c537383443f6a46dc8c4aa9d3967bad13cc8ac290e22abc3e7850e7c6f464 +generated: "2024-05-06T17:40:27.189768-07:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 32a9cde7..32241160 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -21,7 +21,7 @@ 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.0 +version: 1.0.1-develop # 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 @@ -31,9 +31,11 @@ appVersion: "3.0.0" # Chart dependencies dependencies: - - name: rabbitmq # rabbitmq version 3.10.5 is deployed by chart version 10.1.14 + - name: rabbitmq repository: https://charts.bitnami.com/bitnami - version: 10.1.14 + # version: 10.1.14 # rabbitmq version 3.10.5 is deployed by chart version 10.1.14 + # version: 10.1.19 # rabbitmq version 3.10.7 is deployed by chart version 10.1.19 + version: 14.1.0 # rabbitmq version 3.13.1 is deployed by chart version 14.1.0 condition: rabbitmq.enabled, global.rabbitmq.enabled - name: solr repository: https://charts.bitnami.com/bitnami diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index 3465b7a5..3bad3fdb 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -71,7 +71,7 @@ If connecting to an instance outside the cluster, should use https; {{- define "idxworker.mn.url" -}} {{- $mn_url := .Values.idxworker.mn_url }} {{- if not $mn_url }} -{{- $mn_url = printf "http://%s-hl:8080/%s/d1/mn" .Release.Name .Values.global.metacatAppContext }} +{{- $mn_url = printf "http://%s-hl:8080/%s/d1/mn" (include "idxworker.fullname" .) .Values.global.metacatAppContext }} {{- end }} {{- $mn_url }} {{- end }} @@ -79,12 +79,12 @@ If connecting to an instance outside the cluster, should use https; {{/* set Claim Name of existing PVC to use (typically the volume that is shared with metacat) Either use the value set in .Values.persistence.claimName, or if blank, autopopulate with - {podname}-metacat-{releaseName}-0 (e.g. metacatbrooke-metacat-metacatbrooke-0) + {podname}-metacat-{releaseName}-0 (e.g. metacatbrooke-metacat-metacatbrooke-metacat-0) */}} {{- define "idxworker.shared.claimName" -}} {{- $claimName := .Values.persistence.claimName }} {{- if not $claimName }} -{{- $claimName = printf "%s-metacat-%s-0" .Release.Name .Release.Name }} +{{- $claimName = printf "%s-metacat-%s-0" .Release.Name (include "idxworker.fullname" .) }} {{- end }} {{- $claimName }} {{- end }} From 449a0cbcee07d6639b9733fda96e7f07e8992575 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Tue, 7 May 2024 16:18:08 -0700 Subject: [PATCH 04/16] get fullname from metacat chart or provide in values --- helm/templates/_helpers.tpl | 23 ++++++++++++++++++++--- helm/values.yaml | 12 ++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index 3bad3fdb..44fdc6d7 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -61,6 +61,20 @@ Create the name of the service account to use {{- end }} {{- end }} +{{/* +Check to see if '.Values.global "dataone-indexer.enabled' is set to true in the top-level metacat +chart. If so, we know we can get the output from the metacat chart's 'metacat.fullname' template. +If we're not running as a sub-chart, then we need to read the user-provided value from +.Values.idxworker.metacatK8sFullName +*/}} +{{- define "get.metacat.fullname" -}} +{{- if (index .Values.global "dataone-indexer.enabled") }} +{{- include "metacat.fullname" . -}} +{{- else }} +{{- default "MISSING-idxworker.metacatK8sFullName-MISSING" .Values.idxworker.metacatK8sFullName }} +{{- end }} +{{- end }} + {{/* set MN url If we're running as a subchart, can use direct access without needing to go through ingress/https; @@ -71,7 +85,8 @@ If connecting to an instance outside the cluster, should use https; {{- define "idxworker.mn.url" -}} {{- $mn_url := .Values.idxworker.mn_url }} {{- if not $mn_url }} -{{- $mn_url = printf "http://%s-hl:8080/%s/d1/mn" (include "idxworker.fullname" .) .Values.global.metacatAppContext }} +{{- $fullname := (include "get.metacat.fullname" .) }} +{{- $mn_url = printf "http://%s-hl:8080/%s/d1/mn" $fullname .Values.global.metacatAppContext }} {{- end }} {{- $mn_url }} {{- end }} @@ -79,12 +94,14 @@ If connecting to an instance outside the cluster, should use https; {{/* set Claim Name of existing PVC to use (typically the volume that is shared with metacat) Either use the value set in .Values.persistence.claimName, or if blank, autopopulate with - {podname}-metacat-{releaseName}-0 (e.g. metacatbrooke-metacat-metacatbrooke-metacat-0) + {podname}-metacat-{fullName}-0 (e.g. metacatbrooke-metacat-metacatbrooke-metacat-0) + (see 'idxworker.fullname' for logic behind how a 'fullname' is defined) */}} {{- define "idxworker.shared.claimName" -}} {{- $claimName := .Values.persistence.claimName }} {{- if not $claimName }} -{{- $claimName = printf "%s-metacat-%s-0" .Release.Name (include "idxworker.fullname" .) }} +{{- $fullname := (include "get.metacat.fullname" .) }} +{{- $claimName = printf "%s-metacat-%s-0" .Release.Name $fullname }} {{- end }} {{- $claimName }} {{- end }} diff --git a/helm/values.yaml b/helm/values.yaml index 9d325e07..50926b05 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,6 +4,9 @@ global: solrPort: &global-solr-port 8983 + + ## @param global.metacatAppContext The application context used by the metacat installation + ## metacatAppContext: metacat ## @param global.storageClass default name of the storageClass to use for PVs @@ -109,6 +112,15 @@ persistence: idxworker: debug: "FALSE" + ## @param idxworker.metacatK8sFullName ignored if deployed as subchart, else use metacat.fullname + ## If deployed as a subchart, metacatK8sFullName will be ignored, and metacat.fullname will be + ## retrieved automatically from the top-level metacat chart. If this not a subchart, set + ## metacatK8sFullName to reflect the k8s "fullname" of the metacat installation being indexed. + ## Note there is some tricky logic involved in deciding what the fullname should be - see + ## "idxworker.fullname" in templates/_helpers.tpl, as an example. + ## + metacatK8sFullName: "" + ## @param idxworker.mn_url URL of the metacat instance that depends upon this indexer ## Leave this value unset (mn_url: "") to have it automatically populated ## From 14271657686d0edeaa5472d7f0e77df006b6f120 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Tue, 7 May 2024 19:39:49 -0700 Subject: [PATCH 05/16] fixed fullname --- helm/templates/_helpers.tpl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl index 44fdc6d7..c0fbcbd5 100644 --- a/helm/templates/_helpers.tpl +++ b/helm/templates/_helpers.tpl @@ -63,13 +63,17 @@ Create the name of the service account to use {{/* Check to see if '.Values.global "dataone-indexer.enabled' is set to true in the top-level metacat -chart. If so, we know we can get the output from the metacat chart's 'metacat.fullname' template. +chart. If so, we know we're running as a subchart, and can infer the 'metacat.fullname'. If we're not running as a sub-chart, then we need to read the user-provided value from .Values.idxworker.metacatK8sFullName */}} {{- define "get.metacat.fullname" -}} {{- if (index .Values.global "dataone-indexer.enabled") }} -{{- include "metacat.fullname" . -}} +{{- if contains "metacat" (lower .Release.Name) }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-metacat" .Release.Name | trunc 63 | trimSuffix "-" }} +{{- end }} {{- else }} {{- default "MISSING-idxworker.metacatK8sFullName-MISSING" .Values.idxworker.metacatK8sFullName }} {{- end }} From 6333d0391ca29e98dd7483da44a657b77bc4f523 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Wed, 8 May 2024 13:32:33 -0700 Subject: [PATCH 06/16] roll subcharts back to orig --- helm/Chart.lock | 6 +++--- helm/Chart.yaml | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/helm/Chart.lock b/helm/Chart.lock index b03a921f..8b51d1f0 100644 --- a/helm/Chart.lock +++ b/helm/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: rabbitmq repository: https://charts.bitnami.com/bitnami - version: 14.1.0 + version: 10.1.14 - name: solr repository: https://charts.bitnami.com/bitnami version: 6.2.3 -digest: sha256:2d4c537383443f6a46dc8c4aa9d3967bad13cc8ac290e22abc3e7850e7c6f464 -generated: "2024-05-06T17:40:27.189768-07:00" +digest: sha256:8a0c7f616956207f7a5161ec1f5f3b58c432b8c8051ad4ef927dacee81c52be9 +generated: "2022-10-26T16:58:14.484158-08:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 32241160..93e019e3 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -33,9 +33,7 @@ appVersion: "3.0.0" dependencies: - name: rabbitmq repository: https://charts.bitnami.com/bitnami - # version: 10.1.14 # rabbitmq version 3.10.5 is deployed by chart version 10.1.14 - # version: 10.1.19 # rabbitmq version 3.10.7 is deployed by chart version 10.1.19 - version: 14.1.0 # rabbitmq version 3.13.1 is deployed by chart version 14.1.0 + version: 10.1.14 # rabbitmq version 3.10.5 is deployed by chart version 10.1.14 condition: rabbitmq.enabled, global.rabbitmq.enabled - name: solr repository: https://charts.bitnami.com/bitnami From a725b49d401ec0315c04e8f7ce935d612358bf6f Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Thu, 9 May 2024 09:55:34 -0700 Subject: [PATCH 07/16] change app version to 3.0.1-SNAPSHOT --- helm/Chart.yaml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 93e019e3..db57698f 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -27,7 +27,7 @@ version: 1.0.1-develop # 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" +appVersion: "3.0.1-SNAPSHOT" # Chart dependencies dependencies: diff --git a/pom.xml b/pom.xml index 8f75537e..11f7aede 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.dataone dataone-index-worker - 3.0.0 + 3.0.1-SNAPSHOT jar dataone-index-worker http://maven.apache.org From 92a36da0ad938847836f87e45fd61e72fb0e935d Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Thu, 9 May 2024 14:17:00 -0700 Subject: [PATCH 08/16] fix probe command --- helm/templates/deployment.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index fa2859d1..ed5fae40 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -56,8 +56,15 @@ spec: command: - /bin/sh - -c - - test $(($(date +%s) - $(stat -f %m /var/lib/dataone-indexer/livenessprobe))) -lt 20 + - test $(($(date +%s) - $(stat -c %Y /var/lib/dataone-indexer/livenessprobe))) -lt 20 initialDelaySeconds: 20 + periodSeconds: 15 + readinessProbe: + exec: + command: + - /bin/sh + - -c + - test $(($(date +%s) - $(stat -c %Y /var/lib/dataone-indexer/livenessprobe))) -lt 20 periodSeconds: 10 resources: {{- toYaml .Values.resources | nindent 12 }} From 54b19445d6216b445e5f2e35b85f3ab328cd4ad6 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Thu, 9 May 2024 14:17:36 -0700 Subject: [PATCH 09/16] exit app if unrecoverable exception thrown --- .../java/org/dataone/cn/indexer/IndexWorker.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/dataone/cn/indexer/IndexWorker.java b/src/main/java/org/dataone/cn/indexer/IndexWorker.java index d7a8b2c4..1cbcab65 100644 --- a/src/main/java/org/dataone/cn/indexer/IndexWorker.java +++ b/src/main/java/org/dataone/cn/indexer/IndexWorker.java @@ -102,17 +102,19 @@ public class IndexWorker { /** * Commandline main for the IndexWorker to be started. - * @param args - * @throws TimeoutException - * @throws IOException - * @throws ServiceFailure + * @param args (not used -- command line args) */ - public static void main(String[] args) throws IOException, TimeoutException, ServiceFailure { + public static void main(String[] args) { logger.info("IndexWorker.main - Starting index worker..."); String propertyFile = null; loadExternalPropertiesFile(propertyFile); - IndexWorker worker = new IndexWorker(); - worker.start(); + try { + IndexWorker worker = new IndexWorker(); + worker.start(); + } catch (Exception e) { + logger.fatal("IndexWorker.main() exiting due to fatal error: " + e.getMessage(), e); + System.exit(1); + } startLivenessProbe(); } From 2fbc75bf7b65beebd7c53125d10386861efb10e6 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Thu, 9 May 2024 14:38:36 -0700 Subject: [PATCH 10/16] remove readiness probe --- helm/templates/deployment.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index ed5fae40..8f909208 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -59,13 +59,6 @@ spec: - test $(($(date +%s) - $(stat -c %Y /var/lib/dataone-indexer/livenessprobe))) -lt 20 initialDelaySeconds: 20 periodSeconds: 15 - readinessProbe: - exec: - command: - - /bin/sh - - -c - - test $(($(date +%s) - $(stat -c %Y /var/lib/dataone-indexer/livenessprobe))) -lt 20 - periodSeconds: 10 resources: {{- toYaml .Values.resources | nindent 12 }} volumeMounts: From 341b83302b17feb181e323f022c82cec4ce100e6 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 13 May 2024 14:58:41 -0700 Subject: [PATCH 11/16] bump rmq amqp client to 5.21.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 11f7aede..db1546bc 100644 --- a/pom.xml +++ b/pom.xml @@ -249,7 +249,7 @@ com.rabbitmq amqp-client - 5.14.2 + 5.21.0 org.apache.logging.log4j From c9bdd92d8f4cdc70da90a358a208a760a3f1d961 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:59:35 -0700 Subject: [PATCH 12/16] move .Values.idxworker.cn_url to .Values.global.d1ClientCnUrl --- helm/config/dataone-indexer.properties | 2 +- helm/values.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/config/dataone-indexer.properties b/helm/config/dataone-indexer.properties index 5d26400d..c51ce0aa 100644 --- a/helm/config/dataone-indexer.properties +++ b/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 diff --git a/helm/values.yaml b/helm/values.yaml index 50926b05..182f1fd0 100644 --- a/helm/values.yaml +++ b/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 ## From 54667a90c73b5b0951e41a28926e59656c4d1c6a Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:29:15 -0700 Subject: [PATCH 13/16] chart 1.0.1 --- helm/Chart.lock | 2 +- helm/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/Chart.lock b/helm/Chart.lock index 8b51d1f0..511a6eec 100644 --- a/helm/Chart.lock +++ b/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" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index db57698f..0029a2aa 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -21,7 +21,7 @@ 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.1 # 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 From b3bb65115baf5c246ab473f2121b9907f94de2a2 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:06:59 -0700 Subject: [PATCH 14/16] set version --- helm/Chart.yaml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 0029a2aa..f54df6eb 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -27,7 +27,7 @@ version: 1.0.1 # 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.1" # Chart dependencies dependencies: diff --git a/pom.xml b/pom.xml index db1546bc..ac8e6aa6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.dataone dataone-index-worker - 3.0.1-SNAPSHOT + 3.0.1 jar dataone-index-worker http://maven.apache.org From 2e39cb12838c6560762f8c7f47f1a5d5100665e5 Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:12:27 -0700 Subject: [PATCH 15/16] add release notes --- README.md | 2 ++ RELEASE-NOTES.md | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 RELEASE-NOTES.md diff --git a/README.md b/README.md index f30579b0..7e1a5ce1 100644 --- a/README.md +++ b/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: diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md new file mode 100644 index 00000000..f1e13ec1 --- /dev/null +++ b/RELEASE-NOTES.md @@ -0,0 +1,19 @@ +# dataone-indexer Release Notes + +## 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 + +## dataone-indexer version 3.0.0 & helm chart version 1.0.0 + +* Release date: 2024-04-30 +* helm chart version 1.0.0 -- first release of helm chart +* dataone-indexer version 3.0.0 -- first release of dataone-indexer From 5ece631daf41832222f1baa3ee55c31c7b8156ee Mon Sep 17 00:00:00 2001 From: Matthew B <106352182+artntek@users.noreply.github.com> Date: Mon, 8 Jul 2024 17:40:26 -0700 Subject: [PATCH 16/16] corrected 3.0.0 date --- RELEASE-NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index f1e13ec1..309d3a5c 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -14,6 +14,6 @@ ## dataone-indexer version 3.0.0 & helm chart version 1.0.0 -* Release date: 2024-04-30 +* 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