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

fix: skip setting up cedar-ingest client cred in ci #2526

Merged
merged 3 commits into from
Apr 23, 2024
Merged

fix: skip setting up cedar-ingest client cred in ci #2526

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7ed2ba
fix: skip setting up cedar-ingest client cred in ci
mfshao Apr 19, 2024
83495cc
fix cleanup
mfshao Apr 19, 2024
acf24ca
Merge branch 'master' into fix/disable-cred-cedar-ci
haraprasadj Apr 23, 2024
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
8 changes: 6 additions & 2 deletions gen3/bin/kube-setup-cedar-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,12 @@ if ! g3kubectl get secrets/cedar-g3auto > /dev/null 2>&1; then
return 1
fi

gen3_log_info "Checking cedar-client creds"
setup_creds
if [[ -n "$JENKINS_HOME" ]]; then
gen3_log_info "Skipping cedar-client creds setup in non-adminvm environment"
else
gen3_log_info "Checking cedar-client creds"
setup_creds
fi

if ! gen3 secrets decode cedar-g3auto cedar_api_key.txt > /dev/null 2>&1; then
gen3_log_err "No CEDAR api key present in cedar-g3auto secret, not rolling CEDAR wrapper"
Expand Down
Loading