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.

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

(PXP-6861): configure Metadata Service creds in kube-setup-ssjdispatcher #1428

Merged
merged 9 commits into from
Oct 14, 2020

Conversation

johnfrancismccann
Copy link
Contributor

Jira Ticket: PXP-6861

This PR extends kube-setup-ssjdispatcher so that if the Metadata Service is deployed and MDS basic auth creds are present, add those MDS creds to SSJDispatcher's secret. See related indexs3client PR requiring SSJDispatcher to pass it MDS creds. Going forward, the SSJDispatcher service will require MDS creds to start.

Note that the addition of MDS creds will not break the "old" SSJDispatcher/indexs3client combination (i.e. versions of SSJDispatcher/indexs3client not requiring MDS creds).

New Features

  • Configure Metadata Service basic auth creds in kube-setup-ssjdispatcher

@johnfrancismccann johnfrancismccann force-pushed the chore/configure-mds-creds-in-ssjdispatcher branch from 5e25e54 to 73e9eb5 Compare October 13, 2020 17:14
@johnfrancismccann
Copy link
Contributor Author

Should we move:

if g3k_manifest_lookup .versions.ssjdispatcher 2>&1 /dev/null; then
gen3 kube-setup-ssjdispatcher
fi

To after:
gen3 kube-setup-metadata

So that the MDS creds are still configured if gen3 roll all is being run for the first time or the MDS creds get rotated❓

Copy link
Contributor

@frickjack frickjack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey John,
This looks really good to me.
Before we merge - would you do the following?

  • login to each of the jenkins-* environments:
 ls -d1 /home/jenkins-*
/home/jenkins-blood
/home/jenkins-brain
/home/jenkins-dcp
/home/jenkins-genomel
/home/jenkins-niaid
/home/jenkins-perf
  • in each environment:
(
cd cdis-manifst && git pull --prune)
cd cloud-automation && git pull --prune && git checkout your-branch
gen3 kube-setup-ssjdispatcher
git checkout master
)

That will get all our jenkins environments setup with the new creds, and be a good test case too.

@johnfrancismccann
Copy link
Contributor Author

Alright sounds good, so I ran:

(
(cd cdis-manifest && git pull --prune)
cd cloud-automation && git pull --prune && git checkout chore/configure-mds-creds-in-ssjdispatcher
gen3 kube-setup-ssjdispatcher
git checkout master
)

in:

  • jenkins-blood
  • jenkins-brain
  • jenkins-dcp
  • jenkins-genomel
  • jenkins-niaid
  • jenkins-perf

And the MDS creds were set up as expected for all of these Jenkins environments with the exception of jenkins-perf which doesn't have ssjdispatcher deployed.

Copy link
Contributor

@frickjack frickjack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome!

@johnfrancismccann johnfrancismccann merged commit 110d504 into master Oct 14, 2020
@johnfrancismccann johnfrancismccann deleted the chore/configure-mds-creds-in-ssjdispatcher branch October 14, 2020 15:05
jacquayj added a commit to bioteam/cloud-automation that referenced this pull request Nov 10, 2020
* commit '59bf7fdd8bc1a497b2347eb3610612b97ded3023': (234 commits)
  Chore/config env upgrade pip (uc-cdis#1448)
  Chore/remove pylib2 (uc-cdis#1447)
  add new dependency (uc-cdis#1446)
  Chore/wts fail fast (uc-cdis#1445)
  feat(sftp-server): Added terraform to create sftp server (uc-cdis#1437)
  Feat/mariner storage (uc-cdis#1442)
  chore(useryaml): only in usersync (uc-cdis#1440)
  Whitelist opportunityinsights.org (uc-cdis#1441)
  Fix/tform eks (uc-cdis#1439)
  Pybase: don't wait for wsgi.sock (uc-cdis#1438)
  chore(dashboard/open-links): new dash app (uc-cdis#1436)
  Chore/update calico 1.7 (uc-cdis#1427)
  fix(jenkinx-pv-size): Updated the size of the persistent volume to match manual size increase (uc-cdis#1417)
  Fix/configmaps del (uc-cdis#1434)
  Chore/vpn signed url (uc-cdis#1433)
  feat(access-roll): Added access-backend to kube-roll-all (uc-cdis#1431)
  (PXP-6861): configure Metadata Service creds in kube-setup-ssjdispatcher (uc-cdis#1428)
  Chore/tform  custom (uc-cdis#1426)
  Update maintenance.md (uc-cdis#1425)
  fix(qa): Define submission order for gentestdata (uc-cdis#1424)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants