github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 19:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116525 from ffromani/kubelet-podresources-endpoint-ga

Browse Source 
node: podresources: graduate to GA
This commit is contained in:
Kubernetes Prow Robot 2023-05-25 16:38:50 -07:00 committed by GitHub
commit cfeb83d56b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubelet/app/server.go
View File

@ -1187,9 +1187,7 @@ func startKubelet(k kubelet.Bootstrap, podCfg *config.PodConfig, kubeCfg *kubele
if kubeCfg.ReadOnlyPort > 0 { if kubeCfg.ReadOnlyPort > 0 {
go k.ListenAndServeReadOnly(netutils.ParseIPSloppy(kubeCfg.Address), uint(kubeCfg.ReadOnlyPort)) go k.ListenAndServeReadOnly(netutils.ParseIPSloppy(kubeCfg.Address), uint(kubeCfg.ReadOnlyPort))
} }
if utilfeature.DefaultFeatureGate.Enabled(features.KubeletPodResources) {
go k.ListenAndServePodResources() go k.ListenAndServePodResources()
}
} }
func createAndInitKubelet(kubeServer *options.KubeletServer, func createAndInitKubelet(kubeServer *options.KubeletServer,

5
pkg/features/kube_features.go
View File

@ -417,9 +417,10 @@ const (
// All the node components such as CRI need to be running in the same user namespace. // All the node components such as CRI need to be running in the same user namespace.
KubeletInUserNamespace featuregate.Feature = "KubeletInUserNamespace" KubeletInUserNamespace featuregate.Feature = "KubeletInUserNamespace"
// owner: @dashpole // owner: @dashpole, @ffromani (only for GA graduation)
// alpha: v1.13 // alpha: v1.13
// beta: v1.15 // beta: v1.15
// GA: v1.28
// //
// Enables the kubelet's pod resources grpc endpoint // Enables the kubelet's pod resources grpc endpoint
KubeletPodResources featuregate.Feature = "KubeletPodResources" KubeletPodResources featuregate.Feature = "KubeletPodResources"
@ -948,7 +949,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha}, KubeletInUserNamespace: {Default: false, PreRelease: featuregate.Alpha},
KubeletPodResources: {Default: true, PreRelease: featuregate.Beta}, KubeletPodResources: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.28, remove in 1.30
KubeletPodResourcesDynamicResources: {Default: false, PreRelease: featuregate.Alpha}, KubeletPodResourcesDynamicResources: {Default: false, PreRelease: featuregate.Alpha},

3
pkg/kubelet/metrics/metrics.go
View File

@ -776,9 +776,7 @@ func Register(collectors ...metrics.StableCollector) {
legacyregistry.MustRegister(OrphanedRuntimePodTotal) legacyregistry.MustRegister(OrphanedRuntimePodTotal)
legacyregistry.MustRegister(RestartedPodTotal) legacyregistry.MustRegister(RestartedPodTotal)
legacyregistry.MustRegister(ManagedEphemeralContainers) legacyregistry.MustRegister(ManagedEphemeralContainers)
if utilfeature.DefaultFeatureGate.Enabled(features.KubeletPodResources) {
legacyregistry.MustRegister(PodResourcesEndpointRequestsTotalCount) legacyregistry.MustRegister(PodResourcesEndpointRequestsTotalCount)
if utilfeature.DefaultFeatureGate.Enabled(features.KubeletPodResourcesGetAllocatable) { if utilfeature.DefaultFeatureGate.Enabled(features.KubeletPodResourcesGetAllocatable) {
legacyregistry.MustRegister(PodResourcesEndpointRequestsListCount) legacyregistry.MustRegister(PodResourcesEndpointRequestsListCount)
legacyregistry.MustRegister(PodResourcesEndpointRequestsGetAllocatableCount) legacyregistry.MustRegister(PodResourcesEndpointRequestsGetAllocatableCount)
@ -789,7 +787,6 @@ func Register(collectors ...metrics.StableCollector) {
legacyregistry.MustRegister(PodResourcesEndpointRequestsGetCount) legacyregistry.MustRegister(PodResourcesEndpointRequestsGetCount)
legacyregistry.MustRegister(PodResourcesEndpointErrorsGetCount) legacyregistry.MustRegister(PodResourcesEndpointErrorsGetCount)
} }
}
legacyregistry.MustRegister(StartedPodsTotal) legacyregistry.MustRegister(StartedPodsTotal)
legacyregistry.MustRegister(StartedPodsErrorsTotal) legacyregistry.MustRegister(StartedPodsErrorsTotal)
legacyregistry.MustRegister(StartedContainersTotal) legacyregistry.MustRegister(StartedContainersTotal)