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

set user for visibility db in VISIBILITY_DBUSER env var #163

Merged
merged 4 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion charts/retool/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: retool
description: A Helm chart for Kubernetes
type: application
version: 6.1.1
version: 6.1.3
maintainers:
- name: Retool Engineering
email: [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ spec:
- name: VISIBILITY_DBNAME
value: "{{ $.Values.server.config.persistence.visibility.sql.database }}"
{{- end }}
{{- if $.Values.server.config.persistence.visibility.sql.user }}
- name: VISIBILITY_DBUSER
value: "{{ $.Values.server.config.persistence.visibility.sql.user }}"
{{- end }}
{{- if ($.Values.server.config.persistence.default.sql.tls).enabled }}
- name: SQL_TLS_ENABLED
value: "true"
Expand Down
88 changes: 43 additions & 45 deletions charts/retool/charts/retool-temporal-services-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ server:
autosetup: true
image:
repository: tryretool/one-offs
tag: retool-temporal-1.1.3
tag: retool-temporal-1.1.5
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the main change, rest is formatting

pullPolicy: IfNotPresent

# Global default settings (can be overridden per service)
Expand Down Expand Up @@ -67,8 +67,7 @@ server:
timerType: histogram
podAnnotations: {}
podLabels: {}
resources:
{}
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
Expand Down Expand Up @@ -257,7 +256,6 @@ web:
default_to_namespace: workflows # internal use only
issue_report_link: https://github.com/temporalio/web/issues/new/choose # set this field if you need to direct people to internal support forums


replicaCount: 1

image:
Expand Down Expand Up @@ -351,49 +349,49 @@ grafana:
dashboardproviders.yaml:
apiVersion: 1
providers:
- name: 'default'
orgId: 1
folder: ''
type: file
disableDeletion: false
editable: true
options:
path: /var/lib/grafana/dashboards/default
- name: "default"
orgId: 1
folder: ""
type: file
disableDeletion: false
editable: true
options:
path: /var/lib/grafana/dashboards/default
datasources:
datasources.yaml:
apiVersion: 1
datasources:
- name: TemporalMetrics
type: prometheus
url: http://{{ .Release.Name }}-prometheus-server
access: proxy
isDefault: true
datasources.yaml:
apiVersion: 1
datasources:
- name: TemporalMetrics
type: prometheus
url: http://{{ .Release.Name }}-prometheus-server
access: proxy
isDefault: true
dashboards:
default:
server-general-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/server/server-general.json
datasource: TemporalMetrics
sdk-general-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/sdk/sdk-general.json
datasource: TemporalMetrics
misc-advanced-visibility-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/advanced-visibility-specific.json
datasource: TemporalMetrics
misc-clustermonitoring-kubernetes-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/clustermonitoring-kubernetes.json
datasource: TemporalMetrics
misc-frontend-service-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/frontend-service-specific.json
datasource: TemporalMetrics
misc-history-service-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/history-service-specific.json
datasource: TemporalMetrics
misc-matching-service-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/matching-service-specific.json
datasource: TemporalMetrics
misc-worker-service-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/worker-service-specific.json
datasource: TemporalMetrics
default:
server-general-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/server/server-general.json
datasource: TemporalMetrics
sdk-general-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/sdk/sdk-general.json
datasource: TemporalMetrics
misc-advanced-visibility-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/advanced-visibility-specific.json
datasource: TemporalMetrics
misc-clustermonitoring-kubernetes-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/clustermonitoring-kubernetes.json
datasource: TemporalMetrics
misc-frontend-service-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/frontend-service-specific.json
datasource: TemporalMetrics
misc-history-service-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/history-service-specific.json
datasource: TemporalMetrics
misc-matching-service-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/matching-service-specific.json
datasource: TemporalMetrics
misc-worker-service-specific-github:
url: https://raw.githubusercontent.com/temporalio/dashboards/helm/misc/worker-service-specific.json
datasource: TemporalMetrics

postgresql:
enabled: false
Expand Down
2 changes: 1 addition & 1 deletion charts/retool/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ retool-temporal-services-helm:
# Defines image to be used for temporal server
image:
repository: tryretool/one-offs
tag: retool-temporal-1.1.3
tag: retool-temporal-1.1.5
pullPolicy: IfNotPresent
# this configures grpc_health_probe (https://github.com/grpc-ecosystem/grpc-health-probe)
# for healthchecks instead of native k8s.
Expand Down
2 changes: 1 addition & 1 deletion values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ retool-temporal-services-helm:
# Defines image to be used for temporal server
image:
repository: tryretool/one-offs
tag: retool-temporal-1.1.3
tag: retool-temporal-1.1.5
pullPolicy: IfNotPresent
# this configures grpc_health_probe (https://github.com/grpc-ecosystem/grpc-health-probe)
# for healthchecks instead of native k8s.
Expand Down