github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

cleanup: use append other than for loop

Browse Source 
Signed-off-by: HaoJie Liu <liuhaojie@beyondcent.com>
This commit is contained in:
HaoJie Liu 2022-07-21 15:29:30 +08:00
parent 303f47c0c0
commit 29b5cd04bd
No known key found for this signature in database
GPG Key ID: 6CDCB10FAC001536
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/apiserver/pkg/admission/plugin/resourcequota/controller.go
View File

@ -393,9 +393,7 @@ func getMatchedLimitedScopes(evaluator quota.Evaluator, inputObject runtime.Obje
klog.ErrorS(err, "Error while matching limited Scopes") klog.ErrorS(err, "Error while matching limited Scopes")
return []corev1.ScopedResourceSelectorRequirement{}, err return []corev1.ScopedResourceSelectorRequirement{}, err
} }
for _, scope := range matched { scopes = append(scopes, matched...)
scopes = append(scopes, scope)
}
} }
return scopes, nil return scopes, nil
} }
@ -455,9 +453,7 @@ func CheckRequest(quotas []corev1.ResourceQuota, a admission.Attributes, evaluat
if err != nil { if err != nil {
return nil, fmt.Errorf("error matching scopes of quota %s, err: %v", resourceQuota.Name, err) return nil, fmt.Errorf("error matching scopes of quota %s, err: %v", resourceQuota.Name, err)
} }
for _, scope := range localRestrictedScopes { restrictedScopes = append(restrictedScopes, localRestrictedScopes...)
restrictedScopes = append(restrictedScopes, scope)
}
match, err := evaluator.Matches(&resourceQuota, inputObject) match, err := evaluator.Matches(&resourceQuota, inputObject)
if err != nil { if err != nil {
@ -595,9 +591,7 @@ func getScopeSelectorsFromQuota(quota corev1.ResourceQuota) []corev1.ScopedResou
Operator: corev1.ScopeSelectorOpExists}) Operator: corev1.ScopeSelectorOpExists})
} }
if quota.Spec.ScopeSelector != nil { if quota.Spec.ScopeSelector != nil {
for _, scopeSelector := range quota.Spec.ScopeSelector.MatchExpressions { selectors = append(selectors, quota.Spec.ScopeSelector.MatchExpressions...)
selectors = append(selectors, scopeSelector)
}
} }
return selectors return selectors
} }

8
staging/src/k8s.io/apiserver/pkg/server/config.go
View File

@ -450,11 +450,9 @@ type CompletedConfig struct {
// of our configured apiserver. We should prefer this to adding healthChecks directly to // of our configured apiserver. We should prefer this to adding healthChecks directly to
// the config unless we explicitly want to add a healthcheck only to a specific health endpoint. // the config unless we explicitly want to add a healthcheck only to a specific health endpoint.
func (c *Config) AddHealthChecks(healthChecks ...healthz.HealthChecker) { func (c *Config) AddHealthChecks(healthChecks ...healthz.HealthChecker) {
for _, check := range healthChecks { c.HealthzChecks = append(c.HealthzChecks, healthChecks...)
c.HealthzChecks = append(c.HealthzChecks, check) c.LivezChecks = append(c.LivezChecks, healthChecks...)
c.LivezChecks = append(c.LivezChecks, check) c.ReadyzChecks = append(c.ReadyzChecks, healthChecks...)
c.ReadyzChecks = append(c.ReadyzChecks, check)
}
} }
// AddPostStartHook allows you to add a PostStartHook that will later be added to the server itself in a New call. // AddPostStartHook allows you to add a PostStartHook that will later be added to the server itself in a New call.

4
staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/named_certificates.go
View File

@ -83,9 +83,7 @@ func getCertificateNames(cert *x509.Certificate) []string {
if !cnIsIP && cnIsValidDomain { if !cnIsIP && cnIsValidDomain {
names = append(names, cn) names = append(names, cn)
} }
for _, san := range cert.DNSNames { names = append(names, cert.DNSNames...)
names = append(names, san)
}
// intentionally all IPs in the cert are ignored as SNI forbids passing IPs // intentionally all IPs in the cert are ignored as SNI forbids passing IPs
// to select a cert. Before go 1.6 the tls happily passed IPs as SNI values. // to select a cert. Before go 1.6 the tls happily passed IPs as SNI values.

4
staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/util.go
View File

@ -50,9 +50,7 @@ func GetHumanCertDetail(certificate *x509.Certificate) string {
for _, ip := range certificate.IPAddresses { for _, ip := range certificate.IPAddresses {
validServingNames = append(validServingNames, ip.String()) validServingNames = append(validServingNames, ip.String())
} }
for _, dnsName := range certificate.DNSNames { validServingNames = append(validServingNames, certificate.DNSNames...)
validServingNames = append(validServingNames, dnsName)
}
servingString := "" servingString := ""
if len(validServingNames) > 0 { if len(validServingNames) > 0 {
servingString = fmt.Sprintf(" validServingFor=[%s]", strings.Join(validServingNames, ",")) servingString = fmt.Sprintf(" validServingFor=[%s]", strings.Join(validServingNames, ","))