memory manager: add the policy interface
The commit also adds two policy skeletons: - none - static Signed-off-by: Artyom Lukianov <alukiano@redhat.com>
This commit is contained in:
		
							
								
								
									
										40
									
								
								pkg/kubelet/cm/memorymanager/policy.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								pkg/kubelet/cm/memorymanager/policy.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,40 @@
 | 
			
		||||
/*
 | 
			
		||||
Copyright 2020 The Kubernetes Authors.
 | 
			
		||||
 | 
			
		||||
Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
you may not use this file except in compliance with the License.
 | 
			
		||||
You may obtain a copy of the License at
 | 
			
		||||
 | 
			
		||||
    http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
 | 
			
		||||
Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
See the License for the specific language governing permissions and
 | 
			
		||||
limitations under the License.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
package memorymanager
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	v1 "k8s.io/api/core/v1"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/kubelet/cm/memorymanager/state"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// Type defines the policy type
 | 
			
		||||
type policyType string
 | 
			
		||||
 | 
			
		||||
// Policy implements logic for pod container to a memory assignment.
 | 
			
		||||
type Policy interface {
 | 
			
		||||
	Name() string
 | 
			
		||||
	Start(s state.State) error
 | 
			
		||||
	// Allocate call is idempotent
 | 
			
		||||
	Allocate(s state.State, pod *v1.Pod, container *v1.Container) error
 | 
			
		||||
	// RemoveContainer call is idempotent
 | 
			
		||||
	RemoveContainer(s state.State, podUID string, containerName string) error
 | 
			
		||||
	// GetTopologyHints implements the topologymanager.HintProvider Interface
 | 
			
		||||
	// and is consulted to achieve NUMA aware resource alignment among this
 | 
			
		||||
	// and other resource controllers.
 | 
			
		||||
	GetTopologyHints(s state.State, pod *v1.Pod, container *v1.Container) map[string][]topologymanager.TopologyHint
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										61
									
								
								pkg/kubelet/cm/memorymanager/policy_none.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										61
									
								
								pkg/kubelet/cm/memorymanager/policy_none.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,61 @@
 | 
			
		||||
/*
 | 
			
		||||
Copyright 2020 The Kubernetes Authors.
 | 
			
		||||
 | 
			
		||||
Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
you may not use this file except in compliance with the License.
 | 
			
		||||
You may obtain a copy of the License at
 | 
			
		||||
 | 
			
		||||
    http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
 | 
			
		||||
Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
See the License for the specific language governing permissions and
 | 
			
		||||
limitations under the License.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
package memorymanager
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	v1 "k8s.io/api/core/v1"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/kubelet/cm/memorymanager/state"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
const policyTypeNone policyType = "none"
 | 
			
		||||
 | 
			
		||||
// none is implementation of the policy interface for the none policy, using none
 | 
			
		||||
// policy is the same as disable memory management
 | 
			
		||||
type none struct{}
 | 
			
		||||
 | 
			
		||||
var _ Policy = &none{}
 | 
			
		||||
 | 
			
		||||
// NewPolicyNone returns new none policy instance
 | 
			
		||||
func NewPolicyNone() Policy {
 | 
			
		||||
	return &none{}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (p *none) Name() string {
 | 
			
		||||
	return string(policyTypeNone)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (p *none) Start(s state.State) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Allocate call is idempotent
 | 
			
		||||
func (p *none) Allocate(s state.State, pod *v1.Pod, container *v1.Container) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// RemoveContainer call is idempotent
 | 
			
		||||
func (p *none) RemoveContainer(s state.State, podUID string, containerName string) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// GetTopologyHints implements the topologymanager.HintProvider Interface
 | 
			
		||||
// and is consulted to achieve NUMA aware resource alignment among this
 | 
			
		||||
// and other resource controllers.
 | 
			
		||||
func (p *none) GetTopologyHints(s state.State, pod *v1.Pod, container *v1.Container) map[string][]topologymanager.TopologyHint {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										71
									
								
								pkg/kubelet/cm/memorymanager/policy_static.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										71
									
								
								pkg/kubelet/cm/memorymanager/policy_static.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,71 @@
 | 
			
		||||
/*
 | 
			
		||||
Copyright 2020 The Kubernetes Authors.
 | 
			
		||||
 | 
			
		||||
Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
you may not use this file except in compliance with the License.
 | 
			
		||||
You may obtain a copy of the License at
 | 
			
		||||
 | 
			
		||||
    http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
 | 
			
		||||
Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
See the License for the specific language governing permissions and
 | 
			
		||||
limitations under the License.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
package memorymanager
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	cadvisorapi "github.com/google/cadvisor/info/v1"
 | 
			
		||||
 | 
			
		||||
	v1 "k8s.io/api/core/v1"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/kubelet/cm/memorymanager/state"
 | 
			
		||||
	"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
const policyTypeStatic policyType = "static"
 | 
			
		||||
 | 
			
		||||
type systemReservedMemory map[int]map[v1.ResourceName]uint64
 | 
			
		||||
 | 
			
		||||
// staticPolicy is implementation of the policy interface for the single NUMA policy
 | 
			
		||||
type staticPolicy struct {
 | 
			
		||||
	// machineInfo contains machine memory related information
 | 
			
		||||
	machineInfo *cadvisorapi.MachineInfo
 | 
			
		||||
	// reserved contains memory that reserved for kube
 | 
			
		||||
	systemReserved systemReservedMemory
 | 
			
		||||
	// topology manager reference to get container Topology affinity
 | 
			
		||||
	affinity topologymanager.Store
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
var _ Policy = &staticPolicy{}
 | 
			
		||||
 | 
			
		||||
// NewPolicyStatic returns new single NUMA policy instance
 | 
			
		||||
func NewPolicyStatic() Policy {
 | 
			
		||||
	return &staticPolicy{}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (p *staticPolicy) Name() string {
 | 
			
		||||
	return string(policyTypeStatic)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (p *staticPolicy) Start(s state.State) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Allocate call is idempotent
 | 
			
		||||
func (p *staticPolicy) Allocate(s state.State, pod *v1.Pod, container *v1.Container) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// RemoveContainer call is idempotent
 | 
			
		||||
func (p *staticPolicy) RemoveContainer(s state.State, podUID string, containerName string) error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// GetTopologyHints implements the topologymanager.HintProvider Interface
 | 
			
		||||
// and is consulted to achieve NUMA aware resource alignment among this
 | 
			
		||||
// and other resource controllers.
 | 
			
		||||
func (p *staticPolicy) GetTopologyHints(s state.State, pod *v1.Pod, container *v1.Container) map[string][]topologymanager.TopologyHint {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user