feat(platform): support containerd as runtime (#1390) #1470
Conversation
This file contains hidden or 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
huxiaoliang
reviewed
Aug 18, 2021
huxiaoliang
reviewed
Aug 18, 2021
huxiaoliang
reviewed
Aug 18, 2021
leoryu
reviewed
Aug 18, 2021
leoryu
reviewed
Aug 18, 2021
huxiaoliang
reviewed
Aug 18, 2021
leoryu
reviewed
Aug 18, 2021
leoryu
reviewed
Aug 18, 2021
leoryu
reviewed
Aug 18, 2021
leoryu
reviewed
Aug 18, 2021
test/e2e/manifests/tke-platform-controller/tke-platform-controller.yaml
Outdated
Show resolved
Hide resolved
leoryu
reviewed
Aug 18, 2021
leoryu
reviewed
Aug 18, 2021
| return err | ||
| } | ||
| option := &image.Option{Version: c.Spec.Version, RegistryDomain: p.config.Registry.Domain} | ||
| err = image.PullKubernetesImages(c, machineSSH, option) |
Contributor
There was a problem hiding this comment.
should not prepull all k8s images
leoryu
reviewed
Aug 18, 2021
| done | ||
| } | ||
|
|
||
| function download::critools() { |
leoryu
reviewed
Aug 18, 2021
| download::docker | ||
| download::containerd | ||
| download::nerdctl | ||
| download::critools |
leoryu
reviewed
Aug 18, 2021
| env = append(env, fmt.Sprintf("DOCKER_VERSIONS=%s", strings.Join(spec.DockerVersions, " "))) | ||
| env = append(env, fmt.Sprintf("CONTAINERD_VERSIONS=%s", strings.Join(spec.ContainerdVersions, " "))) | ||
| env = append(env, fmt.Sprintf("CRITOOLS_VERSIONS=%s", strings.Join(spec.CriToolsVersions, " "))) | ||
| env = append(env, fmt.Sprintf("NERDCTL_VERSIONS=%s", strings.Join(spec.NerdctlVersions, " "))) |
huxiaoliang
requested changes
Aug 18, 2021
Contributor
huxiaoliang
left a comment
huxiaoliang
left a comment
There was a problem hiding this comment.
need address comments
leoryu
reviewed
Aug 18, 2021
| return err | ||
| } | ||
| cmdString := fmt.Sprintf("docker pull %s", images.Get().TKEGateway.FullName()) | ||
| cmdString := fmt.Sprintf("nerdctl --insecure-registry --namespace k8s.io pull %s", images.Get().TKEGateway.FullName()) |
Contributor
Author
There was a problem hiding this comment.
Need pull without certs.
huxiaoliang
reviewed
Aug 18, 2021
| return err | ||
| } | ||
| } else { | ||
| cmd = fmt.Sprintf("nerdctl --insecure-registry --namespace k8s.io pull %s", image) |
Contributor
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment.
Add containerd proxy case.
leoryu
reviewed
Aug 18, 2021
| - name: kubelet-volume | ||
| mountPath: /app/provider/baremetal/conf/kubelet/ | ||
| - name: kubeadm-volume | ||
| - name: kubeadm-config-volume |
Contributor
Author
There was a problem hiding this comment.
Change to kubeadm-volume
leoryu
reviewed
Aug 18, 2021
| ) | ||
|
|
||
| func Install(s ssh.Interface, version string) error { | ||
| func Install(s ssh.Interface, version string, option *Option) error { |
Contributor
Author
There was a problem hiding this comment.
Remove the version into option.
leoryu
reviewed
Aug 18, 2021
| volumeMounts: | ||
| - mountPath: /app/provider/baremetal | ||
| name: provider-volume | ||
| - mountPath: /app/provider/baremetal/conf/containerd |
leoryu
reviewed
Aug 18, 2021
| - name: containerd-volume | ||
| emptyDir: {} | ||
| - name: kubeadm-config-volume | ||
| emptyDir: {} |
leoryu
reviewed
Aug 19, 2021
| @@ -0,0 +1,4 @@ | |||
| runtime-endpoint: unix:///run/containerd/containerd.sock | |||
huxiaoliang
reviewed
Aug 19, 2021
| if err != nil { | ||
| return errors.Wrap(err, machine.IP) | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
we need try contained works well with gpu
huxiaoliang
reviewed
Aug 19, 2021
| items = append(items, components.Pause.FullName()) | ||
|
|
||
| return items | ||
| } |
Contributor
There was a problem hiding this comment.
consolidate ListKubernetesImageFullNamesWithVersion and ListKubernetesNodeImageFullNamesWithVersion
Contributor
Author
There was a problem hiding this comment.
consolidate done.
huxiaoliang
requested changes
Aug 23, 2021
Contributor
huxiaoliang
left a comment
huxiaoliang
left a comment
There was a problem hiding this comment.
don't merge, the comments doesn't get fully addressed
Conflicts: api/platform/v1/generated.pb.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What type of PR is this?
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?:
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: