-
Notifications
You must be signed in to change notification settings - Fork 362
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
Feature: k0s runtime remain work #1686
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
053e716
feat: add k0s runtime join/delete/reset/upgrade.
starComingup 0691113
resolved: log format, cmd in code, simplify code.
starComingup 65a56fc
resolved function name confuse, simplify code.
starComingup a487276
add runtime entrance, diff k0s、k8s、k3s。
starComingup 28bd67e
resolve conversation and enhanced runtime logic
starComingup File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| // Copyright © 2022 Alibaba Group Holding Ltd. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package processor | ||
|
|
||
| import ( | ||
| "github.com/sealerio/sealer/pkg/runtime" | ||
| "github.com/sealerio/sealer/pkg/runtime/k0s" | ||
| "github.com/sealerio/sealer/pkg/runtime/kubernetes" | ||
| "github.com/sealerio/sealer/pkg/runtime/kubernetes/kubeadm" | ||
| v2 "github.com/sealerio/sealer/types/api/v2" | ||
| "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| func ChooseRuntime(rootfs string, cluster *v2.Cluster, config *kubeadm.KubeadmConfig) (runtime.Interface, error) { | ||
| metadata, err := runtime.LoadMetadata(rootfs) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| hintInfo(metadata.ClusterRuntime) | ||
|
|
||
| switch metadata.ClusterRuntime { | ||
| case runtime.K8s: | ||
| return kubernetes.NewDefaultRuntime(cluster, config) | ||
| case runtime.K0s: | ||
| return k0s.NewK0sRuntime(cluster) | ||
| // Todo case runtime.K3s: | ||
| default: | ||
| return kubernetes.NewDefaultRuntime(cluster, config) | ||
| } | ||
| } | ||
|
|
||
| // hintInfo will hint end-user which cluster runtime will load and move to using new version ClusterImage. | ||
| func hintInfo(clusterRuntime runtime.ClusterRuntime) { | ||
| if clusterRuntime != "" { | ||
| logrus.Infof("using %s as a cluster runtime.", clusterRuntime) | ||
| return | ||
| } | ||
| logrus.Infof("using k8s as a default cluster runtime.") | ||
| logrus.Infof("the old sealer version is deprecated, using new version of sealer and ClusterImage is encouraged!") | ||
| } | ||
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
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
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
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
Oops, something went wrong.
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.
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 wish to see more thinking details about the
defaultcase. From my point of view, if there is no metadata.ClusterRuntime in image rootfs details, we take it as k8s by default. Because in the original implementation of ClusterImage, there is no metadata.ClusterRuntime, and we have to make the new version of sealer compatible with the legacy ClusterImage format. For what is worth, I suggest to add a log to tell end-user that he is using a legacy version, and using new version of sealer and ClusterImage is encouraged.Otherwise, I think you should add a line of explicit log at Line31 to show the ClusterRuntime info.
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 agree with add a cluster runtime info and hint end-user using new version ClusterImage.