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

kubernetes and gitops docs updates #2888

Merged
merged 17 commits into from
Aug 24, 2023
Merged

kubernetes and gitops docs updates #2888

merged 17 commits into from
Aug 24, 2023

Conversation

atvaccaro
Copy link
Contributor

@atvaccaro atvaccaro commented Aug 14, 2023

Description

Removes some outdated/unnecessary docs around k8s/infra, cleans up what remains, and combines into READMEs in the appropriate folders. Also fixes the wrong readme showing for the repo.

Ran through some stuff with @evansiroky today; we're going to walk through a Metabase restore at some point to test the backups documentation.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation

How has this been tested?

TODO: run through backup restoration process with @evansiroky

Post-merge follow-ups

  • No action required
  • Actions required (specified below)

@github-actions
Copy link

@atvaccaro atvaccaro self-assigned this Aug 14, 2023
@lauriemerrell
Copy link
Contributor

Please update: https://docs.calitp.org/data-infra/kubernetes/deployment.html (turn into Mermaid diagram)

ci/README.md Outdated Show resolved Hide resolved

pr -- Yes --> candidates_branch -- "Open PR from candidates/branch-name to releases/test" --> branch_diff -- "Merge candidate PR to releases/test" --> branch_invoke -- Merge to main after review and testing --> candidates_main -- "Open PR from candidates/main to releases/prod" --> prod_diff -- "Merge candidate PR to releases/prod" --> prod_invoke
pr -- "No; merge to main after review" --> candidates_main
```
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess this may be obvious but is it helpful to make some kind of distinction (maybe bullets below or perhaps could change shapes in the mermaid diagram) between code changes and deployments? I.e., merging PRs to main changes code but the GH actions deploy. So if you don't merge candidates/main at the end, you will have changed the main codebase but won't have deployed those changes and they won't run anywhere, right?

Copy link
Contributor

Choose a reason for hiding this comment

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

So like, regardless of the test branch situation, you only ever merge your core code changes once right? From your normal git branch to main? But the candidate branch stuff is to deploy changes, either for testing or for real?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct, yes. I think I addressed this with a clarification

kubernetes/README.md Show resolved Hide resolved
kubernetes/README.md Outdated Show resolved Hide resolved
### Secrets
Because we use [Github OAuth](https://zero-to-jupyterhub.readthedocs.io/en/latest/administrator/authentication.html?highlight=oauth#github) for user authentication in JupyterHub, we have to provide a client-id and client-secret to the JupyterHub Helm chart. Here is what the full configuration for the GitHub OAuth in our JupyterHub Helm chart's `values.yaml` might look like:

```yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

did you want to replace this with a link to the real file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think no, because technically this is the entire values.yaml structure that we split into 2 places

kubernetes/README.md Outdated Show resolved Hide resolved
kubernetes/README.md Outdated Show resolved Hide resolved
kubernetes/README.md Outdated Show resolved Hide resolved
kubernetes/README.md Show resolved Hide resolved
@atvaccaro atvaccaro changed the title Infra docs kubernetes and gitops docs updates Aug 17, 2023
@atvaccaro
Copy link
Contributor Author

Copy link
Contributor

@lauriemerrell lauriemerrell left a comment

Choose a reason for hiding this comment

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

Oops I thought I did this a few days ago

kubernetes/README.md Outdated Show resolved Hide resolved
@atvaccaro
Copy link
Contributor Author

I need to fix https://docs.calitp.org/data-infra/architecture/services.html

Actually this isn't easily fixable, but I've addressed other things that have come up.

@atvaccaro atvaccaro merged commit d400d0c into main Aug 24, 2023
6 checks passed
@atvaccaro atvaccaro deleted the infra-docs branch August 24, 2023 16:41
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