Skip to content

Add deduplication function for host entries #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dviejokfs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add deduplication function for host entries #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions controllers/ordnode/ordnode_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,18 @@ func getEnrollRequestForFabricCA(client *kubernetes.Clientset, enrollment *hlfv1
}, nil
}

func deduplicateHosts(hosts []string) []string {
Copy link
Contributor

@adityajoshi12 adityajoshi12 Oct 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick]: looks good, this function can be moved to utils to avoid duplication

seen := make(map[string]bool)
var result []string
for _, host := range hosts {
if host != "" && !seen[host] {
seen[host] = true
result = append(result, host)
}
}
return result
}

func getEnrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *hlfv1alpha1.TLSComponent, spec *hlfv1alpha1.FabricOrdererNodeSpec, profile string) (certs.EnrollUserRequest, error) {
cacert, err := getCertBytesFromCATLS(client, enrollment.Catls)
if err != nil {
Expand All @@ -1545,6 +1557,7 @@ func getEnrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *hl
if spec.AdminTraefik != nil {
hosts = append(hosts, spec.AdminTraefik.Hosts...)
}
hosts = deduplicateHosts(hosts)
return certs.EnrollUserRequest{
Hosts: hosts,
CN: enrollment.Enrollid,
Expand Down Expand Up @@ -1585,6 +1598,7 @@ func getEnrollRequestForVaultTLS(tls *hlfv1alpha1.TLSComponent, conf *hlfv1alpha
if conf.Spec.AdminTraefik != nil {
hosts = append(hosts, conf.Spec.AdminTraefik.Hosts...)
}
hosts = deduplicateHosts(hosts)
return certs_vault.EnrollUserRequest{
MSPID: conf.Spec.MspID,
User: tls.Enrollid,
Expand Down Expand Up @@ -1631,6 +1645,7 @@ func getReenrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *
if conf.AdminTraefik != nil {
hosts = append(hosts, conf.AdminTraefik.Hosts...)
}
hosts = deduplicateHosts(hosts)
tlsCAUrl := fmt.Sprintf("https://%s:%d", enrollment.Cahost, enrollment.Caport)
return certs.ReenrollUserRequest{
TLSCert: string(cacert),
Expand Down Expand Up @@ -1669,6 +1684,7 @@ func getReenrollRequestForVaultTLS(tls *hlfv1alpha1.TLSComponent, conf *hlfv1alp
if conf.Spec.AdminTraefik != nil {
hosts = append(hosts, conf.Spec.AdminTraefik.Hosts...)
}
hosts = deduplicateHosts(hosts)

return certs_vault.ReenrollUserRequest{
MSPID: conf.Spec.MspID,
Expand Down
16 changes: 16 additions & 0 deletions controllers/peer/peer_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,18 @@ func getExistingSignCrypto(client *kubernetes.Clientset, chartName string, names
return crt, key, rootCrt, nil
}

func deduplicateHosts(hosts []string) []string {
seen := make(map[string]bool)
var result []string
for _, host := range hosts {
if host != "" && !seen[host] {
seen[host] = true
result = append(result, host)
}
}
return result
}

func getEnrollRequestForFabricCA(client *kubernetes.Clientset, enrollment *hlfv1alpha1.Component, conf *hlfv1alpha1.FabricPeer, profile string) (certs.EnrollUserRequest, error) {
cacert, err := getCertBytesFromCATLS(client, enrollment.Catls)
if err != nil {
Expand Down Expand Up @@ -886,6 +898,7 @@ func getEnrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *hl
var hosts []string
hosts = append(hosts, enrollment.Csr.Hosts...)
hosts = append(hosts, ingressHosts...)
hosts = deduplicateHosts(hosts)
return certs.EnrollUserRequest{
Hosts: hosts,
CN: enrollment.Enrollid,
Expand Down Expand Up @@ -916,6 +929,7 @@ func getEnrollRequestForVaultTLS(tls *hlfv1alpha1.TLSComponent, conf *hlfv1alpha
var hosts []string
hosts = append(hosts, tlsParams.Csr.Hosts...)
hosts = append(hosts, ingressHosts...)
hosts = deduplicateHosts(hosts)
return certs_vault.EnrollUserRequest{
MSPID: conf.Spec.MspID,
User: tls.Enrollid,
Expand Down Expand Up @@ -1041,6 +1055,7 @@ func getReenrollRequestForFabricCATLS(client *kubernetes.Clientset, enrollment *
var hosts []string
hosts = append(hosts, tlsParams.Csr.Hosts...)
hosts = append(hosts, ingressHosts...)
hosts = deduplicateHosts(hosts)

tlsCAUrl := fmt.Sprintf("https://%s:%d", enrollment.Cahost, enrollment.Caport)
return certs.ReenrollUserRequest{
Expand Down Expand Up @@ -1070,6 +1085,7 @@ func getReenrollRequestForVaultTLS(tls *hlfv1alpha1.TLSComponent, conf *hlfv1alp
var hosts []string
hosts = append(hosts, tlsParams.Csr.Hosts...)
hosts = append(hosts, ingressHosts...)
hosts = deduplicateHosts(hosts)
return certs_vault.ReenrollUserRequest{
MSPID: conf.Spec.MspID,
Hosts: hosts,
Expand Down