From fd91ffd39e5314f3026cd0dd142a4a4ed73249da Mon Sep 17 00:00:00 2001 From: Ljubisa Date: Thu, 28 Nov 2024 13:11:13 +0100 Subject: [PATCH 1/4] feat(beekeeper): add 'config-git-dir' env --- charts/beekeeper/templates/cronjob.yaml | 2 ++ charts/beekeeper/templates/job.yaml | 4 ++++ charts/beekeeper/values.yaml | 22 ++++++++++++---------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/charts/beekeeper/templates/cronjob.yaml b/charts/beekeeper/templates/cronjob.yaml index 30a4864..ebfda27 100644 --- a/charts/beekeeper/templates/cronjob.yaml +++ b/charts/beekeeper/templates/cronjob.yaml @@ -39,6 +39,8 @@ spec: value: "true" - name: BEEKEEPER_CONFIG_GIT_REPO value: "{{ .Values.config.CONFIG_GIT_REPO }}" + - name: BEEKEEPER_CONFIG_GIT_DIR + value: "{{ .Values.config.CONFIG_GIT_DIR }}" - name: BEEKEEPER_CONFIG_GIT_BRANCH value: "{{ .Values.config.CONFIG_GIT_BRANCH }}" - name: BEEKEEPER_GETH_URL diff --git a/charts/beekeeper/templates/job.yaml b/charts/beekeeper/templates/job.yaml index e295af3..d66e4db 100644 --- a/charts/beekeeper/templates/job.yaml +++ b/charts/beekeeper/templates/job.yaml @@ -32,6 +32,8 @@ spec: value: "true" - name: BEEKEEPER_CONFIG_GIT_REPO value: "{{ .Values.config.CONFIG_GIT_REPO }}" + - name: BEEKEEPER_CONFIG_GIT_DIR + value: "{{ .Values.config.CONFIG_GIT_DIR }}" - name: BEEKEEPER_CONFIG_GIT_BRANCH value: "{{ .Values.config.CONFIG_GIT_BRANCH }}" - name: BEEKEEPER_GETH_URL @@ -61,6 +63,8 @@ spec: value: "true" - name: BEEKEEPER_CONFIG_GIT_REPO value: "{{ .Values.config.CONFIG_GIT_REPO }}" + - name: BEEKEEPER_CONFIG_GIT_DIR + value: "{{ .Values.config.CONFIG_GIT_DIR }}" - name: BEEKEEPER_CONFIG_GIT_BRANCH value: "{{ .Values.config.CONFIG_GIT_BRANCH }}" - name: BEEKEEPER_GETH_URL diff --git a/charts/beekeeper/values.yaml b/charts/beekeeper/values.yaml index a9096a4..93e8ec6 100644 --- a/charts/beekeeper/values.yaml +++ b/charts/beekeeper/values.yaml @@ -4,8 +4,8 @@ image: pullPolicy: IfNotPresent imagePullSecrets: [] -nameOverride: '' -fullnameOverride: '' +nameOverride: "" +fullnameOverride: "" serviceAccount: ## Specifies whether a service account should be created @@ -17,7 +17,8 @@ serviceAccount: createRole: false createClusterRole: false -resources: {} +resources: + {} ## If you do want to specify resources, uncomment the following ## lines, adjust them as necessary, and remove the curly braces after 'resources:'. # limits: @@ -30,21 +31,22 @@ resources: {} nodeSelector: {} config: - command: ['beekeeper', 'check'] + command: ["beekeeper", "check"] parallelism: 1 - dirPath: 'files' + dirPath: "files" # environment variables - CONFIG_GIT_REPO: '' + CONFIG_GIT_REPO: "" + CONFIG_GIT_DIR: "" CONFIG_GIT_BRANCH: main GETH_URL: http://geth-swap.geth-swap.staging.internal - BZZ_TOKEN_ADDRESS: '0x6aab14fe9cccd64a502d23842d916eb5321c26e7' - ETH_ACCOUNT: '0x62cab2b3b55f341f10348720ca18063cdb779ad5' + BZZ_TOKEN_ADDRESS: "0x6aab14fe9cccd64a502d23842d916eb5321c26e7" + ETH_ACCOUNT: "0x62cab2b3b55f341f10348720ca18063cdb779ad5" # if singleRun is enabled cron job settings will be omitted # job singleRun: false backoffLimit: 0 # cron job - schedule: '*/1 * * * *' + schedule: "*/1 * * * *" successfulJobsHistoryLimit: 3 failedJobsHistoryLimit: 3 concurrencyPolicy: Forbid @@ -52,4 +54,4 @@ config: # for cluster to be up and operational initPing: enabled: false - clusterName: '' + clusterName: "" From c10c0319d43c46665f720803a602c9dfe704126d Mon Sep 17 00:00:00 2001 From: Ljubisa Date: Thu, 28 Nov 2024 13:13:00 +0100 Subject: [PATCH 2/4] chore(beekeeper): bump version to 0.4.7 --- charts/beekeeper/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/beekeeper/Chart.yaml b/charts/beekeeper/Chart.yaml index a48924a..1682248 100644 --- a/charts/beekeeper/Chart.yaml +++ b/charts/beekeeper/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 appVersion: latest name: beekeeper -version: 0.4.6 +version: 0.4.7 description: Ethereum Swarm Beekeeper Helm chart for Kubernetes home: https://www.ethswarm.org icon: https://docs.ethswarm.org/img/swarm-logo-2.svg From 74eb4a0a5a0df1fe0aa07bbd3df78f4e74adf8a3 Mon Sep 17 00:00:00 2001 From: Ljubisa Date: Thu, 28 Nov 2024 14:16:51 +0100 Subject: [PATCH 3/4] docs(beekeeper): improve comments for resources section --- charts/beekeeper/values.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/charts/beekeeper/values.yaml b/charts/beekeeper/values.yaml index 93e8ec6..e60bb3b 100644 --- a/charts/beekeeper/values.yaml +++ b/charts/beekeeper/values.yaml @@ -17,16 +17,17 @@ serviceAccount: createRole: false createClusterRole: false -resources: - {} - ## If you do want to specify resources, uncomment the following - ## lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 1 - # memory: 1Gi - # requests: - # cpu: 100m - # memory: 128Mi +## If you want to specify resource requests and limits, remove the curly braces ({}) and define the values as shown below: +## This ensures proper allocation of CPU and memory resources. +## Example: +# resources: +# limits: +# cpu: "1" # Maximum CPU usage (e.g., 1 core) +# memory: "1Gi" # Maximum memory usage (e.g., 1 GiB) +# requests: +# cpu: "100m" # Minimum guaranteed CPU usage (e.g., 100 millicores) +# memory: "128Mi" # Minimum guaranteed memory usage (e.g., 128 MiB) +resources: {} nodeSelector: {} From b28a4b27f485c8dcd311bc381522ee390030a6fa Mon Sep 17 00:00:00 2001 From: Ljubisa Date: Thu, 28 Nov 2024 14:20:51 +0100 Subject: [PATCH 4/4] docs(beekeeper): improve comments for resources section --- charts/beekeeper/values.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/charts/beekeeper/values.yaml b/charts/beekeeper/values.yaml index e60bb3b..d8ee130 100644 --- a/charts/beekeeper/values.yaml +++ b/charts/beekeeper/values.yaml @@ -17,15 +17,14 @@ serviceAccount: createRole: false createClusterRole: false -## If you want to specify resource requests and limits, remove the curly braces ({}) and define the values as shown below: -## This ensures proper allocation of CPU and memory resources. +## Define resource requests and limits to allocate CPU and memory effectively. ## Example: # resources: # limits: -# cpu: "1" # Maximum CPU usage (e.g., 1 core) -# memory: "1Gi" # Maximum memory usage (e.g., 1 GiB) +# cpu: "1" # Maximum CPU usage (e.g., 1 core) +# memory: "1Gi" # Maximum memory usage (e.g., 1 GiB) # requests: -# cpu: "100m" # Minimum guaranteed CPU usage (e.g., 100 millicores) +# cpu: "100m" # Minimum guaranteed CPU usage (e.g., 100 millicores) # memory: "128Mi" # Minimum guaranteed memory usage (e.g., 128 MiB) resources: {}