This is an automated email from the ASF dual-hosted git repository.

abeizn pushed a commit to branch v1.0.1-beta6
in repository 
https://gitbox.apache.org/repos/asf/incubator-devlake-helm-chart.git


The following commit(s) were added to refs/heads/v1.0.1-beta6 by this push:
     new 3345d70  feat: upgrade to v1.0.1-beta6
3345d70 is described below

commit 3345d70797fe21e9a4ce3b4de1ac2765fce6e967
Author: abeizn <[email protected]>
AuthorDate: Fri Aug 9 10:26:11 2024 +0800

    feat: upgrade to v1.0.1-beta6
---
 HelmSetup.md               | 12 ++++++++++++
 README.md                  | 12 ++++++++++++
 charts/devlake/Chart.yaml  |  7 +++++++
 charts/devlake/values.yaml |  8 ++++++++
 4 files changed, 39 insertions(+)

diff --git a/HelmSetup.md b/HelmSetup.md
index 6ca7b28..ca46096 100644
--- a/HelmSetup.md
+++ b/HelmSetup.md
@@ -24,7 +24,11 @@ To install the chart with release name `devlake`:
 helm repo add devlake https://apache.github.io/incubator-devlake-helm-chart
 helm repo update
 ENCRYPTION_SECRET=$(openssl rand -base64 2000 | tr -dc 'A-Z' | fold -w 128 | 
head -n 1)
+<<<<<<< Updated upstream
 helm install devlake devlake/devlake --version=1.0.1-beta5 --set 
lake.encryptionSecret.secret=$ENCRYPTION_SECRET
+=======
+helm install devlake devlake/devlake --version=1.0.1-beta6 --set 
lake.encryptionSecret.secret=$ENCRYPTION_SECRET
+>>>>>>> Stashed changes
 
 ```
 
@@ -50,14 +54,22 @@ _Notes for mac users with minikube:_
 
 ```shell
 helm repo update
+<<<<<<< Updated upstream
 helm upgrade devlake devlake/devlake --version=1.0.1-beta5 --set 
lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+=======
+helm upgrade devlake devlake/devlake --version=1.0.1-beta6 --set 
lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+>>>>>>> Stashed changes
 ```
 
 **If you're upgrading from DevLake v0.18.x or later versions:**
 
 ```shell
 helm repo update
+<<<<<<< Updated upstream
 helm upgrade devlake devlake/devlake --version=1.0.1-beta5
+=======
+helm upgrade devlake devlake/devlake --version=1.0.1-beta6
+>>>>>>> Stashed changes
 ```
 
 ### 2.3 Uninstall
diff --git a/README.md b/README.md
index 6330873..780ef03 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,11 @@ helm install devlake devlake/devlake --set 
lake.encryptionSecret.secret=$ENCRYPT
 helm repo add devlake https://apache.github.io/incubator-devlake-helm-chart
 helm repo update
 ENCRYPTION_SECRET=$(openssl rand -base64 2000 | tr -dc 'A-Z' | fold -w 128 | 
head -n 1)
+<<<<<<< Updated upstream
 helm install devlake devlake/devlake --version=1.0.1-beta5 --set 
lake.encryptionSecret.secret=$ENCRYPTION_SECRET
+=======
+helm install devlake devlake/devlake --version=1.0.1-beta6 --set 
lake.encryptionSecret.secret=$ENCRYPTION_SECRET
+>>>>>>> Stashed changes
 ```
 
 If you are using minikube inside your mac, please use the following command to 
forward the port:
@@ -71,14 +75,22 @@ grafana by url `http://YOUR-NODE-IP:30091`
 
 ```shell
 helm repo update
+<<<<<<< Updated upstream
 helm upgrade devlake devlake/devlake --version=1.0.1-beta5 --set 
lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+=======
+helm upgrade devlake devlake/devlake --version=1.0.1-beta6 --set 
lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+>>>>>>> Stashed changes
 ```
 
 **If you're upgrading from DevLake v0.18.x or later versions:**
 
 ```shell
 helm repo update
+<<<<<<< Updated upstream
 helm upgrade devlake devlake/devlake --version=1.0.1-beta5
+=======
+helm upgrade devlake devlake/devlake --version=1.0.1-beta6
+>>>>>>> Stashed changes
 ```
 
 ## Uninstall
diff --git a/charts/devlake/Chart.yaml b/charts/devlake/Chart.yaml
index ee473c9..8c4b1bc 100644
--- a/charts/devlake/Chart.yaml
+++ b/charts/devlake/Chart.yaml
@@ -28,10 +28,17 @@ keywords:
 type: application
 
 # Chart version
+<<<<<<< Updated upstream
 version: 1.0.1-beta5
 
 # devlake version
 appVersion: v1.0.1-beta5
+=======
+version: 1.0.1-beta6
+
+# devlake version
+appVersion: v1.0.1-beta6
+>>>>>>> Stashed changes
 
 dependencies:
   - condition: grafana.enabled
diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
index 8573fb9..abc86af 100644
--- a/charts/devlake/values.yaml
+++ b/charts/devlake/values.yaml
@@ -17,7 +17,11 @@
 
 # replica count
 replicaCount: 1
+<<<<<<< Updated upstream
 imageTag: v1.0.1-beta5
+=======
+imageTag: v1.0.1-beta6
+>>>>>>> Stashed changes
 
 # image pull secrets
 imagePullSecrets: []
@@ -150,7 +154,11 @@ grafana:
     url: ""
   image:
     repository: devlake.docker.scarf.sh/apache/devlake-dashboard
+<<<<<<< Updated upstream
     tag: v1.0.1-beta5
+=======
+    tag: v1.0.1-beta6
+>>>>>>> Stashed changes
   deploymentStrategy:
     type: Recreate
   adminPassword: ""

Reply via email to