Skip to content

Commit

Permalink
Remove dependency on kibana secret (#38)
Browse files Browse the repository at this point in the history
  • Loading branch information
bpblanken authored Feb 20, 2024
1 parent 16d6b16 commit a05f16f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion charts/seqr/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.0.80
version: 0.0.81
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
Expand Down
3 changes: 1 addition & 2 deletions charts/seqr/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ If you need to upgrade the redis version made available by this chart, you can d
| podAnnotations | object | `{}` | A dictionary of annotations to add to the seqr Deployment |
| redis.enabled | bool | `false` | enables or disables redis deployment using this chart |
| replicaCount | int | `1` | The number of replicas of the seqr web service pod to run. Currenly only 1 is supported. |
| required_secrets | object | `{"kibanaSecretName":"kibana-secrets","postgresSecretName":"postgres-secrets","seqrSecretName":"seqr-secrets"}` | Secrets which are required for seqr's functionality |
| required_secrets.kibanaSecretName | string | `"kibana-secrets"` | The secret containing the credentials required to access the kibana instance, if you've deployed kibana and it requires authentication. |
| required_secrets | object | `{"postgresSecretName":"postgres-secrets","seqrSecretName":"seqr-secrets"}` | Secrets which are required for seqr's functionality |
| required_secrets.postgresSecretName | string | `"postgres-secrets"` | The secret containing the postgres credentials. See the README for information on the format of this secret |
| required_secrets.seqrSecretName | string | `"seqr-secrets"` | The secret containing the seqr required secrets. See the README for information on the format of this secret |
| resources | object | `{}` | Sets the resource requests and limits for the seqr Deployment |
Expand Down
5 changes: 0 additions & 5 deletions charts/seqr/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@ env:
secretKeyRef:
name: {{ .Values.required_secrets.seqrSecretName }}
key: seqr_es_password
- name: KIBANA_ES_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Values.required_secrets.kibanaSecretName }}
key: elasticsearch.password
{{- end }}
{{- with .Values.additional_secrets }}
{{- toYaml . | nindent 2}}
Expand Down
9 changes: 5 additions & 4 deletions charts/seqr/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ enable_elasticsearch_auth: false

# -- The name of the secret containing seqr's elasticsearch password
# seqrSecretName: seqr-secrets
# -- The name of the secret containing seqr's kibana password
# kibanaSecretName: kibana-secrets

# Seqr requires a few secrets to be defined. Here you can specify the names of the kubernetes secrets if you
# have named them differently than the defaults. See the README for information on the format of these secrets.
Expand All @@ -131,8 +129,6 @@ required_secrets:
postgresSecretName: postgres-secrets
# -- The secret containing the seqr required secrets. See the README for information on the format of this secret
seqrSecretName: seqr-secrets
# -- The secret containing the credentials required to access the kibana instance, if you've deployed kibana and it requires authentication.
kibanaSecretName: kibana-secrets

# Define any additional secrets that are needed in your environment here. These will be interpolated into the seqr deployment
# directly as yaml.
Expand Down Expand Up @@ -160,6 +156,11 @@ additional_secrets: {}
# secretKeyRef:
# name: seqr-secrets
# key: ga_token_id
# - name: KIBANA_ES_PASSWORD
# valueFrom:
# secretKeyRef:
# name: kibana-secrets
# key: elasticsearch.password

# -- Additional data volumes to use in the seqr Deployment
volumes: {}
Expand Down

0 comments on commit a05f16f

Please sign in to comment.