feat(installer): support containerd installation #1404
Merged
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
leoryu
reviewed
Jul 12, 2021
pkg/util/docker/docker.go
Outdated
| } | ||
| return nil | ||
| } | ||
|
|
||
| // PushImage pushes an image. | ||
| func (d *Docker) PushImage(image string) error { | ||
| cmdString := fmt.Sprintf("docker push %s", image) | ||
| cmdString := fmt.Sprintf("ctr images push %s -u admin:admin -k", image) |
There was a problem hiding this comment.
Change to use password and username.
leoryu
reviewed
Jul 12, 2021
| if err != nil { | ||
| return err | ||
| } | ||
| localHosts.File = "/etc/hosts" | ||
| localHosts.File = "/app/hosts" |
There was a problem hiding this comment.
Why change /etc/hosts to /app/hosts?
leoryu
reviewed
Jul 12, 2021
| @@ -1284,33 +1283,6 @@ func (t *TKE) setupLocalRegistry(ctx context.Context) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (t *TKE) startLocalRegistry() error { | |||
There was a problem hiding this comment.
Where the images should be pushed to before tke-registry is installed?
There was a problem hiding this comment.
tke-registry create by nerdctl because nerdctl can not create containers inside container.
leoryu
reviewed
Jul 21, 2021
| @@ -2529,40 +2500,23 @@ func (t *TKE) pushImages(ctx context.Context) error { | |||
| } | |||
|
|
|||
| // only push image | |||
| err = t.docker.PushImage(image) | |||
| err = t.docker.PushImage(image, t.Para.Config.Registry.TKERegistry.Username, string(t.Para.Config.Registry.TKERegistry.Password)) | |||
There was a problem hiding this comment.
Why we need docker for pushing images?
leoryu
reviewed
Jul 23, 2021
| @@ -76,7 +76,7 @@ var components = Components{ | |||
| InfluxDB: containerregistry.Image{Name: "influxdb", Tag: "1.7.9"}, | |||
| Thanos: containerregistry.Image{Name: "thanos", Tag: "v0.15.0"}, | |||
|
|
|||
| ProviderRes: containerregistry.Image{Name: "provider-res", Tag: "v1.20.4-2"}, | |||
| ProviderRes: containerregistry.Image{Name: "provider-res", Tag: "v1.20.4-3"}, | |||
There was a problem hiding this comment.
no one use v1.20.4-2, please reuse this version.
leoryu
reviewed
Jul 26, 2021
leoryu
added a commit
that referenced
this pull request
Aug 5, 2021
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.
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.: