Main changes for kube/cluster-init.sh for multi-node cluster handling #4385
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
naiming-zededa
commented
Oct 18, 2024
naiming-zededa
commented
- create the cluster-utils.sh in pkg/kube for a number of functions
- get EdgeNodeClusterStatus from 'zedkube' for cluster status, cluster nodeip, cluster prefix, etc
- a background process to monitor the cluster mode changes
- implement cluster mode change logic and operations for change from single-node to cluster, or from cluster back to single-node
- save kube /var/lib at single-node first time setup for later use when the mode changes back from cluster mode to single node
- display eve-release string for get node OS-IMAGE field
- this patch tested still works in kubevirt single-node case.
- some of the external_boot_img changes in the patch is from Andrew's diff.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4385 +/- ##
=======================================
Coverage 20.93% 20.93%
=======================================
Files 13 13
Lines 2895 2895
=======================================
Hits 606 606
Misses 2163 2163
Partials 126 126 ☔ View full report in Codecov by Sentry. |
naiming-zededa
force-pushed
the
naiming-cluster-init-change
branch
from
c030dfa
to
6871b98
Compare
pkg/kube/cluster-init.sh
Outdated
| @@ -1,141 +1,109 @@ | |||
| #!/bin/sh | |||
| # | |||
| # Copyright (c) 2023-2024 Zededa, Inc. | |||
| # Copyright (c) 2024 Zededa, Inc. | |||
There was a problem hiding this comment.
You shouldn't remove the old year.
There was a problem hiding this comment.
fixed. not sure how this was modified.
pkg/kube/cluster-init.sh
Outdated
| nohup /usr/bin/k3s server --config "$k3s_config_file" & | ||
|
|
||
| # remember the k3s start time | ||
| k3s_last_start_time=$(date +%s) |
There was a problem hiding this comment.
Did you intend to use this variable?
There was a problem hiding this comment.
removed, no need for this in the latest change.
eriknordmark
changed the title
naiming-zededa
force-pushed
the
naiming-cluster-init-change
branch
from
6871b98
to
51911dd
Compare
naiming-zededa
force-pushed
the
naiming-cluster-init-change
branch
from
51911dd
to
42a1e98
Compare
andrewd-zededa
suggested changes
Oct 18, 2024
pkg/kube/cluster-init.sh
Outdated
|
|
||
| logmsg "Successfully installed external-boot-image $import_tag as $eve_external_boot_img" | ||
| rm -f /etc/external-boot-image.tar | ||
| import_name_tag=$(tar -xOf /etc/external-boot-image.tar manifest.json | jq -r '.[0].RepoTags[0]') |
There was a problem hiding this comment.
This is in my PR #4363
There was a problem hiding this comment.
Yeh, we need to coordinate to see which one merge in first, then modify accordingly.
There was a problem hiding this comment.
@naiming-zededa Can you remove my changes from your PR?
There was a problem hiding this comment.
Removed with my latest patch.
pkg/kube/cluster-init.sh
Outdated
| lhCfgPath=/var/lib/lh-cfg-${LONGHORN_VERSION}.yaml | ||
| if [ ! -e $lhCfgPath ]; then | ||
| curl -k https://raw.githubusercontent.com/longhorn/longhorn/${LONGHORN_VERSION}/deploy/longhorn.yaml > "$lhCfgPath" | ||
| if [ ! -f /var/lib/longhorn_installing ]; then |
There was a problem hiding this comment.
This is also from #4363
pkg/kube/cluster-init.sh
Outdated
| fi | ||
| if ! grep -q 'create-default-disk-labeled-nodes: true' "$lhCfgPath"; then | ||
| sed -i '/ default-setting.yaml: |-/a\ create-default-disk-labeled-nodes: true' "$lhCfgPath" | ||
| lhStatus=$(kubectl -n longhorn-system get daemonsets -o json | jq '.items[].status | .numberReady==.desiredNumberScheduled' | tr -d '\n') |
There was a problem hiding this comment.
This is also from #4363
naiming-zededa
force-pushed
the
naiming-cluster-init-change
branch
3 times, most recently
from
a3b402e
to
8b3271c
Compare
|
Looks like it needs to be rebased. |
naiming-zededa
force-pushed
the
naiming-cluster-init-change
branch
from
8b3271c
to
26158ac
Compare
- create the cluster-utils.sh in pkg/kube for a number of functions - get EdgeNodeClusterStatus from 'zedkube' for cluster status, cluster nodeip, cluster prefix, etc - a background process to monitor the cluster mode changes - implement cluster mode change logic and operations for change from single-node to cluster, or from cluster back to single-node - save kube /var/lib at single-node first time setup for later use when the mode changes back from cluster mode to single node - display eve-release string for get node OS-IMAGE field Signed-off-by: Naiming Shen <[email protected]>
naiming-zededa
force-pushed
the
naiming-cluster-init-change
branch
from
26158ac
to
f176b77
Compare
Hi @deitch rebased in the update. please check to see if this is in the intended place. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.