Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Volume mount support and remove init container #270

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions HelmSetup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.19.1-beta1 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
helm install devlake devlake/devlake --version=0.19.0 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
```

Visit your devlake from the node port (32001 by default): http://YOUR-NODE-IP:32001.
Expand All @@ -49,14 +49,14 @@ _Notes for mac users with minikube:_

```shell
helm repo update
helm upgrade devlake devlake/devlake --version=0.19.1-beta1 --set lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
helm upgrade devlake devlake/devlake --version=0.19.0 --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.19.1-beta1
helm upgrade devlake devlake/devlake --version=0.19.0
```

### 2.3 Uninstall
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=0.19.1-beta1 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
helm install devlake devlake/devlake --version=0.19.0 --set lake.encryptionSecret.secret=$ENCRYPTION_SECRET
```

If you are using minikube inside your mac, please use the following command to forward the port:
Expand Down Expand Up @@ -71,14 +71,14 @@ grafana by url `http://YOUR-NODE-IP:30091`

```shell
helm repo update
helm upgrade devlake devlake/devlake --version=0.19.1-beta1 --set lake.encryptionSecret.secret=<ENCRYPTION_SECRET>
helm upgrade devlake devlake/devlake --version=0.19.0 --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.19.1-beta1
helm upgrade devlake devlake/devlake --version=0.19.0
```

## Uninstall
Expand Down
4 changes: 2 additions & 2 deletions charts/devlake/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ keywords:
type: application

# Chart version
version: 0.19.1-beta1
version: 0.19.0

# devlake version
appVersion: v0.19.1-beta1
appVersion: v0.19.0

dependencies:
- condition: grafana.enabled
Expand Down
17 changes: 15 additions & 2 deletions charts/devlake/templates/deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,14 @@ spec:
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if or (and (eq .Values.option.database "mysql") (not .Values.mysql.useExternal)) (and (eq .Values.option.database "pgsql") (not .Values.pgsql.useExternal)) }}
initContainers:
{{- include "common.initContainerWaitDatabase" . | nindent 8 }}
{{- with .Values.lake.containerSecurityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
containers:
- name: lake
{{- if .Values.lake.image.tag }}
Expand Down Expand Up @@ -172,7 +174,11 @@ spec:
{{- with .Values.lake.containerSecurityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- end }}
{{- with .Values.lake.volumeMounts }}
volumeMounts:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.lake.hostNetwork }}
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
Expand All @@ -188,6 +194,13 @@ spec:
{{- with .Values.lake.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- with .Values.lake.volumes }}
volumes:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.lake.serviceAccount }}
serviceAccountName: {{ .Values.lake.serviceAccount }}
{{- end }}


10 changes: 8 additions & 2 deletions charts/devlake/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# replica count for dev
replicaCount: 1
imageTag: v0.19.1-beta1
imageTag: v0.19.0

#the common environments for all pods except grafana, grafana needs to be set in grafana section seperately
commonEnvs:
Expand Down Expand Up @@ -147,7 +147,7 @@ grafana:
url: ""
image:
repository: devlake.docker.scarf.sh/apache/devlake-dashboard
tag: v0.19.1-beta1
tag: v0.19.0
adminPassword: ""
grafana.ini:
server:
Expand Down Expand Up @@ -206,6 +206,12 @@ lake:

podAnnotations: {}

volumeMounts: []

volumes: []

serviceAccount: ""

ui:
image:
repository: devlake.docker.scarf.sh/apache/devlake-config-ui
Expand Down