Merge branch 'main' into enabled-replicaCount

apache · Sep 27, 2024 · 84dd8a9 · 84dd8a9
2 parents 47b06b7 + 1b9a97f
commit 84dd8a9
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 26 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
@@ -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=1.0.0-beta3 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
+helm install devlake devlake/devlake --version=1.0.1 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
 
 ```
 
@@ -50,14 +50,14 @@ _Notes for mac users with minikube:_
 
 ```shell
 helm repo update
-helm upgrade devlake devlake/devlake --version=1.0.0-beta3 --set lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+helm upgrade devlake devlake/devlake --version=1.0.1 --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=1.0.0-beta3
+helm upgrade devlake devlake/devlake --version=1.0.1
 ```
 
 ### 2.3 Uninstall

diff --git 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/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.0-beta3 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
+helm install devlake devlake/devlake --version=1.0.1 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
 ```
 
 If you are using minikube inside your mac, please use the following command to forward the port:
@@ -71,14 +71,14 @@ grafana by url `http://YOUR-NODE-IP:30091`
 
 ```shell
 helm repo update
-helm upgrade devlake devlake/devlake --version=1.0.0-beta3 --set lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
+helm upgrade devlake devlake/devlake --version=1.0.1 --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=1.0.0-beta3
+helm upgrade devlake devlake/devlake --version=1.0.1
 ```
 
 ## Uninstall

diff --git a/charts/devlake/Chart.yaml b/charts/devlake/Chart.yaml
@@ -28,10 +28,10 @@ keywords:
 type: application
 
 # Chart version
-version: 1.0.0-beta3
+version: 1.0.1
 
 # devlake version
-appVersion: v1.0.0-beta3
+appVersion: v1.0.1
 
 dependencies:
   - condition: grafana.enabled

diff --git a/charts/devlake/templates/deployments.yaml b/charts/devlake/templates/deployments.yaml
@@ -55,6 +55,9 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
+      {{- with .Values.ui.extraContainers }}
+        {{- tpl (toYaml .) $ | nindent 8 }}
+      {{- end }}
         - name: config-ui
 {{- if .Values.ui.image.tag }}
           image: "{{ .Values.ui.image.repository }}:{{ .Values.ui.image.tag }}"

diff --git a/charts/devlake/templates/ingresses.yaml b/charts/devlake/templates/ingresses.yaml
@@ -36,9 +36,6 @@ metadata:
   labels:
     {{- include "devlake.labels" . | nindent 4 }}
   annotations:
-  {{- if .Values.ingress.useDefaultNginx }}
-    nginx.ingress.kubernetes.io/rewrite-target: /$2
-  {{- end}}
   {{- with .Values.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -57,11 +54,7 @@ spec:
       http:
         paths:
           {{- if .Values.grafana.enabled }}
-          {{- if .Values.ingress.useDefaultNginx }}
-          - path: /{{ include "devlake.grafanaEndpointPrefix" . }}(/|$)(.*)
-          {{- else }}
           - path: /{{ include "devlake.grafanaEndpointPrefix" . }}
-          {{- end }}
             {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
             pathType: Prefix
             {{- end }}
@@ -76,11 +69,7 @@ spec:
               servicePort: {{ .Values.grafana.ingressServicePort | default .Values.grafana.service.port }}
               {{- end }}
           {{- end }}
-          {{- if .Values.ingress.useDefaultNginx }}
-          - path: /{{ include "devlake.uiEndpointPrefix" . }}(/?|$)(.*)
-          {{- else }}
           - path: /{{ include "devlake.uiEndpointPrefix" . }}
-          {{- end}}
             {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
             pathType: Prefix
             {{- end }}
@@ -112,6 +101,7 @@ metadata:
   labels:
     {{- include "devlake.labels" . | nindent 4 }}
   annotations:
+    nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$2
     nginx.ingress.kubernetes.io/permanent-redirect: {{ .Values.grafana.external.url }}
   {{- with .Values.ingress.annotations }}
@@ -133,7 +123,7 @@ spec:
         paths:
           - path: /{{ include "devlake.grafanaEndpointPrefix" . }}(/|$)(.*)
             {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
-            pathType: Prefix
+            pathType: ImplementationSpecific
             {{- end }}
             backend: # dummy to config-ui, actual 302 forearding for external grafana
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}

diff --git a/charts/devlake/values.yaml b/charts/devlake/values.yaml
@@ -15,10 +15,9 @@
 # limitations under the License.
 #
 
-# global replica count was removed
-
 imageTag: v1.0.0-beta3
 
+
 # image pull secrets
 imagePullSecrets: []
 
@@ -151,10 +150,13 @@ grafana:
     url: ""
   image:
     repository: devlake.docker.scarf.sh/apache/devlake-dashboard
-    tag: v1.0.0-beta3
+    tag: v1.0.1
+  deploymentStrategy:
+    type: Recreate
   adminPassword: ""
   grafana.ini:
     server:
+      serve_from_subpath: "true"
       root_url: "%(protocol)s://%(domain)s/grafana"
   #the secret name should be as same as .Values.option.connectionSecretName
   envFromSecrets:
@@ -186,6 +188,14 @@ lake:
     LOGGING_DIR: "/app/logs"
     # debug, info, warn, error
     LOGGING_LEVEL: "info"
+    JIRA_JQL_AUTO_FULL_REFRESH: "true"
+    ##########################
+    # ENABLE_SUBTASKS_BY_DEFAULT: This environment variable is used to enable or disable the execution of subtasks.
+    # The format is as follows: plugin_name1:subtask_name1:enabled_value,plugin_name2:subtask_name2:enabled_value,plugin_name3:subtask_name3:enabled_value
+    ##########################
+    # ENABLE_SUBTASKS_BY_DEFAULT default value as below:
+    # ENABLE_SUBTASKS_BY_DEFAULT: "jira:collectIssueChangelogs:true,jira:extractIssueChangelogs:true,jira:convertIssueChangelogs:true,tapd:collectBugChangelogs:true,tapd:extractBugChangelogs:true,tapd:convertBugChangelogs:true,zentao:collectBugRepoCommits:true,zentao:extractBugRepoCommits:true,zentao:convertBugRepoCommits:true,zentao:collectStoryRepoCommits:true,zentao:extractStoryRepoCommits:true,zentao:convertStoryRepoCommits:true,zentao:collectTaskRepoCommits:true,zentao:extractTaskRepoCommits:true,zentao:convertTaskRepoCommits:true"
+
   #extra envs from an existing secret
   extraEnvsFromSecret: ""
   encryptionSecret:
@@ -315,6 +325,22 @@ ui:
   deployment:
     extraLabels: {}
 
+  ## Side Contaainer Configuration
+  extraContainers: []
+#  - name: vault-agent
+#    image: vault:1.6.2
+#    args:
+#    - agent
+#    - -config
+#    - /vault/config/config.hcl
+#    env:
+#    - name: VAULT_ADDR
+#      value: https://vault:8200
+#    - name: VAULT_SKIP_VERIFY
+#      value: "false"
+#    - name: VAULT_CACERT
+#      value: /vault/tls/ca.crt
+
 # alpine image for some init containers
 alpine:
   image:
@@ -332,7 +358,7 @@ ingress:
   enabled: false
   enableHttps: false
   # Set to false if you want to use a different ingress controller
-  useDefaultNginx: true
+  useDefaultNginx: false
   # ingress class name, example: alb for AWS load balancer controller
   className:
   # domain name for hosting devlake, must be set if ingress is enabled