Skip to content

Commit

Permalink
removed custom configmap (getredash#158)
Browse files Browse the repository at this point in the history
* updated docs, removed custom entrypoint scripts

* reverted env variables naming

* updated image and chart version

* upgraded actions

* upgraded dependencies, fixed app version tag and repo

---------

Co-authored-by: Andrii Chubatiuk <wachy@Andriis-MBP-2.lan>
  • Loading branch information
AndrewChubatiuk and Andrii Chubatiuk authored Apr 11, 2024
1 parent 7bf2bab commit 9d90324
Show file tree
Hide file tree
Showing 12 changed files with 109 additions and 410 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ jobs:
strategy:
matrix:
k8s:
- v1.26.13
- v1.27.10
- v1.28.6
- v1.29.1
- v1.26
- v1.27
- v1.28
- v1.29
runs-on: ubuntu-22.04
steps:
- uses: medyagh/setup-minikube@v0.0.14
- uses: medyagh/setup-minikube@v0.0.16
with:
kubernetes-version: ${{ matrix.k8s }}
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: redash
version: 3.0.1
appVersion: 10.1.0.b50633
version: 3.1.0-alpha1
appVersion: 24.04.0-dev-b8640593524.10
description: Redash is an open source tool built for teams to query, visualize and collaborate.
keywords:
- redash
Expand Down
8 changes: 4 additions & 4 deletions requirements.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: redis
repository: oci://registry-1.docker.io/bitnamicharts
version: 18.19.4
version: 19.1.0
- name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts
version: 13.4.6
digest: sha256:bf1381bd95e1b7b7b93fc6e69ebc9c40c46ac7d39e6cbfa148e626b17f4d319c
generated: "2024-03-27T00:08:04.068636333+02:00"
version: 15.2.5
digest: sha256:737414ecea2a8b28eb5170ec23dcc35251a77836e71283623d29874c4404159c
generated: "2024-04-11T10:04:30.905003+03:00"
4 changes: 2 additions & 2 deletions requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: redis
version: "^18.9.0"
version: "^19.1.0"
repository: oci://registry-1.docker.io/bitnamicharts
condition: redis.enabled
- name: postgresql
version: "^13.4.1"
version: "^15.2.0"
repository: oci://registry-1.docker.io/bitnamicharts
condition: postgresql.enabled
169 changes: 0 additions & 169 deletions scripts/update-env-config.py

This file was deleted.

6 changes: 3 additions & 3 deletions templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Shared environment block used across each component.
{{ else -}}
value: {{ default "" .Values.externalPostgreSQL | quote }}
{{- end }}
{{ else -}}
{{- else -}}
- name: REDASH_DATABASE_USER
value: "{{ .Values.postgresql.auth.username }}"
- name: REDASH_DATABASE_PASSWORD
Expand All @@ -97,7 +97,7 @@ Shared environment block used across each component.
value: {{ include "redash.postgresql.fullname" . }}
- name: REDASH_DATABASE_PORT
value: "{{ .Values.postgresql.primary.service.ports.postgresql }}"
- name: REDASH_DATABASE_DB
- name: REDASH_DATABASE_NAME
value: "{{ .Values.postgresql.auth.database }}"
{{- end }}
{{- if not .Values.redis.enabled }}
Expand All @@ -123,7 +123,7 @@ Shared environment block used across each component.
value: {{ include "redash.redis.fullname" . }}
- name: REDASH_REDIS_PORT
value: "{{ .Values.redis.master.service.ports.redis }}"
- name: REDASH_REDIS_DB
- name: REDASH_REDIS_NAME
value: "{{ .Values.redis.database }}"
{{- end }}
{{- end }}
Expand Down
84 changes: 0 additions & 84 deletions templates/configmap.yaml

This file was deleted.

39 changes: 17 additions & 22 deletions templates/hook-migrations-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,24 @@ spec:
template:
metadata:
name: "{{ .Release.Name }}"
labels:
{{- include "redash.selectorLabels" . | nindent 8 }}
{{- if .Values.migrations.podAnnotations }}
annotations:
{{ toYaml .Values.migrations.podAnnotations | nindent 8 }}
labels: {{ include "redash.selectorLabels" . | nindent 8 }}
{{- with .Values.migrations.podAnnotations }}
annotations: {{ toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
imagePullSecrets: {{ toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "redash.serviceAccountName" . }}
restartPolicy: Never
securityContext:
{{- toYaml .Values.migrations.podSecurityContext | nindent 8 }}
securityContext: {{ toYaml .Values.migrations.podSecurityContext | nindent 8 }}
containers:
- name: {{ include "redash.name" . }}-server
securityContext:
{{- toYaml .Values.migrations.securityContext | nindent 10 }}
image: {{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag }}
securityContext: {{ toYaml .Values.migrations.securityContext | nindent 10 }}
image: "{{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
command: ["/bin/bash", "/config/install-upgrade.sh"]
volumeMounts:
- name: config
mountPath: /config
args:
- create_db
env:
{{- include "redash.env" . | nindent 10 }}
{{- range $key, $value := .Values.migrations.env }}
Expand All @@ -50,13 +43,15 @@ spec:
envFrom:
{{- include "redash.envFrom" . | nindent 10 }}
{{- end}}
{{- if (.Values.migrations.resources) }}
resources: {{ toYaml .Values.migrations.resources | nindent 10 }}
{{- with .Values.migrations.resources }}
resources: {{ toYaml . | nindent 10 }}
{{- end }}
volumes:
- name: config
configMap:
name: {{ include "redash.fullname" . }}
{{- with .Values.migrations.volumeMounts }}
volumeMounts: {{ toYaml . | nindent 10 }}
{{- end }}
{{- with .Values.migrations.volumes }}
volumes: {{ toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.migrations.nodeSelector }}
nodeSelector: {{ toYaml . | nindent 8 }}
{{- end }}
Expand Down
Loading

0 comments on commit 9d90324

Please sign in to comment.