feat(platform): update k8s 1.19.7 support #1070
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
|
comments:
|
|
huxiaoliang
requested changes
Jan 28, 2021
leoryu
force-pushed
the
update_k8s_1.19.7
branch
from
c04f861
to
0f16ef8
Compare
huxiaoliang
reviewed
Feb 1, 2021
| return nil | ||
| } | ||
|
|
||
| func updateCoreDNSVersion(ctx context.Context, client kubernetes.Interface, version string) error { |
There was a problem hiding this comment.
please try kubeadm config upload from-file --config /path/kubeadmconf.yml to update cm rather than do it manually
There was a problem hiding this comment.
you should use kubeadm config view > then kubeadm config upload from-file --config /path/kubeadmconf.yml
huxiaoliang
reviewed
Feb 1, 2021
| return errors.Wrap(fmt.Errorf("invaild version format %s", c.Spec.Version), "unable to update coreDNS version") | ||
| } | ||
| if versionRet[0] == "1" && versionRet[1] == "19" { | ||
|
|
There was a problem hiding this comment.
We already have code to check version before and after, please reuse
huxiaoliang
reviewed
Feb 1, 2021
| @@ -140,6 +146,49 @@ func (p *Provider) EnsurePreClusterUpgradeHook(ctx context.Context, c *v1.Cluste | |||
| return util.ExcuteCustomizedHook(ctx, c, platformv1.HookPreClusterUpgrade, c.Spec.Machines[:1]) | |||
| } | |||
|
|
|||
| func (p *Provider) EnsureUpgradeCoreDNS(ctx context.Context, c *v1.Cluster) error { | |||
| if version.Compare(c.Spec.Version, "1.19.0") >= 0 { | |||
There was a problem hiding this comment.
I prefer to depends on something like
tke/pkg/util/apiclient/version.go
Line 29 in 7ac0421
leoryu
force-pushed
the
update_k8s_1.19.7
branch
from
d94ed68
to
c204af1
Compare
huxiaoliang
reviewed
Feb 1, 2021
| @@ -133,4 +133,6 @@ const ( | |||
| MinNumCPU = 2 | |||
|
|
|||
| APIServerHostName = "api.tke.com" | |||
|
|
|||
| NeedUpgradeCoreDNSK8sVersion = "1.19.0" | |||
There was a problem hiding this comment.
from 1.19, we should support upgrade coredns to align with k8s, so we need to make this process automatically and don't hard code coredns version in our hand. all install and upgrade logic will handled by kubeadm
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?
/kind feature
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.: