Merge pull request #1125 from dod-ccpo/kubectl-migration-bug

Fix bug in kubectl command in script/cluster_migration
This commit is contained in:
dandds 2019-10-17 16:04:45 -04:00 committed by GitHub
commit 5cdead1175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

View File

@ -31,6 +31,9 @@ spec:
- name: atst-config - name: atst-config
mountPath: "/opt/atat/atst/atst-overrides.ini" mountPath: "/opt/atat/atst/atst-overrides.ini"
subPath: atst-overrides.ini subPath: atst-overrides.ini
- name: pgsslrootcert
mountPath: "/opt/atat/atst/ssl/pgsslrootcert.crt"
subPath: pgsslrootcert.crt
volumes: volumes:
- name: atst-config - name: atst-config
secret: secret:
@ -39,4 +42,11 @@ spec:
- key: override.ini - key: override.ini
path: atst-overrides.ini path: atst-overrides.ini
mode: 0644 mode: 0644
- name: pgsslrootcert
configMap:
name: pgsslrootcert
items:
- key: cert
path: pgsslrootcert.crt
mode: 0666
restartPolicy: Never restartPolicy: Never

View File

@ -28,7 +28,7 @@ if echo "$JOB_SUCCESS" | grep -q "condition met"; then
else else
POD_NAME=$(${K8S_CMD} -n atat get pods -l job-name=migration -o=jsonpath='{.items[0].metadata.name}') POD_NAME=$(${K8S_CMD} -n atat get pods -l job-name=migration -o=jsonpath='{.items[0].metadata.name}')
echo "Job failed:" echo "Job failed:"
$K8S_CMD -n atat log $POD_NAME $K8S_CMD -n atat logs $POD_NAME
delete_job delete_job
exit 1 exit 1
fi fi