whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into release-1.10

Browse Source
This commit is contained in:
Andrew Chen
2018-03-16 16:29:38 -07:00
parent 39d6d27709 4ac2583637
commit a6fd58d42d
24 changed files with 341 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/admin/admission-controllers.md
+1 -1
View File
@@ -330,7 +330,7 @@ When the admission controller sets a compute resource request, it does this by *
the pod spec rather than mutating the `container.resources` fields.
The annotations added contain the information on what compute resources were auto-populated.
See the [InitialResouces proposal](https://git.k8s.io/community/contributors/design-proposals/autoscaling/initial-resources.md) for more details.
See the [InitialResources proposal](https://git.k8s.io/community/contributors/design-proposals/autoscaling/initial-resources.md) for more details.
### LimitPodHardAntiAffinityTopology