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.

Sign up for GitHub

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

Jump to bottom

[Cadence] Pull value from secret rather than plaintext in job #1302

Closed
wants to merge 7 commits into from
Closed

[Cadence] Pull value from secret rather than plaintext in job #1302

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a2da497
Pull value from secret rather than plaintext in job
Oct 26, 2021
8b83404
Conditionally use secret or value based on pre/post hook creation
Oct 27, 2021
f958563
Fix typos from code review
johnkost Oct 28, 2021
9a4c1cc
Merge branch 'master' into cadenceValueFrom
Nov 4, 2021
3599107
PR feedback and version bump
Nov 4, 2021
45f68a0
Chart version bump
Nov 4, 2021
2afc980
Update cadence/templates/server-job.yaml
johnkost Nov 5, 2021
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 cadence/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: cadence
version: 0.21.2
version: 0.21.3
appVersion: 0.21.3
description: Cadence is a distributed, scalable, durable, and highly available orchestration engine to execute asynchronous long-running business logic in a scalable and resilient way.
icon: https://raw.githubusercontent.com/uber/cadence-web/master/client/assets/logo.svg
Expand Down
21 changes: 21 additions & 0 deletions cadence/templates/server-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,14 @@ spec:
- name: SQL_USER
value: {{ include "cadence.persistence.sql.user" (list $ $store) }}
- name: SQL_PASSWORD
{{- if or .Values.cassandra.enabled .Values.mysql.enabled }}
pregnor marked this conversation as resolved.
Show resolved Hide resolved
valueFrom:
secretKeyRef:
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
Copy link
Member

Choose a reason for hiding this comment

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

Optional: typo.

Suggested change
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}

Same at lines 171 and 302.
I am going to add references to those lines as well for tracking and web-UI suggestion committing purposes.

key: {{ include "cadence.persistence.secretKey" (list $ $store) | quote }}
{{- else -}}
value: {{ include "cadence.persistence.sql.password" (list $ $store) }}
{{- end -}}
{{- with $storeConfig.sql.connectAttributes }}
- name: SQL_CONNECT_ATTRIBUTES
value: {{ include "to-query" . }}
Expand Down Expand Up @@ -158,7 +165,14 @@ spec:
- name: SQL_USER
value: {{ include "cadence.persistence.sql.user" (list $ $store) }}
- name: SQL_PASSWORD
{{- if or .Values.cassandra.enabled .Values.mysql.enabled }}
pregnor marked this conversation as resolved.
Show resolved Hide resolved
valueFrom:
secretKeyRef:
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
Copy link
Member

@pregnor pregnor Nov 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Reference: https://github.com/banzaicloud/banzai-charts/pull/1302/files#r742588952.

Suggested change
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}

key: {{ include "cadence.persistence.secretKey" (list $ $store) | quote }}
{{- else -}}
value: {{ include "cadence.persistence.sql.password" (list $ $store) }}
{{- end -}}
{{- with $storeConfig.sql.connectAttributes }}
- name: SQL_CONNECT_ATTRIBUTES
value: {{ include "to-query" . }}
Expand Down Expand Up @@ -282,7 +296,14 @@ spec:
- name: SQL_USER
value: {{ include "cadence.persistence.sql.user" (list $ $store) }}
- name: SQL_PASSWORD
{{ - if or .Values.cassandra.enabled .Values.mysql.enabled }}
pregnor marked this conversation as resolved.
Show resolved Hide resolved
valueFrom:
secretKeyRef:
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
Copy link
Member

@pregnor pregnor Nov 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Reference: https://github.com/banzaicloud/banzai-charts/pull/1302/files#r742588952.

Suggested change
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}
name: {{ include "cadence.persistence.secretName" (list $ $store) | quote }}

key: {{ include "cadence.persistence.secretKey" (list $ $store) | quote }}
{{- else -}}
value: {{ include "cadence.persistence.sql.password" (list $ $store) }}
{{- end -}}
{{- with $storeConfig.sql.connectAttributes }}
- name: SQL_CONNECT_ATTRIBUTES
value: {{ include "to-query" . }}
Expand Down