Change jmx-exporter and fix errors (#36)

skyoo2003 · Feb 21, 2021 · a67e3af · a67e3af
1 parent acd4480
commit a67e3af
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/charts/digdag/Chart.yaml b/charts/digdag/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: digdag
 description: A Helm chart for Digdag
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: 0.10.0
 dependencies:
   - condition: postgresql-ha.enabled
@@ -26,13 +26,15 @@ annotations:
   category: Workflow
   # https://artifacthub.io/docs/topics/annotations/helm/
   artifacthub.io/changes: |
-    - Upgrade Digdag application version
+    - Change prometheus jmx exporter image
+    - Fix job-migrator error
+    - Restore digdag replicaCount
   artifacthub.io/containsSecurityUpdates: "false"
   artifacthub.io/images: |
     - name: digdag
       image: ghcr.io/skyoo2003/digdag:0.0.1
     - name: wait-for-it
       image: willwill/wait-for-it:latest
-    - name: jmx-prometheus-exporter
-      image: sscaling/jmx-prometheus-exporter:0.12.0
+    - name: prometheus-jmx-exporter
+      image: ghcr.io/skyoo2003/prometheus-jmx-exporter:0.0.1
   artifacthub.io/license: MIT
diff --git a/charts/digdag/README.md b/charts/digdag/README.md
@@ -44,7 +44,7 @@ The following table lists configurable parameters, their descriptions, and their
 | image.pullPolicy | Image pull policy. | IfNotPresent |
 | image.command | Image entrypoint. | nil |
 | image.args | Image entrypoint's arguments. | ["server", "--config", "/digdag/config/digdag.properties"] |
-| replicaCount | Number of Digdag replicas to deploy. | 3 |
+| replicaCount | Number of Digdag replicas to deploy. | 2 |
 | updateStrategy | Update strategy to deploy. See [link](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy) for details. | {type: RollingUpdate} |
 | terminationGracePeriodSeconds | Duration in seconds a Digdag pod needs to terminate gracefully. | 30 |
 | shareProcessNamespace | Whether to share process namespace for pods | false |

diff --git a/charts/digdag/templates/deployment.yaml b/charts/digdag/templates/deployment.yaml
@@ -134,16 +134,16 @@ spec:
         {{- end }}
         volumeMounts:
         - name: jmx-exporter-config
-          mountPath: /opt/jmx_exporter/config.yml
-          subPath: config.yml
+          mountPath: /exporter/config
+          readOnly: true
       {{- end }}
       {{- if .Values.sidecars }}
         {{- tpl (toYaml .Values.sidecars | nindent 6) . }}
       {{- end }}
       volumes:
       - name: digdag
         configMap:
-          name: {{ include "digdag.fullname" .}}
+          name: {{ include "digdag.fullname" . }}
       {{- if and .Values.metrics.enabled .Values.jmx.enabled }}
       - name: jmx-exporter-config
         configMap:

diff --git a/charts/digdag/templates/job-migrator.yaml b/charts/digdag/templates/job-migrator.yaml
@@ -46,12 +46,12 @@ spec:
         - "migrate"
         - "run"
         - "--config"
-        - "/opt/etc/digdag/server.properties"
+        - "/digdag/config/digdag.properties"
         volumeMounts:
         - name: digdag
-          mountPath: /opt/etc/digdag
+          mountPath: /digdag/config
           readOnly: true
       volumes:
       - name: digdag
         configMap:
-          name: {{ include "digdag.fullname" .}}
+          name: {{ include "digdag.fullname" . }}
diff --git a/charts/digdag/values.yaml b/charts/digdag/values.yaml
@@ -30,7 +30,7 @@ image:
 
 ## Number of Digdag replicas to deploy
 ##
-replicaCount: 3
+replicaCount: 2
 
 ## Update strategy to deploy
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
@@ -244,8 +244,8 @@ metrics:
   enabled: false
 
   image:
-    repository: docker.io/sscaling/jmx-prometheus-exporter
-    tag: 0.12.0
+    repository: ghcr.io/skyoo2003/prometheus-jmx-exporter
+    tag: 0.0.1
     pullPolicy: IfNotPresent
 
   ## JMX exporter configuration