Skip to content

Commit

Permalink
Merge pull request #391 from cloud-pi-native/refactor/argo-redis-open…
Browse files Browse the repository at this point in the history
…shift

Refactor/argo redis openshift
  • Loading branch information
cmon33 authored Nov 22, 2024
2 parents bdfa798 + ef14550 commit 57df763
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 7 deletions.
2 changes: 2 additions & 0 deletions roles/argocd/templates/ingress.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ metadata:
{{ key }}: {{ val }}
{% endfor %}
spec:
ingressClassName: {{ dsc.ingress.className | default('') }}
{% if not dsc.ingress.tls.type == 'none' %}
tls:
- hosts:
Expand Down Expand Up @@ -49,6 +50,7 @@ metadata:
{{ key }}: {{ val }}
{% endfor %}
spec:
ingressClassName: {{ dsc.ingress.className | default('') }}
{% if not dsc.ingress.tls.type == 'none' %}
tls:
- hosts:
Expand Down
11 changes: 4 additions & 7 deletions roles/argocd/templates/values/10-redis-openshift.j2
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{% if dsc.global.platform == "openshift" %}
redis-ha:
containerSecurityContext:
runAsUser: null
runAsGroup: null
haproxy:
containerSecurityContext:
runAsUser: null
runAsGroup: null
global:
compatibility:
openshift:
adaptSecurityContext: auto
{% endif %}
1 change: 1 addition & 0 deletions roles/vault/tasks/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
command: vault status -format=json
register: vault_status
ignore_errors: true
changed_when: false

- name: Set vault_initialized fact
ansible.builtin.set_fact:
Expand Down
12 changes: 12 additions & 0 deletions roles/vault/tasks/post-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,18 @@
"canonical_id": "{{ user_group.json.data.id }}"
body_format: json

- name: set oidc method as default
ansible.builtin.uri:
validate_certs: "{{ dsc.exposedCA.type == 'none' }}"
url: "https://{{ vault_domain }}/v1/sys/auth/oidc/tune"
method: POST
status_code: [204]
headers:
"X-Vault-Token": "{{ vault_token }}"
body:
"listing_visibility": "unauth"
body_format: json

# AppRole
- name: Get auth methods
ansible.builtin.uri:
Expand Down

0 comments on commit 57df763

Please sign in to comment.