Merge branch 'main' into v1.0.2-beta3

apache · Oct 28, 2024 · 01fecaa · 01fecaa
2 parents 0a47c95 + e87339b
commit 01fecaa
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml
@@ -63,7 +63,7 @@ jobs:
           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
           helm dep build charts/devlake
-          helm install --wait --timeout 1000s deploy-test charts/devlake \
+          helm install --debug --wait --timeout 2400s 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 1000s deploy-test charts/devlake \
+          helm install --debug --wait --timeout 2400s 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
@@ -25,7 +25,6 @@ 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=1.0.2-beta3 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
-
 ```
 
 Visit your devlake from the node port (32001 by default): http://YOUR-NODE-IP:32001.

diff --git a/charts/devlake/templates/deployments.yaml b/charts/devlake/templates/deployments.yaml
@@ -205,10 +205,22 @@ spec:
           resources:
           {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- if .Values.lake.volumeMounts }}
+          volumeMounts:
+            {{- range $volumeMount := .Values.lake.volumeMounts }}
+            - {{- $volumeMount | toYaml | nindent 14 }}
+            {{- end }}
+          {{- end }}
           {{- with .Values.lake.containerSecurityContext }}
           securityContext:
           {{- toYaml . | nindent 12 }}
       {{- end }}
+      {{- if .Values.lake.volumes }}
+      volumes:
+        {{- range $volume := .Values.lake.volumes }}
+        - {{- $volume | toYaml | nindent 10 }}
+        {{- end }}
+      {{- end }}
       {{- if .Values.lake.hostNetwork }}
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet

diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
@@ -252,6 +252,21 @@ lake:
   deployment:
     extraLabels: {}
 
+  # Additional volumes to include in the Pod. Example:
+  #
+  # volumes:
+  #   - name: my-volume
+  #     configMap: my-config-map
+  volumes: []
+
+  # Additional volume mounts to include in the Container. Example:
+  #
+  # volumeMounts:
+  #   - name: test-volume
+  #     mountPath: /opt/test_folder
+  #     subPath: test_file.yaml
+  volumeMounts: []
+
 ui:
   image:
     repository: devlake.docker.scarf.sh/apache/devlake-config-ui