mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 15:58:37 +00:00
Merge pull request #118463 from testwill/replace_loop
chore: slice replace loop
This commit is contained in:
commit
9aa04752e7
@ -640,9 +640,7 @@ func (tc *testContext) verify(t *testing.T, expected result, initialObjects []me
|
||||
assert.Equal(t, expected.status, status)
|
||||
objects := tc.listAll(t)
|
||||
wantObjects := update(t, initialObjects, expected.changes)
|
||||
for _, add := range expected.added {
|
||||
wantObjects = append(wantObjects, add)
|
||||
}
|
||||
wantObjects = append(wantObjects, expected.added...)
|
||||
for _, remove := range expected.removed {
|
||||
for i, obj := range wantObjects {
|
||||
// This is a bit relaxed (no GVR comparison, no UID
|
||||
|
@ -186,9 +186,7 @@ func (l *LimitRanger) GetLimitRanges(a admission.Attributes) ([]*corev1.LimitRan
|
||||
}
|
||||
lruEntry := lruItemObj.(liveLookupEntry)
|
||||
|
||||
for i := range lruEntry.items {
|
||||
items = append(items, lruEntry.items[i])
|
||||
}
|
||||
items = append(items, lruEntry.items...)
|
||||
|
||||
}
|
||||
|
||||
|
@ -79,9 +79,7 @@ func SetSpecIngressRules(rules ...networkingv1.NetworkPolicyIngressRule) SetFunc
|
||||
policy.Spec.Ingress = []networkingv1.NetworkPolicyIngressRule{}
|
||||
policy.Spec.PolicyTypes = append(policy.Spec.PolicyTypes, networkingv1.PolicyTypeIngress)
|
||||
}
|
||||
for _, rule := range rules {
|
||||
policy.Spec.Ingress = append(policy.Spec.Ingress, rule)
|
||||
}
|
||||
policy.Spec.Ingress = append(policy.Spec.Ingress, rules...)
|
||||
}
|
||||
}
|
||||
|
||||
@ -91,8 +89,6 @@ func SetSpecEgressRules(rules ...networkingv1.NetworkPolicyEgressRule) SetFunc {
|
||||
policy.Spec.Egress = []networkingv1.NetworkPolicyEgressRule{}
|
||||
policy.Spec.PolicyTypes = append(policy.Spec.PolicyTypes, networkingv1.PolicyTypeEgress)
|
||||
}
|
||||
for _, rule := range rules {
|
||||
policy.Spec.Egress = append(policy.Spec.Egress, rule)
|
||||
}
|
||||
policy.Spec.Egress = append(policy.Spec.Egress, rules...)
|
||||
}
|
||||
}
|
||||
|
@ -216,9 +216,7 @@ func updateKubeletConfigWithMemoryManagerParams(initialCfg *kubeletconfig.Kubele
|
||||
if initialCfg.ReservedMemory == nil {
|
||||
initialCfg.ReservedMemory = []kubeletconfig.MemoryReservation{}
|
||||
}
|
||||
for _, memoryReservation := range params.systemReservedMemory {
|
||||
initialCfg.ReservedMemory = append(initialCfg.ReservedMemory, memoryReservation)
|
||||
}
|
||||
initialCfg.ReservedMemory = append(initialCfg.ReservedMemory, params.systemReservedMemory...)
|
||||
}
|
||||
|
||||
func getAllNUMANodes() []int {
|
||||
|
Loading…
Reference in New Issue
Block a user