Skip to content

Commit dbfc28a

Browse files
committed
Merge branch 'master' into release-1.8
2 parents 7c999e3 + 75a104c commit dbfc28a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

cn/docs/tasks/run-application/horizontal-pod-autoscale.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ This document describes the current state of Horizontal Pod Autoscaling in Kuber
1212

1313
With Horizontal Pod Autoscaling, Kubernetes automatically scales the number of pods
1414
in a replication controller, deployment or replica set based on observed CPU utilization
15-
(or, with alpha support, on some other, application-provided metrics).
15+
(or, with alpha support, on some other, application-provided metrics). Note that Horizontal
16+
Pod Autoscaling does not apply to objects that can't be scaled, for example, DaemonSet.
1617

1718
The Horizontal Pod Autoscaler is implemented as a Kubernetes API resource and a controller.
1819
The resource determines the behavior of the controller.

docs/tasks/run-application/horizontal-pod-autoscale.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ This document describes the current state of Horizontal Pod Autoscaling in Kuber
1212

1313
With Horizontal Pod Autoscaling, Kubernetes automatically scales the number of pods
1414
in a replication controller, deployment or replica set based on observed CPU utilization
15-
(or, with alpha support, on some other, application-provided metrics).
15+
(or, with alpha support, on some other, application-provided metrics). Note that Horizontal
16+
Pod Autoscaling does not apply to objects that can't be scaled, for example, DaemonSet.
1617

1718
The Horizontal Pod Autoscaler is implemented as a Kubernetes API resource and a controller.
1819
The resource determines the behavior of the controller.

0 commit comments

Comments
 (0)