Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/crd/bases/hlf.kungfusoftware.es_fabricchaincodes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,8 @@ spec:
runAsUser:
format: int64
type: integer
seLinuxChangePolicy:
type: string
seLinuxOptions:
properties:
level:
Expand Down
2 changes: 0 additions & 2 deletions controllers/identity/identity_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ func getEnrollRequestForFabricCA(client *kubernetes.Clientset, conf *hlfv1alpha1
return certs.EnrollUserRequest{
Hosts: []string{},
CN: "",
Profile: conf.Spec.Caname,
Attributes: nil,
User: conf.Spec.Enrollid,
Secret: conf.Spec.Enrollsecret,
Expand Down Expand Up @@ -510,7 +509,6 @@ func getReenrollRequestForFabricCA(client *kubernetes.Clientset, conf *hlfv1alph
TLSCert: string(cacert),
Hosts: []string{},
CN: "",
Profile: profile,
URL: tlsCAUrl,
Name: conf.Spec.Caname,
EnrollID: conf.Spec.Enrollid,
Expand Down
3 changes: 0 additions & 3 deletions controllers/ordnode/ordnode_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -1547,7 +1547,6 @@ func getEnrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *hl
return certs.EnrollUserRequest{
Hosts: hosts,
CN: enrollment.Enrollid,
Profile: profile,
Attributes: nil,
User: enrollment.Enrollid,
Secret: enrollment.Enrollsecret,
Expand Down Expand Up @@ -1603,7 +1602,6 @@ func getReenrollRequestForFabricCA(client *kubernetes.Clientset, enrollment *hlf
TLSCert: string(cacert),
Hosts: []string{},
CN: "",
Profile: profile,
URL: tlsCAUrl,
Name: enrollment.Caname,
EnrollID: enrollment.Enrollid,
Expand Down Expand Up @@ -1636,7 +1634,6 @@ func getReenrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *
TLSCert: string(cacert),
Hosts: hosts,
CN: "",
Profile: profile,
URL: tlsCAUrl,
Name: enrollment.Caname,
EnrollID: enrollment.Enrollid,
Expand Down
4 changes: 0 additions & 4 deletions controllers/peer/peer_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,6 @@ func getEnrollRequestForFabricCA(client *kubernetes.Clientset, enrollment *hlfv1
return certs.EnrollUserRequest{
Hosts: []string{},
CN: conf.Name,
Profile: profile,
Attributes: nil,
User: enrollment.Enrollid,
Secret: enrollment.Enrollsecret,
Expand All @@ -886,7 +885,6 @@ func getEnrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *hl
return certs.EnrollUserRequest{
Hosts: hosts,
CN: enrollment.Enrollid,
Profile: profile,
Attributes: nil,
User: enrollment.Enrollid,
Secret: enrollment.Enrollsecret,
Expand Down Expand Up @@ -1026,7 +1024,6 @@ func getReenrollRequestForFabricCA(client *kubernetes.Clientset, enrollment *hlf
TLSCert: string(cacert),
Hosts: []string{},
CN: "",
Profile: profile,
URL: tlsCAUrl,
Name: enrollment.Caname,
EnrollID: enrollment.Enrollid,
Expand All @@ -1049,7 +1046,6 @@ func getReenrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *
TLSCert: string(cacert),
Hosts: hosts,
CN: "",
Profile: profile,
URL: tlsCAUrl,
Name: enrollment.Caname,
EnrollID: enrollment.Enrollid,
Expand Down