diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml index fc2ea272..c3ddc1a4 100644 --- a/.github/workflows/deploy-test.yml +++ b/.github/workflows/deploy-test.yml @@ -58,16 +58,23 @@ jobs: - name: Helm install devlake if: matrix.database_type == 'mysql-external' run: | - helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add grafana https://grafana.github.io/helm-charts - helm install mysql bitnami/mysql --version 9.19.1 --set auth.rootPassword=admin --set auth.database=lake --set auth.username=merico --set auth.password=merico - # external mysql at service: mysql + kubectl run mysql --image=mysql:8.0 \ + --env="MYSQL_ROOT_PASSWORD=admin" \ + --env="MYSQL_DATABASE=lake" \ + --env="MYSQL_USER=merico" \ + --env="MYSQL_PASSWORD=merico" \ + --port=3306 + kubectl expose pod mysql --port=3306 + kubectl wait --for=condition=ready pod/mysql --timeout=300s helm dep build charts/devlake - helm install --debug --wait --timeout 2400s deploy-test charts/devlake \ + helm install --debug --wait --timeout 600s deploy-test charts/devlake \ --set service.uiPort=30000 \ --set mysql.useExternal=true \ --set mysql.externalServer=mysql \ - --set lake.encryptionSecret.secret=$(openssl rand -base64 2000 | tr -dc 'A-Z' | fold -w 128 | head -n 1) + --set grafana.persistence.enabled=false \ + --set lake.encryptionSecret.secret=$(openssl rand -base64 2000 | tr -dc 'A-Z' | fold -w 128 | head -n 1) \ + || { kubectl get pods -o wide; kubectl describe pods; kubectl get events --sort-by='.lastTimestamp'; exit 1; } - name: Helm install devlake if: matrix.database_type == 'mysql-builtin' @@ -76,10 +83,12 @@ 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 --debug --wait --timeout 2400s deploy-test charts/devlake \ + helm install --debug --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) + --set grafana.persistence.enabled=false \ + --set lake.encryptionSecret.secret=$(openssl rand -base64 2000 | tr -dc 'A-Z' | fold -w 128 | head -n 1) \ + || { kubectl get pods -o wide; kubectl describe pods; kubectl get events --sort-by='.lastTimestamp'; exit 1; } - name: List cluster resources if: ${{ always() }} @@ -101,7 +110,7 @@ jobs: # home curl --fail http://${NODE_IP}:30000 || failed=1 # API for devlake - curl --fail http://${NODE_IP}:30000/api/blueprints || failed=1 + curl --fail http://${NODE_IP}:30000/api/ping || failed=1 # API for grafana curl --fail http://${NODE_IP}:30000/grafana/api/health || failed=1 if [ $failed -eq 0 ] ; then diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e169df80..c2da4b23 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -30,7 +30,7 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Login to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/HelmSetup.md b/HelmSetup.md index 13a600b7..96079e22 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/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=1.0.3-beta10 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET +helm install devlake devlake/devlake --version=1.0.3-beta13 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET ``` Visit your devlake from the node port (32001 by default): http://YOUR-NODE-IP:32001. @@ -49,14 +49,14 @@ _Notes for mac users with minikube:_ ```shell helm repo update -helm upgrade devlake devlake/devlake --version=1.0.3-beta10 --set lake.encryptionSecret.secret= +helm upgrade devlake devlake/devlake --version=1.0.3-beta13 --set lake.encryptionSecret.secret= ``` **If you're upgrading from DevLake v0.18.x or later versions:** ```shell helm repo update -helm upgrade devlake devlake/devlake --version=1.0.3-beta10 +helm upgrade devlake devlake/devlake --version=1.0.3-beta13 ``` ### 2.3 Uninstall diff --git a/README.md b/README.md index ce61e93e..0e7ad38d 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ helm install devlake devlake/devlake --set lake.encryptionSecret.secret=$ENCRYPT helm repo add devlake https://apache.github.io/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=1.0.3-beta10 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET +helm install devlake devlake/devlake --version=1.0.3-beta13 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET ``` Helm chart are also published to GitHub container registry as OCI artifact. @@ -73,14 +73,14 @@ grafana by url `http://YOUR-NODE-IP:30091` ```shell helm repo update -helm upgrade devlake devlake/devlake --version=1.0.3-beta10 --set lake.encryptionSecret.secret= +helm upgrade devlake devlake/devlake --version=1.0.3-beta13 --set lake.encryptionSecret.secret= ``` **If you're upgrading from DevLake v0.18.x or later versions:** ```shell helm repo update -helm upgrade devlake devlake/devlake --version=1.0.3-beta10 +helm upgrade devlake devlake/devlake --version=1.0.3-beta13 ``` ## Uninstall diff --git a/charts/devlake/Chart.yaml b/charts/devlake/Chart.yaml index 77f5ada1..2ea67f46 100644 --- a/charts/devlake/Chart.yaml +++ b/charts/devlake/Chart.yaml @@ -28,10 +28,10 @@ keywords: type: application # Chart version -version: 1.0.3-beta10 +version: 1.0.3-beta13 # devlake version -appVersion: v1.0.3-beta10 +appVersion: v1.0.3-beta13 dependencies: - condition: grafana.enabled diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml index 6c05c526..013aab28 100644 --- a/charts/devlake/values.yaml +++ b/charts/devlake/values.yaml @@ -17,7 +17,7 @@ # replica count replicaCount: 1 -imageTag: v1.0.3-beta10 +imageTag: v1.0.3-beta13 # image pull secrets imagePullSecrets: [] @@ -134,9 +134,8 @@ grafana: external: url: "" image: - registry: devlake.docker.scarf.sh repository: apache/devlake-dashboard - tag: v1.0.3-beta10 + tag: v1.0.3-beta13 deploymentStrategy: type: Recreate adminPassword: "" @@ -163,7 +162,7 @@ lake: replicaCount: 1 revisionHistoryLimit: 10 image: - repository: devlake.docker.scarf.sh/apache/devlake + repository: apache/devlake pullPolicy: Always # defaults to imageTag; if set, lake.image.tag will override imageTag # tag: @@ -274,7 +273,7 @@ ui: replicaCount: 1 revisionHistoryLimit: 10 image: - repository: devlake.docker.scarf.sh/apache/devlake-config-ui + repository: apache/devlake-config-ui pullPolicy: Always # defaults to imageTag; if set, lake.image.tag will override imageTag # tag: