Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
@AxeZhan
AxeZhan committed Apr 30, 2024
1 parent 4d581d9 commit 33c6589
Show file tree
Hide file tree
Showing 14 changed files with 31 additions and 26 deletions.
6 changes: 3 additions & 3 deletions pkg/kubelet/cm/devicemanager/topology_hints.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ limitations under the License.
package devicemanager

import (
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/klog/v2"
pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"

"k8s.io/kubernetes/pkg/api/v1/resource"
resourcehelper "k8s.io/component-helpers/resource"
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager"
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask"
)
Expand Down Expand Up @@ -233,7 +233,7 @@ func (m *ManagerImpl) getNUMANodeIds(topology *pluginapi.TopologyInfo) []int {

func (m *ManagerImpl) getPodDeviceRequest(pod *v1.Pod) map[string]int {
// for these device plugin resources, requests == limits
limits := resource.PodLimits(pod, resource.PodResourcesOptions{
limits := resourcehelper.PodLimits(pod, resourcehelper.PodResourcesOptions{
ExcludeOverhead: true,
})
podRequests := make(map[string]int)
Expand Down
9 changes: 5 additions & 4 deletions pkg/kubelet/container/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/tools/record"
resourcehelper "k8s.io/component-helpers/resource"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
sc "k8s.io/kubernetes/pkg/securitycontext"
Expand Down Expand Up @@ -310,7 +311,7 @@ func SandboxToContainerState(state runtimeapi.PodSandboxState) State {
// GetContainerSpec gets the container spec by containerName.
func GetContainerSpec(pod *v1.Pod, containerName string) *v1.Container {
var containerSpec *v1.Container
podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(c *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllFeatureEnabledContainers(), func(c *v1.Container, containerType resourcehelper.ContainerType) bool {
if containerName == c.Name {
containerSpec = c
return false
Expand All @@ -323,7 +324,7 @@ func GetContainerSpec(pod *v1.Pod, containerName string) *v1.Container {
// HasPrivilegedContainer returns true if any of the containers in the pod are privileged.
func HasPrivilegedContainer(pod *v1.Pod) bool {
var hasPrivileged bool
podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(c *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllFeatureEnabledContainers(), func(c *v1.Container, containerType resourcehelper.ContainerType) bool {
if c.SecurityContext != nil && c.SecurityContext.Privileged != nil && *c.SecurityContext.Privileged {
hasPrivileged = true
return false
Expand All @@ -336,7 +337,7 @@ func HasPrivilegedContainer(pod *v1.Pod) bool {
// HasWindowsHostProcessContainer returns true if any of the containers in a pod are HostProcess containers.
func HasWindowsHostProcessContainer(pod *v1.Pod) bool {
var hasHostProcess bool
podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(c *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllFeatureEnabledContainers(), func(c *v1.Container, containerType resourcehelper.ContainerType) bool {
if sc.HasWindowsHostProcessRequest(pod, c) {
hasHostProcess = true
return false
Expand All @@ -350,7 +351,7 @@ func HasWindowsHostProcessContainer(pod *v1.Pod) bool {
// AllContainersAreWindowsHostProcess returns true if all containers in a pod are HostProcess containers.
func AllContainersAreWindowsHostProcess(pod *v1.Pod) bool {
allHostProcess := true
podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(c *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllFeatureEnabledContainers(), func(c *v1.Container, containerType resourcehelper.ContainerType) bool {
if !sc.HasWindowsHostProcessRequest(pod, c) {
allHostProcess = false
return false
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/eviction/eviction_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
statsapi "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
"k8s.io/utils/clock"

resourcehelper "k8s.io/component-helpers/resource"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
resourcehelper "k8s.io/kubernetes/pkg/api/v1/resource"
v1qos "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos"
"k8s.io/kubernetes/pkg/features"
evictionapi "k8s.io/kubernetes/pkg/kubelet/eviction/api"
Expand Down
3 changes: 2 additions & 1 deletion pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/util/flowcontrol"
featuregatetesting "k8s.io/component-base/featuregate/testing"
resourcehelper "k8s.io/component-helpers/resource"
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
apitest "k8s.io/cri-api/pkg/apis/testing"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
Expand Down Expand Up @@ -114,7 +115,7 @@ func makeAndSetFakePod(t *testing.T, m *kubeGenericRuntimeManager, fakeRuntime *
state: runtimeapi.ContainerState_CONTAINER_RUNNING,
}
}
podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(c *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllFeatureEnabledContainers(), func(c *v1.Container, containerType resourcehelper.ContainerType) bool {
containers = append(containers, makeFakeContainer(t, m, newTemplate(c)))
return true
})
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/volumemanager/cache/desired_state_of_world.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/volume/csi"

resourcehelper "k8s.io/kubernetes/pkg/api/v1/resource"
resourcehelper "k8s.io/component-helpers/resource"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/volume"
"k8s.io/kubernetes/pkg/volume/util"
Expand Down
2 changes: 1 addition & 1 deletion pkg/quota/v1/evaluator/core/pods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"k8s.io/apiserver/pkg/util/feature"
"k8s.io/utils/clock"

resourcehelper "k8s.io/kubernetes/pkg/api/v1/resource"
resourcehelper "k8s.io/component-helpers/resource"
api "k8s.io/kubernetes/pkg/apis/core"
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
"k8s.io/kubernetes/pkg/apis/core/v1/helper"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scheduler/framework/plugins/noderesources/fit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/component-helpers/resource"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/api/v1/resource"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/apis/config/validation"
Expand Down
2 changes: 1 addition & 1 deletion pkg/scheduler/framework/plugins/noderesources/resource_allocation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/klog/v2"

resourcehelper "k8s.io/kubernetes/pkg/api/v1/resource"
resourcehelper "k8s.io/component-helpers/resource"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/framework"
Expand Down
9 changes: 4 additions & 5 deletions pkg/scheduler/framework/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/klog/v2"

podutil "k8s.io/kubernetes/pkg/api/v1/pod"
resourcehelper "k8s.io/kubernetes/pkg/api/v1/resource"
resourcehelper "k8s.io/component-helpers/resource"
"k8s.io/kubernetes/pkg/features"
schedutil "k8s.io/kubernetes/pkg/scheduler/util"
)
Expand Down Expand Up @@ -867,13 +866,13 @@ func calculateResource(pod *v1.Pod) (Resource, int64, int64) {
var non0CPU, non0Mem int64
requests := resourcehelper.PodRequests(pod, resourcehelper.PodResourcesOptions{
InPlacePodVerticalScalingEnabled: utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScaling),
ContainerFn: func(requests v1.ResourceList, containerType podutil.ContainerType) {
ContainerFn: func(requests v1.ResourceList, containerType resourcehelper.ContainerType) {
non0CPUReq, non0MemReq := schedutil.GetNonzeroRequests(&requests)
switch containerType {
case podutil.Containers:
case resourcehelper.Containers:
non0CPU += non0CPUReq
non0Mem += non0MemReq
case podutil.InitContainers:
case resourcehelper.InitContainers:
non0InitCPU = max(non0InitCPU, non0CPUReq)
non0InitMem = max(non0InitMem, non0MemReq)
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/scheduler/metrics/resources/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/component-base/metrics"

v1resource "k8s.io/kubernetes/pkg/api/v1/resource"
resourcehelper "k8s.io/component-helpers/resource"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
)

Expand Down Expand Up @@ -196,7 +196,7 @@ func podRequestsAndLimitsByLifecycle(pod *v1.Pod, reuseReqs, reuseLimits v1.Reso
return
}

reqs = v1resource.PodRequests(pod, v1resource.PodResourcesOptions{Reuse: reuseReqs})
limits = v1resource.PodLimits(pod, v1resource.PodResourcesOptions{Reuse: reuseLimits})
reqs = resourcehelper.PodRequests(pod, resourcehelper.PodResourcesOptions{Reuse: reuseReqs})
limits = resourcehelper.PodLimits(pod, resourcehelper.PodResourcesOptions{Reuse: reuseLimits})
return
}
3 changes: 2 additions & 1 deletion pkg/security/apparmor/helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

v1 "k8s.io/api/core/v1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
resourcehelper "k8s.io/component-helpers/resource"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/features"
)
Expand All @@ -33,7 +34,7 @@ func isRequired(pod *v1.Pod) bool {
return true
}

inUse := !podutil.VisitContainers(&pod.Spec, podutil.AllContainers, func(c *v1.Container, _ podutil.ContainerType) bool {
inUse := !podutil.VisitContainers(&pod.Spec, resourcehelper.AllContainers, func(c *v1.Container, _ resourcehelper.ContainerType) bool {
if c.SecurityContext != nil && c.SecurityContext.AppArmorProfile != nil &&
c.SecurityContext.AppArmorProfile.Type != v1.AppArmorProfileTypeUnconfined {
return false // is in use; short-circuit
Expand Down
3 changes: 2 additions & 1 deletion pkg/security/apparmor/validate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/opencontainers/runc/libcontainer/apparmor"
v1 "k8s.io/api/core/v1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
resourcehelper "k8s.io/component-helpers/resource"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/features"
)
Expand Down Expand Up @@ -60,7 +61,7 @@ func (v *validator) Validate(pod *v1.Pod) error {
}

var retErr error
podutil.VisitContainers(&pod.Spec, podutil.AllContainers, func(container *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllContainers, func(container *v1.Container, containerType resourcehelper.ContainerType) bool {
profile := GetProfile(pod, container)
if profile == nil {
return true
Expand Down
3 changes: 2 additions & 1 deletion pkg/volume/util/nested_volumes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"strings"

v1 "k8s.io/api/core/v1"
resourcehelper "k8s.io/component-helpers/resource"
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
)

Expand Down Expand Up @@ -87,7 +88,7 @@ func getNestedMountpoints(name, baseDir string, pod v1.Pod) ([]string, error) {
}

var retErr error
podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(c *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllFeatureEnabledContainers(), func(c *v1.Container, containerType resourcehelper.ContainerType) bool {
retErr = checkContainer(c)
return retErr == nil
})
Expand Down
5 changes: 3 additions & 2 deletions pkg/volume/util/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
utilfeature "k8s.io/apiserver/pkg/util/feature"
clientset "k8s.io/client-go/kubernetes"
resourcehelper "k8s.io/component-helpers/resource"
storagehelpers "k8s.io/component-helpers/storage/volume"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/api/legacyscheme"
Expand Down Expand Up @@ -617,7 +618,7 @@ func GetPodVolumeNames(pod *v1.Pod) (mounts sets.String, devices sets.String, se
devices = sets.NewString()
seLinuxContainerContexts = make(map[string][]*v1.SELinuxOptions)

podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(container *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllFeatureEnabledContainers(), func(container *v1.Container, containerType resourcehelper.ContainerType) bool {
var seLinuxOptions *v1.SELinuxOptions
if utilfeature.DefaultFeatureGate.Enabled(features.SELinuxMountReadWriteOncePod) {
effectiveContainerSecurity := securitycontext.DetermineEffectiveSecurityContext(pod, container)
Expand Down Expand Up @@ -649,7 +650,7 @@ func GetPodVolumeNames(pod *v1.Pod) (mounts sets.String, devices sets.String, se
// attributes.
func FsUserFrom(pod *v1.Pod) *int64 {
var fsUser *int64
podutil.VisitContainers(&pod.Spec, podutil.AllFeatureEnabledContainers(), func(container *v1.Container, containerType podutil.ContainerType) bool {
podutil.VisitContainers(&pod.Spec, resourcehelper.AllFeatureEnabledContainers(), func(container *v1.Container, containerType resourcehelper.ContainerType) bool {
runAsUser, ok := securitycontext.DetermineEffectiveRunAsUser(pod, container)
// One container doesn't specify user or there are more than one
// non-root UIDs.
Expand Down

0 comments on commit 33c6589

Please sign in to comment.