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

Avoid overwride configs of container for docker mode #200

Merged

Conversation

LinuxSuRen
Copy link
Contributor

No description provided.

@LinuxSuRen LinuxSuRen added the enhancement New feature or request label Sep 10, 2021
@codecov
Copy link

codecov bot commented Sep 10, 2021

Codecov Report

❗ No coverage uploaded for pull request base (master@294fd2f). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##             master    #200   +/-   ##
========================================
  Coverage          ?   8.99%           
========================================
  Files             ?      32           
  Lines             ?    1356           
  Branches          ?       0           
========================================
  Hits              ?     122           
  Misses            ?    1224           
  Partials          ?      10           
Flag Coverage Δ
unittests 8.99% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 294fd2f...739d477. Read the comment docs.

@@ -103,7 +103,7 @@ func (o *kkOption) preRunE(cmd *cobra.Command, args []string) (err error) {
dep["crictl"] = "kubernetes-sigs/cri-tools"
dep["runc"] = "opencontainers/runc"
}
if err = is.CheckDepAndInstall(dep); err == nil {
if err = is.CheckDepAndInstall(dep); err == nil && o.container == "docker" {
Copy link
Contributor

Choose a reason for hiding this comment

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

IMO, if the container isn't docker, then set default config files for containerd.

- err == nil && o.container == "docker"
+ err == nil && o.container != "docker"

@JohnNiang
Copy link
Contributor

LGTM

@LinuxSuRen LinuxSuRen merged commit e5b37ce into kubesphere-sigs:master Sep 10, 2021
@LinuxSuRen LinuxSuRen deleted the fix-kk-install-file-check branch September 10, 2021 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants