feat: CRI support configure https registry #290
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
kubeclipper-bot
added
kind/feature
lyp256
changed the title
Codecov Report
@@ Coverage Diff @@
## master #290 +/- ##
==========================================
- Coverage 13.23% 12.98% -0.26%
==========================================
Files 98 99 +1
Lines 15214 15522 +308
==========================================
+ Hits 2014 2015 +1
- Misses 12960 13265 +305
- Partials 240 242 +2
|
|
/cc @lixd |
x893675
reviewed
Oct 21, 2022
pkg/scheme/core/v1/cluster_types.go
Outdated
| @@ -38,7 +39,7 @@ type Cluster struct { | |||
| // move offline to metadata annotation | |||
| // Offline bool `json:"offline" optional:"true"` | |||
| LocalRegistry string `json:"localRegistry,omitempty" optional:"true"` | |||
| Masters WorkerNodeList `json:"masters"` | |||
| Masters WorkerNodeList `json:"massters"` | |||
x893675
reviewed
Oct 21, 2022
pkg/scheme/core/v1/cri/docker.go
Outdated
| "time" | ||
|
|
||
| "github.com/docker/docker/daemon/config" |
There was a problem hiding this comment.
use map[string]interface unmarshall docker config, add update value of map[insecure-registryies]
Signed-off-by: lyp256 <lyp256@qq.com>
Signed-off-by: lyp256 <lyp256@qq.com>
Signed-off-by: lyp256 <lyp256@qq.com>
Signed-off-by: lyp256 <lyp256@qq.com>
x893675
changed the title
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lyp256, x893675 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
kubeclipper-bot
added
the
approved
|
LGTM label has been added. Git tree hash: 788ee30a5deae9079ed2dc07cd46ed27114d366d
|
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.
Signed-off-by: lyp256 lyp256@qq.com
What type of PR is this?
/kind feature
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #287
Special notes for reviewers:
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.: