Skip to content

Add defaults and update guards for VSO secret injection support #283

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

Open
sunalawa wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −2
Open

Add defaults and update guards for VSO secret injection support #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions roles/common/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ image_pull_secret: ''
image_pull_secrets: []
operator_service_account_name: '{{ lookup("env","OPERATOR_SA_NAME") | default("galaxy-operator-sa",true) }}'
bundle_cacert_secret: ''
db_fields_encryption_secret: ''
container_token_secret: ''

# Proxy environment variables for Galaxy containers.
# Values are inherited from the operator pod environment.
Expand Down
2 changes: 1 addition & 1 deletion roles/common/tasks/db_fields_encryption_configuration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
set_fact:
db_fields_encryption_secret: '{{ ansible_operator_meta.name }}-db-fields-encryption'
cacheable: yes
when: db_fields_encryption_secret is undefined
when: not db_fields_encryption_secret | default('')

- name: Check for specified DB fields encryption configuration
k8s_info:
Expand Down
2 changes: 1 addition & 1 deletion roles/galaxy-config/tasks/combine_galaxy_settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
set_fact:
container_token_secret: '{{ ansible_operator_meta.name }}-container-auth'
cacheable: yes
when: container_token_secret is not defined
when: not container_token_secret | default('')

- include_tasks:
file: get_node_ip.yml
Expand Down
Loading