Skip to content
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.

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

Fix false-positive code scanning issue #5365

Merged
merged 1 commit into from
Apr 9, 2024
Merged
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
Fix false-positive code scanning issue
  • Loading branch information
jjngx committed Apr 9, 2024
commit bb3be8e7e4512523982e8d6501a08ff1a60e4fed
24 changes: 12 additions & 12 deletions internal/k8s/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -3111,14 +3111,14 @@ func (lbc *LoadBalancerController) createVirtualServerEx(virtualServer *conf_v1.
}

if virtualServer.Spec.TLS != nil && virtualServer.Spec.TLS.Secret != "" {
secretKey := virtualServer.Namespace + "/" + virtualServer.Spec.TLS.Secret
scrtKey := virtualServer.Namespace + "/" + virtualServer.Spec.TLS.Secret

secretRef := lbc.secretStore.GetSecret(secretKey)
if secretRef.Error != nil {
glog.Warningf("Error trying to get the secret %v for VirtualServer %v: %v", secretKey, virtualServer.Name, secretRef.Error)
scrtRef := lbc.secretStore.GetSecret(scrtKey)
if scrtRef.Error != nil {
glog.Warningf("Error trying to get the secret %v for VirtualServer %v: %v", scrtKey, virtualServer.Name, scrtRef.Error)
}

virtualServerEx.SecretRefs[secretKey] = secretRef
virtualServerEx.SecretRefs[scrtKey] = scrtRef
}

policies, policyErrors := lbc.getPolicies(virtualServer.Spec.Policies, virtualServer.Namespace)
Expand Down Expand Up @@ -3717,17 +3717,17 @@ func (lbc *LoadBalancerController) createTransportServerEx(transportServer *conf
}
}

secretRefs := make(map[string]*secrets.SecretReference)
scrtRefs := make(map[string]*secrets.SecretReference)

if transportServer.Spec.TLS != nil && transportServer.Spec.TLS.Secret != "" {
secretKey := transportServer.Namespace + "/" + transportServer.Spec.TLS.Secret
scrtKey := transportServer.Namespace + "/" + transportServer.Spec.TLS.Secret

secretRef := lbc.secretStore.GetSecret(secretKey)
if secretRef.Error != nil {
glog.Warningf("Error trying to get the secret %v for TransportServer %v: %v", secretKey, transportServer.Name, secretRef.Error)
scrtRef := lbc.secretStore.GetSecret(scrtKey)
if scrtRef.Error != nil {
glog.Warningf("Error trying to get the secret %v for TransportServer %v: %v", scrtKey, transportServer.Name, scrtRef.Error)
}

secretRefs[secretKey] = secretRef
scrtRefs[scrtKey] = scrtRef
}

return &configs.TransportServerEx{
Expand All @@ -3737,7 +3737,7 @@ func (lbc *LoadBalancerController) createTransportServerEx(transportServer *conf
PodsByIP: podsByIP,
ExternalNameSvcs: externalNameSvcs,
DisableIPV6: disableIPV6,
SecretRefs: secretRefs,
SecretRefs: scrtRefs,
}
}

Expand Down
Loading