Skip to content

feature(main): add v1.25 k8s support #1616

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

Merged
merged 1 commit into from
Aug 24, 2022
Merged

feature(main): add v1.25 k8s support #1616

merged 1 commit into from
Aug 24, 2022

Conversation

cuisongliu
Copy link
Collaborator

Signed-off-by: cuisongliu [email protected]

@codecov
Copy link

codecov bot commented Aug 24, 2022

Codecov Report

Merging #1616 (a53e3b8) into main (88cb20f) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1616   +/-   ##
=======================================
  Coverage   57.07%   57.07%           
=======================================
  Files           5        5           
  Lines         424      424           
=======================================
  Hits          242      242           
  Misses        164      164           
  Partials       18       18           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@@ -21,7 +21,7 @@ import "fmt"
const (
DefaultBashFmt = "cd %s && bash %s"
DefaultCPFmt = "mkdir -p %s && cp -rf %s/* %s/"
DefaultLnFmt = "mkdir -p %s && ln -s %s %s"
DefaultLnFmt = "ln -s %s %s"
Copy link
Member

Choose a reason for hiding this comment

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

seems must using mkdir -p %s && cp -rf %s/* %s

@@ -96,7 +96,7 @@ func (k *KubeadmRuntime) htpasswd(registry *v1beta1.RegistryConfig) error {
func (k *KubeadmRuntime) ApplyRegistry() error {
logger.Info("start to apply registry")
registry := k.getRegistry()
lnCmd := fmt.Sprintf(constants.DefaultLnFmt, registry.Data, registry.Data, k.getContentData().RootFSRegistryPath())
lnCmd := fmt.Sprintf(constants.DefaultLnFmt, k.getContentData().RootFSRegistryPath(), registry.Data)
Copy link
Member

Choose a reason for hiding this comment

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

seems should not modify this code

@fanux fanux merged commit 4f8ec79 into labring:main Aug 24, 2022
@cuisongliu cuisongliu deleted the v1.25 branch August 24, 2022 13:42
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