Support config domain URL for cloudcore #2126
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
kubeedge-bot
added
kind/bug
3 tasks
kevin-wangzefeng
removed
kind/api-change
|
Removed irrelevant labels. |
| @@ -39,7 +39,8 @@ func SignCerts() ([]byte, []byte, error) { | |||
| Organization: []string{"KubeEdge"}, | |||
| Usages: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, | |||
| AltNames: certutil.AltNames{ | |||
| IPs: getIps(hubconfig.Config.AdvertiseAddress), | |||
| DNSNames: hubconfig.Config.DNSNames, | |||
There was a problem hiding this comment.
nit: DNSNames => DomainNames ?
There was a problem hiding this comment.
nit: DNSNames => DomainNames ?
@kevin-wangzefeng Thank for your suggestion. DNSNames is a bit weird, but in k8s, it is named like this, so we'd better keep using DNSNames.
| @@ -63,6 +64,10 @@ func (cu *KubeCloudInstTool) InstallTools() error { | |||
| cloudCoreConfig.Modules.CloudHub.AdvertiseAddress = strings.Split(cu.AdvertiseAddress, ",") | |||
| } | |||
|
|
|||
| if cu.DNSName != "" { | |||
| cloudCoreConfig.Modules.CloudHub.DNSNames = strings.Split(cu.DNSName, ",") | |||
There was a problem hiding this comment.
We need validations somewhere on the user input
There was a problem hiding this comment.
@kevin-wangzefeng sure, I will be create a new pr to do it.
|
/milestone v1.5 |
fisherxu
reviewed
Sep 7, 2020
| @@ -28,6 +28,7 @@ type InitOptions struct { | |||
| KubeConfig string | |||
| Master string | |||
| AdvertiseAddress string | |||
| DNS string | |||
ls889
force-pushed
the
certDomain
branch
3 times, most recently
from
ab98a5e
to
f8beffe
Compare
fisherxu
reviewed
Sep 7, 2020
| @@ -97,6 +97,9 @@ func addJoinOtherFlags(cmd *cobra.Command, initOpts *types.InitOptions) { | |||
|
|
|||
| cmd.Flags().StringVar(&initOpts.AdvertiseAddress, types.AdvertiseAddress, initOpts.AdvertiseAddress, | |||
| "Use this key to set SANs in certificate of cloudcore. eg: 10.10.102.78,10.10.102.79") | |||
|
|
|||
| cmd.Flags().StringVar(&initOpts.DNS, types.DomainName, initOpts.DNS, | |||
| "Use this key to set SANs in certificate of cloudcore. eg: www.cloudcore.cn,www.kubeedge.cn") | |||
There was a problem hiding this comment.
Suggested change
| "Use this key to set SANs in certificate of cloudcore. eg: www.cloudcore.cn,www.kubeedge.cn") | |
| "Use this key to set domain names in cloudcore's certificate SubAltNames field. eg: www.cloudcore.cn,www.kubeedge.cn") |
Also update the ip field above.
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fisherxu 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 |
kubeedge-bot
added
the
approved
4 tasks
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 #1642
Special notes for your reviewer:
Does this PR introduce a user-facing change?: