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

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


The following commit(s) were added to refs/heads/main by this push:
     new 18fe5f0  adjust to v0.18.0-beta2 (#163)
18fe5f0 is described below

commit 18fe5f046a803fb216684254f221980141faaaf8
Author: ZhangNing10 <[email protected]>
AuthorDate: Thu Jul 20 16:41:59 2023 +0800

    adjust to v0.18.0-beta2 (#163)
    
    * adjust to v0.18.0-beta2
    
    * adjust readme and helmsetup
    
    * adjust note format
    
    * remove --install for upgrade
    
    * increase the timeout for ci
---
 .github/workflows/deploy-test.yml |  4 ++--
 HelmSetup.md                      | 24 ++++++++++++++++++++----
 README.md                         | 16 ++++++++++++----
 charts/devlake/Chart.yaml         |  4 ++--
 charts/devlake/values.yaml        |  2 +-
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/deploy-test.yml 
b/.github/workflows/deploy-test.yml
index 79890d6..4c40642 100644
--- a/.github/workflows/deploy-test.yml
+++ b/.github/workflows/deploy-test.yml
@@ -63,7 +63,7 @@ jobs:
           helm install mysql bitnami/mysql --set auth.rootPassword=admin --set 
auth.database=lake --set auth.username=merico --set auth.password=merico
           # external mysql at service: mysql
           helm dep build charts/devlake
-          helm install --wait --timeout 400s deploy-test charts/devlake \
+          helm install --wait --timeout 600s deploy-test charts/devlake \
             --set service.uiPort=30000 \
             --set mysql.useExternal=true \
             --set mysql.externalServer=mysql \
@@ -78,7 +78,7 @@ jobs:
           helm dep build charts/devlake
           export NODE_IP=$(kubectl get nodes --namespace default -o 
jsonpath="{.items[0].status.addresses[0].address}")
           echo Node IP: ${NODE_IP}
-          helm install --wait --timeout 300s deploy-test charts/devlake \
+          helm install --wait --timeout 600s deploy-test charts/devlake \
             --set service.uiPort=30000 \
             --set mysql.image.tag=8-debian \
             --set lake.encryptionSecret.secret=$(openssl rand -base64 2000 | 
tr -dc 'A-Z' | fold -w 128 | head -n 1)
diff --git a/HelmSetup.md b/HelmSetup.md
index 958aadb..25418d1 100644
--- a/HelmSetup.md
+++ b/HelmSetup.md
@@ -24,7 +24,7 @@ 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)
-helm install devlake devlake/devlake --version=0.18.0-beta1 --set 
lake.encryptionSecret.secret=$ENCRYPTION_SECRET
+helm install devlake devlake/devlake --version=0.18.0-beta2 --set 
lake.encryptionSecret.secret=$ENCRYPTION_SECRET
 ```
 
 Visit your devlake from the node port (32001 by default): 
http://YOUR-NODE-IP:32001.
@@ -35,12 +35,28 @@ _Notes for mac users with minikube:_
 - access config-ui: `http://YOUR-NODE-IP:4000/`
 - access Grafana dashboard: click the dashboard button in config-ui, or visit 
`http://YOUR-NODE-IP:4000/grafana/`
 
-### 2.2 Update
+### 2.2 Upgrade
+
+**Note:**
+
+**If you're upgrading from DevLake v0.17.x or earlier versions to v0.18.x or 
later versions:**
+
+1. Copy the ENCODE_KEY value from /app/config/.env of the lake pod (e.g. 
devlake-lake-0), and replace the <ENCRYPTION_SECRET> in the upgrade command 
below.
+
+2. You may encounter the below error when upgrading because the built-in 
grafana has been replaced by the official grafana dependency. So you may need 
to delete the grafana deployment first.
+
+> Error: UPGRADE FAILED: cannot patch "devlake-grafana" with kind Deployment: 
Deployment.apps "devlake-grafana" is invalid: spec.selector: Invalid value: 
v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/instance":"devlake",
 "app.kubernetes.io/name":"grafana"}, 
MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable
+
+```shell
+helm repo update
+helm upgrade devlake devlake/devlake --version=0.18.0-beta2 --set 
lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+```
+
+**If you're upgrading from DevLake v0.18.x or later versions:**
 
-if you upgrade from 0.17* to 0.18*, please copy the ENCODE_KEY value from 
/app/config/.env of the pod devlake-lake-0, and replace <ENCRYPTION_SECRET> of 
below upgrade cmd
 ```shell
 helm repo update
-helm upgrade --install devlake devlake/devlake --version=0.18.0-beta1 --set 
lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+helm upgrade devlake devlake/devlake --version=0.18.0-beta2
 ```
 
 ### 2.3 Uninstall
diff --git a/README.md b/README.md
index 32453aa..324ee89 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ helm install devlake devlake/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)
-helm install devlake devlake/devlake --version=0.18.0-beta1 --set 
lake.encryptionSecret.secret=$ENCRYPTION_SECRET
+helm install devlake devlake/devlake --version=0.18.0-beta2 --set 
lake.encryptionSecret.secret=$ENCRYPTION_SECRET
 ```
 
 If you are using minikube inside your mac, please use the following command to 
forward the port:
@@ -58,8 +58,9 @@ grafana by url `http://YOUR-NODE-IP:30091`
 
 ## Upgrade
 
-Note:
-If you're upgrading from DevLake v0.17.x or earlier versions to v0.18.x or 
later versions:
+**Note:**
+
+**If you're upgrading from DevLake v0.17.x or earlier versions to v0.18.x or 
later versions:**
 
 1. Copy the ENCODE_KEY value from /app/config/.env of the lake pod (e.g. 
devlake-lake-0), and replace the <ENCRYPTION_SECRET> in the upgrade command 
below.
 
@@ -69,7 +70,14 @@ If you're upgrading from DevLake v0.17.x or earlier versions 
to v0.18.x or later
 
 ```shell
 helm repo update
-helm upgrade --install devlake devlake/devlake --version=0.18.0-beta1 --set 
lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+helm upgrade devlake devlake/devlake --version=0.18.0-beta2 --set 
lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+```
+
+**If you're upgrading from DevLake v0.18.x or later versions:**
+
+```shell
+helm repo update
+helm upgrade devlake devlake/devlake --version=0.18.0-beta2
 ```
 
 ## Uninstall
diff --git a/charts/devlake/Chart.yaml b/charts/devlake/Chart.yaml
index 7749ce3..cadbfee 100644
--- a/charts/devlake/Chart.yaml
+++ b/charts/devlake/Chart.yaml
@@ -28,10 +28,10 @@ keywords:
 type: application
 
 # Chart version
-version: 0.18.0-beta1
+version: 0.18.0-beta2
 
 # devlake version
-appVersion: v0.18.0-beta1
+appVersion: v0.18.0-beta2
 
 dependencies:
 - condition: grafana.enabled
diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
index abf7941..8672ec1 100644
--- a/charts/devlake/values.yaml
+++ b/charts/devlake/values.yaml
@@ -17,7 +17,7 @@
 
 # replica count for dev
 replicaCount: 1
-imageTag: v0.18.0-beta1
+imageTag: v0.18.0-beta2
 
 #the common environments for all pods
 envs:

Reply via email to