Skip to content

Commit

Permalink
Make AEE logs storage optional
Browse files Browse the repository at this point in the history
Signed-off-by: Fabricio Aguiar <[email protected]>
  • Loading branch information
fao89 committed May 25, 2023
1 parent 791b7f9 commit 1698892
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ kuttl-test-*.json
kubeconfig
devsetup/ci-framework
devsetup/tls.crt
.vscode
7 changes: 0 additions & 7 deletions ci/playbooks/deploy_edpm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
name: libguestfs-tools-c
state: present

- name: Run make crc_storage
community.general.make:
target: crc_storage
chdir: "{{ install_yamls_basedir }}"
params:
OUT: "{{ install_yamls_basedir }}/out"

- name: Run make edpm_compute
community.general.make:
target: edpm_compute
Expand Down
26 changes: 15 additions & 11 deletions scripts/gen-edpm-kustomize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,6 @@ patches:
- op: replace
path: /spec/roles/edpm-compute/openStackAnsibleEERunnerImage
value: ${OPENSTACK_RUNNER_IMG}
- op: replace
path: /spec/roles/edpm-compute/nodeTemplate/extraMounts
value:
- extraVolType: Logs
volumes:
- name: ansible-logs
persistentVolumeClaim:
claimName: ansible-ee-logs
mounts:
- name: ansible-logs
mountPath: "/runner/artifacts"
- op: replace
path: /spec/roles/edpm-compute/nodeTemplate/ansibleVars
value: |
Expand Down Expand Up @@ -188,6 +177,21 @@ patches:
path: /spec/roles/edpm-compute/nodeTemplate/ansibleSSHPrivateKeySecret
value: ${EDPM_ANSIBLE_SECRET}
EOF
if oc get pvc ansible-ee-logs 2>&1 1>/dev/null; then
cat <<EOF >>kustomization.yaml
- op: replace
path: /spec/roles/edpm-compute/nodeTemplate/extraMounts
value:
- extraVolType: Logs
volumes:
- name: ansible-logs
persistentVolumeClaim:
claimName: ansible-ee-logs
mounts:
- name: ansible-logs
mountPath: "/runner/artifacts"
EOF
fi
if [ "$EDPM_SINGLE_NODE" == "true" ]; then
cat <<EOF >>kustomization.yaml
- op: remove
Expand Down

0 comments on commit 1698892

Please sign in to comment.