grafana official helm chart as dependency (#140)

* update * chore: update ci * chore: update ci * chore: update ci * chore: update ci * chore: update ci * chore: update ci * chore: update ciush * chore: update ciush * update docs * update docs
apache · Jul 3, 2023 · 80d0765 · 80d0765
1 parent 43b321f
commit 80d0765
Show file tree

Hide file tree

Showing 41 changed files with 32,871 additions and 387 deletions.
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
@@ -29,18 +29,15 @@ on:
     paths:
       - charts/devlake/**
       - .github/workflows/deploy-test.yml
-      - '!**.md'
+      - "!**.md"
 
 jobs:
   deploy-with-helm:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        database_type: ["mysql-builtin",
-#          "pgsql-builtin",
-                        "mysql-external"
-          ]
+        database_type: ["mysql-builtin", "mysql-external"]
     steps:
       - name: Creating kind cluster
         uses: container-tools/kind-action@v1
@@ -61,8 +58,10 @@ jobs:
         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 --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 300s deploy-test charts/devlake \
             --set service.uiPort=30000 \
             --set mysql.useExternal=true \
@@ -74,6 +73,8 @@ jobs:
       - name: Helm install devlake
         if: matrix.database_type == 'mysql-builtin'
         run: |
+          helm repo add grafana https://grafana.github.io/helm-charts
+          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 \
@@ -82,18 +83,6 @@ jobs:
             --set option.localtime=""
           kubectl get pods -o wide
           kubectl get services -o wide
-      
-#      - name: Helm install devlake
-#        if: matrix.database_type == 'pgsql-builtin'
-#        run: |
-#          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 \
-#            --set service.uiPort=30000 \
-#            --set option.database=pgsql \
-#            --set option.localtime=""
-#          kubectl get pods -o wide
-#          kubectl get services -o wide
 
       # TODO: using some e2e test code to replace it
       - name: Curl with endpoints
@@ -128,4 +117,3 @@ jobs:
             echo logs for $pod
             kubectl logs $pod || echo ""
           done
-
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -6,7 +6,7 @@ on:
       - main
     paths:
       - charts/**
-      - '!**.md'
+      - "!**.md"
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -27,6 +27,10 @@ jobs:
           echo "installing helm 3..."
           curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
 
+      - name: Add repositories
+        run: |
+          helm repo add grafana https://grafana.github.io/helm-charts
+
       - name: Run chart-releaser
         uses: ./.github/actions/chart-releaser-action
         with:

diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml
@@ -29,5 +29,9 @@ jobs:
       - uses: actions/checkout@v3
       - name: install latest helm
         run: curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+      - name: Add repositories
+        run: |
+          helm repo add grafana https://grafana.github.io/helm-charts
+          helm dep build charts/devlake
       - name: lint helm chart
         run: helm lint charts/devlake --strict
diff --git a/HelmSetup.md b/HelmSetup.md
diff --git a/charts/devlake/Chart.lock b/charts/devlake/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: grafana
+  repository: https://grafana.github.io/helm-charts
+  version: 6.56.6
+digest: sha256:cbe6f07dc05e6699e46ce6da0db5eb937bd3c6203f6a19fc8adcf72f9f7005fb
+generated: "2023-05-28T13:53:10.903912+08:00"
diff --git a/charts/devlake/Chart.yaml b/charts/devlake/Chart.yaml
@@ -28,7 +28,12 @@ keywords:
 type: application
 
 # Chart version
-version: 0.17.0-beta12
+version: 0.17.0-gf-dep
 
 # devlake version
 appVersion: v0.17.0-beta12
+
+dependencies:
+- name: grafana
+  version: "6.56.6"
+  repository: "https://grafana.github.io/helm-charts"