Merge pull request #217 from ethersphere/bump

charts: bump version
ethersphere · Oct 3, 2024 · 9c68af2 · 9c68af2
2 parents 21117e5 + a7aeb61
commit 9c68af2
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 32 deletions.
diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: 2.2.0
 name: bee
-version: 0.16.4
+version: 0.16.5
 kubeVersion: ">=1.19.0-0"
 description: Ethereum Swarm Bee Helm chart for Kubernetes
 home: https://www.ethswarm.org

diff --git a/charts/bee/values.yaml b/charts/bee/values.yaml
@@ -4,7 +4,7 @@
 
 image:
   repository: ethersphere/bee
-  tag: 1.6.0
+  tag: 2.2.0
   # digest: sha256:508a6bc1d3f45acaf98b746d521ee2cb11a895d8334446d2205fe4053b9e3667
   pullPolicy: IfNotPresent
 
@@ -253,7 +253,7 @@ gatewayProxy:
   enabled: false
   image:
     repository: ethersphere/gateway-proxy
-    tag: 0.15.0
+    tag: 0.16.0
     # digest: sha256:508a6bc1d3f45acaf98b746d521ee2cb11a895d8334446d2205fe4053b9e3667
     pullPolicy: IfNotPresent
   ## If enabled, creates ingress for HTTP

diff --git a/charts/ethexporter/Chart.yaml b/charts/ethexporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: latest
 name: ethexporter
-version: 0.2.0
+version: 0.2.1
 description: ETHexporter Helm chart for Kubernetes
 home: https://www.ethswarm.org
 icon: https://docs.ethswarm.org/img/swarm-logo-2.svg

diff --git a/charts/ethexporter/ci/ct-values.yaml b/charts/ethexporter/ci/ct-values.yaml
@@ -0,0 +1,11 @@
+serviceMonitor:
+  enabled: false
+
+addressesTxt:
+  enabled: true
+  addresses: |
+    bittrex:0xFBb1b73C4f0BDa4f67dcA266ce6Ef42f520fBB98:github
+    etherdelta:0x8d12A197cB00D4747a1fe03395095ce2A5CC6819:github
+
+ethexporter:
+  gethEndpoint: https://xdai.fairdatasociety.org
diff --git a/charts/ethexporter/templates/config-addresses.yaml b/charts/ethexporter/templates/config-addresses.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.addressesTxt.enabled }}
-{{- if not .Values.addressesTxt.existingConfigMap }}
+{{- if .Values.addressesTxt.addresses  }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -9,6 +9,7 @@ metadata:
   labels:
     {{- include "ethexporter.labels" . | nindent 4 }}
 data:
-  addresses.txt: {{ .Values.addressesTxt.addresses | quote }}
+  addresses.txt: |
+{{ .Values.addressesTxt.addresses | indent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/ethexporter/templates/deployment.yaml b/charts/ethexporter/templates/deployment.yaml
@@ -43,21 +43,24 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if .Values.addressesTxt.enabled }}
           volumeMounts:
-            - name: addresses
+            - name: addresses-volume
               mountPath: /app/addresses.txt
               subPath: addresses.txt
           {{- end }}
           command:
             - ethexporter
       {{- if .Values.addressesTxt.enabled }}
       volumes:
-        - name: addresses
+        - name: addresses-volume
           configMap:
-            name: {{- if .Values.addressesTxt.existingConfigMap  }}
-                    {{ .Values.addressesTxt.existingConfigMap }}
-                  {{- else -}}
-                    {{ template "ethexporter.fullname" . }}-addresses
-                  {{- end }}
+          {{- if not .Values.addressesTxt.addresses  }}
+            name: {{ .Values.addressesTxt.existingConfigMap }}
+          {{- else }}
+            name: {{ include "ethexporter.fullname" . }}-addresses
+            items:
+            - key: addresses.txt
+              path: addresses.txt
+          {{- end }}
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/ethexporter/values.yaml b/charts/ethexporter/values.yaml
@@ -14,9 +14,9 @@ ethexporter:
 addressesTxt:
   enabled: true
   existingConfigMap: "balance-addresses"
-    #addresses: |
-    #  etherdelta:0x8d12A197cB00D4747a1fe03395095ce2A5CC6819
-    #  bittrex:0xFBb1b73C4f0BDa4f67dcA266ce6Ef42f520fBB98
+  # addresses: |
+  #   etherdelta:0x8d12A197cB00D4747a1fe03395095ce2A5CC6819
+  #   bittrex:0xFBb1b73C4f0BDa4f67dcA266ce6Ef42f520fBB98
 
 replicaCount: 1
 

diff --git a/charts/tokenexporter/Chart.yaml b/charts/tokenexporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: latest
 name: tokenexporter
-version: 0.2.0
+version: 0.2.1
 description: Tokenexporter Helm chart for Kubernetes
 home: https://www.ethswarm.org
 icon: https://docs.ethswarm.org/img/swarm-logo-2.svg

diff --git a/charts/tokenexporter/ci/ct-values.yaml b/charts/tokenexporter/ci/ct-values.yaml
@@ -0,0 +1,11 @@
+serviceMonitor:
+  enabled: false
+
+addressesTxt:
+  enabled: true
+  addresses: |
+    bittrex:0xFBb1b73C4f0BDa4f67dcA266ce6Ef42f520fBB98:github
+    etherdelta:0x8d12A197cB00D4747a1fe03395095ce2A5CC6819:github
+
+tokenexporter:
+  gethEndpoint: https://xdai.fairdatasociety.org
diff --git a/charts/tokenexporter/templates/config-addresses.yaml b/charts/tokenexporter/templates/config-addresses.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.addressesTxt.enabled }}
-{{- if not .Values.addressesTxt.existingConfigMap }}
+{{- if .Values.addressesTxt.addresses }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -9,6 +9,7 @@ metadata:
   labels:
     {{- include "tokenexporter.labels" . | nindent 4 }}
 data:
-  addresses.txt: {{ .Values.addressesTxt.addresses | quote }}
+  addresses.txt: |
+{{ .Values.addressesTxt.addresses | indent 4 }}
 {{- end }}
 {{- end }}
diff --git a/charts/tokenexporter/templates/deployment.yaml b/charts/tokenexporter/templates/deployment.yaml
@@ -44,31 +44,34 @@ spec:
           {{- if or .Values.addressesTxt.enabled .Values.tokensJson.enabled }}
           volumeMounts:
             {{- if .Values.addressesTxt.enabled }}
-            - name: addresses
+            - name: addresses-volume
               mountPath: /app/addresses.txt
               subPath: addresses.txt
             {{- end }}
             {{- if .Values.tokensJson.enabled }}
-            - name: tokens
+            - name: tokens-volume
               mountPath: /app/tokens-list.json
               subPath: tokens-list.json
             {{- end }}
-          {{- end }}
           command:
             - tokenexporter
+          {{- end }}
       {{- if or .Values.addressesTxt.enabled .Values.tokensJson.enabled }}
       volumes:
         {{- if .Values.addressesTxt.enabled }}
-        - name: addresses
+        - name: addresses-volume
           configMap:
-            name: {{- if .Values.addressesTxt.existingConfigMap }}
-                    {{ .Values.addressesTxt.existingConfigMap }}
-                  {{- else -}}
-                    {{ template "tokenexporter.fullname" . }}-addresses
-                  {{- end }}
+          {{- if not .Values.addressesTxt.addresses  }}
+            name: {{ .Values.addressesTxt.existingConfigMap }}
+          {{- else }}
+            name: {{ include "tokenexporter.fullname" . }}-addresses
+            items:
+            - key: addresses.txt
+              path: addresses.txt
+          {{- end }}
         {{- end }}
         {{- if .Values.tokensJson.enabled }}
-        - name: tokens
+        - name: tokens-volume
           configMap:
             name: {{ include "tokenexporter.fullname" . }}-tokens
         {{- end }}

diff --git a/charts/tokenexporter/values.yaml b/charts/tokenexporter/values.yaml
@@ -14,9 +14,9 @@ tokenexporter:
 addressesTxt:
   enabled: true
   existingConfigMap: "balance-addresses"  # Name of the existing ConfigMap
-    #addresses: |
-    #  bittrex:0xFBb1b73C4f0BDa4f67dcA266ce6Ef42f520fBB98
-    #  etherdelta:0x8d12A197cB00D4747a1fe03395095ce2A5CC6819
+  # addresses: |
+  #   bittrex:0xFBb1b73C4f0BDa4f67dcA266ce6Ef42f520fBB98
+  #   etherdelta:0x8d12A197cB00D4747a1fe03395095ce2A5CC6819
 
 tokensJson:
   enabled: true