From 2cb6d89dc71fe0fd39eb682b5dd4ca43e4f28cd1 Mon Sep 17 00:00:00 2001 From: darkobas Date: Thu, 3 Oct 2024 12:09:15 +0200 Subject: [PATCH] charts: bump version exporters: add ci bee: change default image --- charts/bee/Chart.yaml | 2 +- charts/bee/values.yaml | 4 ++-- charts/ethexporter/Chart.yaml | 2 +- charts/ethexporter/ci/ct-values.yaml | 11 +++++++++++ charts/ethexporter/templates/config-addresses.yaml | 5 +++-- charts/ethexporter/templates/deployment.yaml | 10 +++++----- charts/ethexporter/values.yaml | 6 +++--- charts/tokenexporter/Chart.yaml | 2 +- charts/tokenexporter/ci/ct-values.yaml | 11 +++++++++++ charts/tokenexporter/templates/config-addresses.yaml | 5 +++-- charts/tokenexporter/templates/deployment.yaml | 10 +++++----- charts/tokenexporter/values.yaml | 6 +++--- 12 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 charts/ethexporter/ci/ct-values.yaml create mode 100644 charts/tokenexporter/ci/ct-values.yaml diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml index 53fe624..b852114 100644 --- 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 index 24f5d00..d41a660 100644 --- 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 index b72bbef..00e0d14 100644 --- 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 new file mode 100644 index 0000000..40a0f0d --- /dev/null +++ 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://rpc.gnosischain.com diff --git a/charts/ethexporter/templates/config-addresses.yaml b/charts/ethexporter/templates/config-addresses.yaml index bbdee0b..ef9c7ed 100644 --- 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 index 0d2c1d8..baf66dd 100644 --- a/charts/ethexporter/templates/deployment.yaml +++ b/charts/ethexporter/templates/deployment.yaml @@ -53,11 +53,11 @@ spec: volumes: - name: addresses 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 + {{- end }} {{- end }} {{- with .Values.nodeSelector }} nodeSelector: diff --git a/charts/ethexporter/values.yaml b/charts/ethexporter/values.yaml index da43972..84db7f2 100644 --- 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 index 235c3bb..ca5a64b 100644 --- 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 new file mode 100644 index 0000000..d1e059f --- /dev/null +++ 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://rpc.gnosischain.com diff --git a/charts/tokenexporter/templates/config-addresses.yaml b/charts/tokenexporter/templates/config-addresses.yaml index 5b8e2d9..521d34f 100644 --- 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 index d2ce888..35ecdff 100644 --- a/charts/tokenexporter/templates/deployment.yaml +++ b/charts/tokenexporter/templates/deployment.yaml @@ -61,11 +61,11 @@ spec: {{- if .Values.addressesTxt.enabled }} - name: addresses 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 + {{- end }} {{- end }} {{- if .Values.tokensJson.enabled }} - name: tokens diff --git a/charts/tokenexporter/values.yaml b/charts/tokenexporter/values.yaml index ecfaea4..41683af 100644 --- 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