-
-
Notifications
You must be signed in to change notification settings - Fork 20
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
Migration from CHT 3.x on docker-compose to CHT 4.x on k3s #1723
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. I'm not sure we need two pages, since there is a lot of repetition. Or is there a way we can get the common parts together and just reference them? I think there was one instance of this ...
Ah:
hide_summary: true |
This page is reused in some other page like: https://github.com/search?q=repo%3Amedic%2Fcht-docs+_partial_cht_api&type=code
So I think all common elements, in both PRs, can be collected into partials and shared across.
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work here - thanks Henok!
I think using an shared _include-file
is the way to go for content that overlaps per Diana's suggestion. Let me know if you need a hand!
I think the link titles are a bit confusing currently:
- 4.x
- Data migration to 4.x
- Docker Compose to K3s Clustered Migration
- Docker Compose to K3s Single-Node Migration
Instead, I think we can clean them up to be more clear (possibly a sub-directory? seems a bit too nested...we'll go flat for now!):
- 4.x
- Migration: 3.x to 4.x
- Migration: 4.x Docker to 4.x k3s (Multi-node)
- Migration: 4.x Docker to 4.x k3s (Single-node)
I've made suggested code changes for this, but can't edit the Migration: 3.x to 4.x
document link in the PR, please make the change though.
As well, we should make each number a heading so it's clickable and appears in the right hand side TOC. I've made suggested code changes for this.
Variables should always be the same to reduce confusion (eg username
vs admin-user
vs saved-user-login
). I've made suggested code changes for this, but may have missed some!
It's incredibly daunting have a YAML file and try and read through any changes that are needed. I recommend we:
- always list out the items that need changing
- always use the same syntax to highlight an item need changing using angle brackets:
<change-me>
- Always use the same name for the same value in and out of the YAML(mentioned above)
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Accepted most of the suggested changes. I'm now extracting the partial.
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
FYI, I'm rebasing this PR against the main branch. |
be8ead6
to
29a1556
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Coming along! Nice work here.
See below for requested changes.
It's also not clear what the "Data migration to 4.x" doc is for. Is that for both docker and k3s? Is that more generically for how to migrate from 3.x to 4.x using the couchdb-migration tool? I think we should update the link title to be more accurate. Maybe that's:
Data migration to 4.x
-> Migration: Docker 3.x to Docker 4.x
- but I'm not sure!
As well, we need to clarify on the page itself as it just says:
Guide to migrate existent data from CHT 3.x to CHT 4.x
But doesn't qualify it any further. The two new pages do a great job of this!
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/_partial_migration_3x_docker_to_4x_k3s.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cool! Left some minor comments :)
{{ < read-content file="hosting/4.x/_partial_values_explanation.md" }} | ||
|
||
```yaml | ||
project_name: "your-namespace" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It could be tough to keep the documentation and the helm repo in sync. Can we, instead of inlining the whole contents of the values file somehow link to the current version of it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have somehow struggled with this too. The original values.yaml in the helm charts is much larger and robust as it accounts for all the different scenarios. I originally thought that the comments on the yaml would be enough to guide people to the correct final configuration of what should be removed or what should be included. However, that hasn't been the case. That's why I decided to add example config of the various scenarios in the docs. Although not ideal, we'd have to remember to keep the docs in sync when we add/remove features from the helm-charts.
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
@mrjones-plip I have renamed the file and changed the description as well. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very close! I noticed a few discrepancies in how we name inline variables that we want the user to replace - I've made suggestions to make these all homogeneous.
I see you made some changes to the frontmatter of the internal Medic EKS guide. This is not what I was suggesting. Instead, I suggest we change the name of "Migration from CHT 3.x to CHT 4.x" document here - this document is not clear what it applies to. However! After reviewing this PR for a third time, I think we should just create a new directory to simplify the left hand navigation and page titles. ALL The documents are 3.x to 4.x and they're ALL from docker hosting ;) I propose we take this:
and create a "Migration guides" directory and rename the links like so:
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
content/en/contribute/medic/product-development-process/data-migration-3x-eks-to-4x-eks.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-multi.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm leaving this to @mrjones-plip to finish full review. Thanks for making all the changes!
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea. I have re-organized docs into a migration dir.
content/en/hosting/4.x/data-migration-3x-docker-to-4x-k3s-single.md
Outdated
Show resolved
Hide resolved
Co-authored-by: mrjones <[email protected]>
Co-authored-by: mrjones <[email protected]>
bdd24b9
to
2505645
Compare
@mrjones-plip I have also updated the links in other docs referencing the migration page. The build is passing and I think iit should work fine. Let me know if anything is broken or feel free to also push directly to the branch if you think there should be a different folder structure. |
cool - I'll take a look later today and get back to you! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks so much! Made a minor fix in b742888 , but this is good to go. w00t \o/
Description
I have made them separate files because it became complicated as a one file with if/else conditions. It makes them more readable this way.
License
The software is provided under AGPL-3.0. Contributions to this project are accepted under the same license.