diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2024-01-16 16:47:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 16:47:26 +0800 |
| commit | 7138f4d5e5019069c272eff098c68a17ea2ccfee (patch) | |
| tree | 62745ac32349a7e079f22f39aef9decf9524a8ae /edge | |
| parent | Merge pull request #5251 from wbc6080/update-dmiapi (diff) | |
| parent | change the edgecert subject (diff) | |
| download | kubeedge-7138f4d5e5019069c272eff098c68a17ea2ccfee.tar.gz | |
Merge pull request #5294 from Shelley-BaoYue/certificate-uniqueness
Add nodename in edge certificate
Diffstat (limited to 'edge')
| -rw-r--r-- | edge/pkg/edgehub/certificate/certmanager.go | 4 | ||||
| -rw-r--r-- | edge/pkg/edgehub/common/http/http.go | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/edge/pkg/edgehub/certificate/certmanager.go b/edge/pkg/edgehub/certificate/certmanager.go index d9e974f19..fb7bc5d1f 100644 --- a/edge/pkg/edgehub/certificate/certmanager.go +++ b/edge/pkg/edgehub/certificate/certmanager.go @@ -66,10 +66,10 @@ func NewCertManager(edgehub v1alpha2.EdgeHub, nodename string) CertManager { certReq := &x509.CertificateRequest{ Subject: pkix.Name{ Country: []string{"CN"}, - Organization: []string{"kubeEdge"}, + Organization: []string{"system:nodes"}, Locality: []string{"Hangzhou"}, Province: []string{"Zhejiang"}, - CommonName: "kubeedge.io", + CommonName: fmt.Sprintf("system:node:%s", nodename), }, } return CertManager{ diff --git a/edge/pkg/edgehub/common/http/http.go b/edge/pkg/edgehub/common/http/http.go index b5664643d..4f8315bc0 100644 --- a/edge/pkg/edgehub/common/http/http.go +++ b/edge/pkg/edgehub/common/http/http.go @@ -10,6 +10,8 @@ import ( "time" "k8s.io/klog/v2" + + "github.com/kubeedge/kubeedge/common/types" ) const ( @@ -100,7 +102,7 @@ func BuildRequest(method string, urlStr string, body io.Reader, token string, no req.Header.Add("Authorization", bearerToken) } if nodeName != "" { - req.Header.Add("NodeName", nodeName) + req.Header.Add(types.NodeNameKey, nodeName) } return req, nil } |