feat(platform): support dynamic registry #2083
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
huxiaoliang
approved these changes
Sep 16, 2022
huxiaoliang
reviewed
Sep 16, 2022
api/platform/types.go
Outdated
| @@ -123,6 +123,8 @@ const ( | |||
| AnywhereApplicationAnno = "tkestack.io/anywhere-application" | |||
| // AnywhereValidateAnno is exist, the cluster will always return validate result | |||
| AnywhereValidateAnno = "tkestack.io/anywhere-validate" | |||
| // AnywhereImagePrefixAnno is exist, the cluster will use it as k8s images prefix | |||
| AnywhereImagePrefixAnno = "tkestack.io/anywhere-image-prefix" | |||
There was a problem hiding this comment.
location-based-image-prefix
leoryu
force-pushed
the
support-dynamic-registry
branch
from
8fd20f2 to
aa4345a
Compare
wl-chen
requested changes
Sep 16, 2022
| @@ -84,7 +85,7 @@ func (p *Provider) EnsureRenewCerts(ctx context.Context, c *v1.Cluster) error { | |||
| } | |||
|
|
|||
| func (p *Provider) EnsureAPIServerCert(ctx context.Context, c *v1.Cluster) error { | |||
| kubeadmConfig := p.getKubeadmInitConfig(c) | |||
| kubeadmConfig := p.GetKubeadmInitConfig(c, containerregistry.GetPrefix()) | |||
| @@ -184,7 +184,7 @@ func (p *Provider) getClusterConfiguration(c *v1.Cluster) *kubeadmv1beta2.Cluste | |||
| DNS: kubeadmv1beta2.DNS{ | |||
| Type: kubeadmv1beta2.CoreDNS, | |||
| }, | |||
| ImageRepository: containerregistry.GetPrefix(), | |||
| ImageRepository: repo, | |||
There was a problem hiding this comment.
这里是不是能进行收敛，直接用这个 p.getImagePrefix(c)
| args := map[string]string{ | ||
| "pod-infra-container-image": images.Get().Pause.FullName(), | ||
| "pod-infra-container-image": path.Join(repo, images.Get().Pause.BaseName()), |
There was a problem hiding this comment.
这里是不是能进行收敛，直接用这个 p.getImagePrefix(c)
leoryu
force-pushed
the
support-dynamic-registry
branch
from
aa4345a to
02233d8
Compare
wl-chen
approved these changes
Sep 16, 2022
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.: