vets-api icon indicating copy to clipboard operation
vets-api copied to clipboard

k8s/master Merger

Open stevenjcumming opened this issue 9 months ago • 3 comments

~Note: Merge https://github.com/department-of-veterans-affairs/vets-api/pull/16058 first~ merged

Summary

Instead of updating the k8s branch and merging with master. This branch is updated with code from k8s and will be merged with master.

  • separate k8s build.yml workflows into multiple files (build.yml, code_checks.yml, deploy.yml)
  • forward proxy cert moved from k8s to master
  • remove datadog config for container agent
  • move sidekiq_alive to initializer
  • copy import-va-certs.sh from k8s
  • minor updates on redis_store to match k8s

Workflow Logic

  1. Code Checks: trigger Code Checks on open PR and when pushed to master PRs
    • trigger Code Checks on open PR and when pushed to master PRs
  2. Build:
    • do not build images and push to ECR on every open PR.
    • do build images after a PR is merged to master and merged code has completed Code Checks
  3. Deploy:
    • do not deploy on every open PR.
    • merged PR should:
      • Pass Code Checks
      • Ensure the Build workflow has completed to ensure a docker image to push to the manifest repo

Things not moved over from k8s branch

  • .github/workflows/deploy-template.yml
  • bin/deps
  • bin/test
  • bin/test-setup
  • clamav_tmp/* (I believe these were committed accidentally)
  • Documentation updates are in another PR that should be merged before this one
  • tmp/bundle_cache.tar.bz2 (I don't know what this is)

Related issue(s)

  • https://github.com/department-of-veterans-affairs/va.gov-team/issues/81621
  • https://github.com/department-of-veterans-affairs/vets-api/pull/16058

Testing done

  • [ ] Testing master-based docker image on staging

What areas of the site does it impact?

don't need a k8s branch any more

Acceptance criteria

  • [ ] Login on Review Instances
  • [ ] Test claim_letters api endpoint on Review Instance
  • [ ] Master is automatically deploy to non-prod environments
  • [ ] Unit Tests, Linting, & Security Checks run on pushes
  • [ ] Docker images are created/updated for PRs and master
  • [ ] the k8s branch isn't needed for deployment

Requested Feedback

I'm not very familiar with the workflows so everything should be carefully reviewed

stevenjcumming avatar Apr 30 '24 20:04 stevenjcumming

Error: A file (or its parent directories) does not have a CODEOWNERS entry. Please update the .github/CODEOWNERS file and add the entry for the Offending file: config/initializers/sidekiq_alive.rb

va-vsp-bot avatar Apr 30 '24 20:04 va-vsp-bot

@stevenjcumming I think we can move forward with the workflow dispatch approach in the mockdata repo (as detailed in the workflow comments). There may be some setup involved here for the vets-api-mockdata-update event type

LindseySaari avatar May 07 '24 14:05 LindseySaari

@stevenjcumming I think we can move forward with the workflow dispatch approach in the mockdata repo (as detailed in the workflow comments). There may be some setup involved here for the vets-api-mockdata-update event type

@LindseySaari could this be a separate PR? I want to make sure I understand what you are saying before I change it.

stevenjcumming avatar May 08 '24 18:05 stevenjcumming