From 8847929bad600d876522ff5d00995de7d3a53736 Mon Sep 17 00:00:00 2001 From: Luke Hackett Date: Tue, 13 Aug 2024 03:14:34 +0100 Subject: [PATCH 1/3] Remove jaeger address default (#49) --- charts/charon/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/charon/values.yaml b/charts/charon/values.yaml index e5d0fe3..ab005e3 100644 --- a/charts/charon/values.yaml +++ b/charts/charon/values.yaml @@ -161,7 +161,7 @@ config: featureSetEnable: "" # -- Listening address for jaeger tracing. - jaegerAddress: "jaeger:6831" + jaegerAddress: "" # -- Service name used for jaeger tracing. (default "charon") jaegerService: "charon" @@ -303,4 +303,4 @@ centralMonitoring: promEndpoint: "https://vm.monitoring.gcp.obol.tech/write" # -- The authentication token to the central prometheus token: "" - \ No newline at end of file + From 2a4ac348af9bf52257014314ea6bef9ba0c350eb Mon Sep 17 00:00:00 2001 From: Sukhendu <19183308+sugh01@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:17:25 +0200 Subject: [PATCH 2/3] Update to v1.1.1 (#54) * Update to v1.1.1 * fixing README.md --------- Co-authored-by: apham0001 --- charts/charon-cluster/Chart.yaml | 4 ++-- charts/charon-cluster/README.md | 4 ++-- charts/charon-cluster/values.yaml | 2 +- charts/charon/Chart.yaml | 4 ++-- charts/charon/README.md | 6 +++--- charts/charon/values.yaml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/charon-cluster/Chart.yaml b/charts/charon-cluster/Chart.yaml index 88fdda1..a56b982 100644 --- a/charts/charon-cluster/Chart.yaml +++ b/charts/charon-cluster/Chart.yaml @@ -29,10 +29,10 @@ 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: 0.2.3 +version: 0.2.4 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0" +appVersion: "1.1.1" diff --git a/charts/charon-cluster/README.md b/charts/charon-cluster/README.md index 4293c47..daeffc8 100755 --- a/charts/charon-cluster/README.md +++ b/charts/charon-cluster/README.md @@ -2,7 +2,7 @@ Charon Cluster =========== -![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) +![Version: 0.2.4](https://img.shields.io/badge/Version-0.2.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square) Charon is an open-source Ethereum Distributed validator middleware written in golang. This chart deploys a full Charon cluster. @@ -52,7 +52,7 @@ Charon is an open-source Ethereum Distributed validator middleware written in go | config.validatorApiAddress | string | `"0.0.0.0:3600"` | Listening address (ip and port) for validator-facing traffic proxying the beacon-node API. (default "127.0.0.1:3600") | | containerSecurityContext | object | See `values.yaml` | The security context for containers | | fullnameOverride | string | `""` | Provide a name to substitute for the full names of resources | -| image | object | `{"pullPolicy":"IfNotPresent","repository":"obolnetwork/charon","tag":"v1.0.0"}` | Charon image ropsitory, pull policy, and tag version | +| image | object | `{"pullPolicy":"IfNotPresent","repository":"obolnetwork/charon","tag":"v1.1.1"}` | Charon image ropsitory, pull policy, and tag version | | imagePullSecrets | list | `[]` | Credentials to fetch images from private registry # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ | | livenessProbe | object | `{"enabled":false,"httpGet":{"path":"/livez"},"initialDelaySeconds":10,"periodSeconds":5}` | Configure liveness probes # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ | | nameOverride | string | `""` | Provide a name in place of lighthouse for `app:` labels | diff --git a/charts/charon-cluster/values.yaml b/charts/charon-cluster/values.yaml index 87a7773..22788f4 100644 --- a/charts/charon-cluster/values.yaml +++ b/charts/charon-cluster/values.yaml @@ -12,7 +12,7 @@ clusterThreshold: 3 image: repository: obolnetwork/charon pullPolicy: IfNotPresent - tag: v1.0.0 + tag: v1.1.1 # -- Credentials to fetch images from private registry ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ diff --git a/charts/charon/Chart.yaml b/charts/charon/Chart.yaml index 0c7e43b..9b664b8 100644 --- a/charts/charon/Chart.yaml +++ b/charts/charon/Chart.yaml @@ -29,10 +29,10 @@ 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: 0.3.4 +version: 0.3.5 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.0.0" +appVersion: "1.1.1" diff --git a/charts/charon/README.md b/charts/charon/README.md index 43d619e..9f24731 100755 --- a/charts/charon/README.md +++ b/charts/charon/README.md @@ -2,7 +2,7 @@ Charon =========== -![Version: 0.3.4](https://img.shields.io/badge/Version-0.3.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square) +![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square) Charon is an open-source Ethereum Distributed validator middleware written in golang. @@ -27,7 +27,7 @@ Charon is an open-source Ethereum Distributed validator middleware written in go | config.featureSet | string | `"stable"` | Minimum feature set to enable by default: alpha, beta, or stable. Warning: modify at own risk. (default "stable") | | config.featureSetDisable | string | `""` | Comma-separated list of features to disable, overriding the default minimum feature set. | | config.featureSetEnable | string | `""` | Comma-separated list of features to enable, overriding the default minimum feature set. | -| config.jaegerAddress | string | `"jaeger:6831"` | Listening address for jaeger tracing. | +| config.jaegerAddress | string | `""` | Listening address for jaeger tracing. | | config.jaegerService | string | `"charon"` | Service name used for jaeger tracing. (default "charon") | | config.logFormat | string | `"json"` | Log format; console, logfmt or json (default "console") | | config.logLevel | string | `"info"` | Log level; debug, info, warn or error (default "info") | @@ -56,7 +56,7 @@ Charon is an open-source Ethereum Distributed validator middleware written in go | extraVolumes | list | `[]` | Additional volumes | | fullnameOverride | string | `""` | Provide a name to substitute for the full names of resources | | httpPort | int | `3600` | HTTP Port | -| image | object | `{"pullPolicy":"IfNotPresent","repository":"obolnetwork/charon","tag":"v1.0.0"}` | Charon image ropsitory, pull policy, and tag version | +| image | object | `{"pullPolicy":"IfNotPresent","repository":"obolnetwork/charon","tag":"v1.1.1"}` | Charon image ropsitory, pull policy, and tag version | | imagePullSecrets | list | `[]` | Credentials to fetch images from private registry # ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ | | initContainers | list | `[]` | Additional init containers | | jaegerPort | int | `6831` | Jaeger Port | diff --git a/charts/charon/values.yaml b/charts/charon/values.yaml index ab005e3..b0755f1 100644 --- a/charts/charon/values.yaml +++ b/charts/charon/values.yaml @@ -6,7 +6,7 @@ image: repository: obolnetwork/charon pullPolicy: IfNotPresent - tag: v1.0.0 + tag: v1.1.1 # -- Credentials to fetch images from private registry ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ From b9bfa1f21b22bcbca4c4b229939cf593ec02527f Mon Sep 17 00:00:00 2001 From: Anthony PHAM Date: Fri, 4 Oct 2024 08:40:25 +0200 Subject: [PATCH 3/3] feat: create automate pr for release (#56) --- .github/workflows/dispatch-update.yml | 53 +++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/workflows/dispatch-update.yml diff --git a/.github/workflows/dispatch-update.yml b/.github/workflows/dispatch-update.yml new file mode 100644 index 0000000..57f1420 --- /dev/null +++ b/.github/workflows/dispatch-update.yml @@ -0,0 +1,53 @@ +name: Dispatch Update Version + +on: + repository_dispatch: + types: [update-version] + +jobs: + update-version: + runs-on: ubuntu-latest + steps: + - name: Checkout this repository + uses: actions/checkout@v4 + + - name: Extract tag name + run: echo "TAG_NAME=${{ github.event.client_payload.tag }}" >> $GITHUB_ENV + + - name: Update Helm chart versions + run: | + TAG_NAME="${{ env.TAG_NAME#v }}" + + increment_version() { + echo "$1" | awk -F. '{printf "%d.%d.%d", $1, $2, $3+1}' + } + + # Update charon Chart.yaml + CHART_VERSION=$(grep '^version:' charts/charon/Chart.yaml | awk '{print $2}') + NEW_CHART_VERSION=$(increment_version $CHART_VERSION) + sed -i "s/^version: .*/version: ${NEW_CHART_VERSION}/" charts/charon/Chart.yaml + sed -i "s/^appVersion: .*/appVersion: \"${TAG_NAME}\"/" charts/charon/Chart.yaml + + # Update charon-cluster Chart.yaml + CHART_CLUSTER_VERSION=$(grep '^version:' charts/charon-cluster/Chart.yaml | awk '{print $2}') + NEW_CHART_CLUSTER_VERSION=$(increment_version $CHART_CLUSTER_VERSION) + sed -i "s/^version: .*/version: ${NEW_CHART_CLUSTER_VERSION}/" charts/charon-cluster/Chart.yaml + sed -i "s/^appVersion: .*/appVersion: \"${TAG_NAME}\"/" charts/charon-cluster/Chart.yaml + + # Update charon and charon-cluster values.yaml + sed -i -E "/tag:/s/v\.?[0-9]+\.[0-9]+\.[0-9]+[a-zA-Z0-9\-]*/v${TAG_NAME}/" charts/charon-cluster/values.yaml charts/charon/values.yaml + + # Commit and push changes + git checkout -b update-version-${{ env.TAG_NAME }} + git add . + git commit -m "Update version to ${TAG_NAME}" + git push origin update-version-${{ env.TAG_NAME }} + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v7 + with: + token: ${{ secrets.GITHUB_TOKEN }} + base: main + head: update-version-${{ env.TAG_NAME }} + title: "Update version to ${{ env.TAG_NAME }}" + body: "Automatically generated PR to update version to ${{ env.TAG_NAME }}"