Commit 1544bd7
Merge upstream/dev-1.36 into follow-up-kk-135676
Resolve merge conflict in labels-annotations-taints/_index.md by keeping
both CSI annotations (from this branch) and deployment annotations (from
upstream) in alphabetical order.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>File tree
509 files changed
+25259
-6112
lines changed- assets
- js
- scss
- content
- bn/docs
- reference/glossary
- tutorials/security
- en
- blog/_posts
- 2025-04-29-image-volume-beta
- 2025-12-17-kubernetes-v1-35-release
- 2026-01-05-extend-toleration-operators
- 2026-01-08-mutable-pv-affinity-alpha
- 2026-01-22-headlamp-in-2025
- 2026-01-27-cluster-api-v1-12-release
- 2026-01-30-new-cgroup-v1-to-v2-conversion-formula
- docs
- concepts
- cluster-administration
- configuration
- containers
- extend-kubernetes/compute-storage-net
- overview/working-with-objects
- policy
- scheduling-eviction
- security
- services-networking
- storage
- windows
- workloads
- autoscaling
- controllers
- pods
- contribute/new-content
- reference
- access-authn-authz
- command-line-tools-reference/feature-gates
- glossary
- instrumentation
- kubectl/generated
- kubectl_alpha
- kubectl_annotate
- kubectl_api-resources
- kubectl_api-versions
- kubectl_apply
- kubectl_attach
- kubectl_auth
- kubectl_autoscale
- kubectl_certificate
- kubectl_cluster-info
- kubectl_completion
- kubectl_config
- kubectl_cordon
- kubectl_cp
- kubectl_create
- kubectl_debug
- kubectl_delete
- kubectl_describe
- kubectl_diff
- kubectl_drain
- kubectl_edit
- kubectl_events
- kubectl_exec
- kubectl_explain
- kubectl_expose
- kubectl_get
- kubectl_kustomize
- kubectl_label
- kubectl_logs
- kubectl_options
- kubectl_patch
- kubectl_plugin
- kubectl_port-forward
- kubectl_proxy
- kubectl_replace
- kubectl_rollout
- kubectl_run
- kubectl_scale
- kubectl_set
- kubectl_taint
- kubectl_top
- kubectl_uncordon
- kubectl_version
- kubectl_wait
- labels-annotations-taints
- tools
- using-api
- setup
- learning-environment
- tasks
- administer-cluster
- manage-resources
- network-policy-provider
- configure-pod-container
- debug/debug-cluster
- extend-kubernetes/custom-resources
- tools
- tutorials
- kubernetes-basics
- security
- stateful-application
- examples
- application/guestbook
- pods
- resource
- storage
- fr/docs
- concepts/services-networking
- reference
- access-authn-authz
- glossary
- hi/docs/tasks/configmap-secret
- id/docs/concepts/services-networking
- ja
- blog/_posts
- 2025-07-03-devices-failure-handling
- 2025-12-17-kubernetes-v1-35-release
- community
- docs
- concepts
- containers
- scheduling-eviction
- services-networking
- windows
- workloads
- controllers
- pods
- workload-api
- reference
- access-authn-authz
- glossary
- tasks
- access-application-cluster
- administer-cluster
- run-application
- releases
- ko
- blog/_posts/2025-09-02-prefer-align-cpus-by-uncore-cache-beta
- docs
- concepts
- architecture
- cluster-administration
- configuration
- extend-kubernetes/compute-storage-net
- overview/working-with-objects
- services-networking
- workloads
- controllers
- pods
- contribute
- blog
- generate-ref-docs
- new-content
- participate
- review
- style
- tasks
- administer-cluster/network-policy-provider
- run-application
- tutorials
- configuration
- services
- examples/controllers
- pl
- docs
- concepts
- overview/working-with-objects
- scheduling-eviction
- workloads
- pods
- reference
- setup
- tutorials
- kubernetes-basics
- scale
- examples/application
- training
- pt-br/docs
- concepts
- cluster-administration
- services-networking
- workloads/pods
- reference/glossary
- tasks/administer-cluster/network-policy-provider
- ru
- docs
- concepts/extend-kubernetes
- tutorials/kubernetes-basics/explore
- examples/application/guestbook
- uk
- docs/reference/command-line-tools-reference/feature-gates
- vi/docs/reference/glossary
- zh-cn
- blog/_posts
- 2025-11-25-kubernetes-configuration-best-practices
- 2025-12-17-kubernetes-v1-35-release
- 2026-01-05-extend-toleration-operators
- docs
- concepts
- architecture
- cluster-administration
- configuration
- containers
- extend-kubernetes/compute-storage-net
- overview/working-with-objects
- policy
- scheduling-eviction
- services-networking
- storage
- workloads
- autoscaling
- controllers
- pods
- contribute/new-content
- reference
- access-authn-authz
- command-line-tools-reference
- feature-gates
- config-api
- issues-security
- kubectl
- generated
- kubectl_alpha
- kubectl_annotate
- kubectl_api-resources
- kubectl_attach
- kubectl_autoscale
- kubectl_cluster-info
- kubectl_debug
- kubectl_describe
- kubectl_edit
- kubectl_events
- kubectl_explain
- kubectl_expose
- kubectl_get
- kubectl_logs
- kubectl_run
- kubectl_set
- kubectl_wait
- kubernetes-api
- authentication-resources
- cluster-resources
- common-definitions
- config-and-storage-resources
- extend-resources
- policy-resources
- service-resources
- workload-resources
- networking
- node
- scheduling
- setup-tools/kubeadm
- generated
- kubeadm_certs
- kubeadm_config
- kubeadm_init
- kubeadm_join
- kubeadm_token
- kubeadm_upgrade
- using-api
- setup/production-environment/tools/kubeadm
- tasks
- administer-cluster
- kubeadm
- network-policy-provider
- configure-pod-container
- assign-resources
- debug/debug-cluster
- extend-kubernetes/custom-resources
- inject-data-application
- job
- run-application
- tls
- tutorials/kubernetes-basics/scale
- examples
- application/guestbook
- pods
- inject
- restart-policy
- data
- announcements
- releases
- i18n
- en
- zh-cn
- layouts
- _default
- partials
- static
- css
- docs/reference/generated/kubernetes-api/v1.35
- js
- images/announcements
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
509 files changed
+25259
-6112
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | 5 | | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
12 | | - | |
13 | 11 | | |
14 | 12 | | |
15 | 13 | | |
| |||
25 | 23 | | |
26 | 24 | | |
27 | 25 | | |
| 26 | + | |
28 | 27 | | |
29 | 28 | | |
30 | 29 | | |
| |||
34 | 33 | | |
35 | 34 | | |
36 | 35 | | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| 69 | + | |
69 | 70 | | |
70 | | - | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
89 | | - | |
90 | 89 | | |
91 | 90 | | |
92 | 91 | | |
93 | 92 | | |
94 | 93 | | |
95 | | - | |
96 | 94 | | |
97 | 95 | | |
98 | 96 | | |
| |||
153 | 151 | | |
154 | 152 | | |
155 | 153 | | |
| 154 | + | |
156 | 155 | | |
157 | 156 | | |
158 | 157 | | |
159 | 158 | | |
160 | 159 | | |
161 | 160 | | |
| 161 | + | |
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
| 165 | + | |
165 | 166 | | |
166 | 167 | | |
167 | 168 | | |
| |||
200 | 201 | | |
201 | 202 | | |
202 | 203 | | |
| 204 | + | |
203 | 205 | | |
204 | 206 | | |
205 | 207 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
141 | 141 | | |
142 | 142 | | |
143 | 143 | | |
144 | | - | |
145 | | - | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
152 | | - | |
153 | | - | |
154 | | - | |
155 | | - | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
166 | | - | |
167 | | - | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
| 144 | + | |
| 145 | + | |
183 | 146 | | |
184 | 147 | | |
185 | 148 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
| 1 | + | |
12 | 2 | | |
13 | | - | |
| 3 | + | |
14 | 4 | | |
15 | 5 | | |
16 | 6 | | |
| |||
22 | 12 | | |
23 | 13 | | |
24 | 14 | | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
| 15 | + | |
29 | 16 | | |
30 | 17 | | |
31 | 18 | | |
| |||
104 | 91 | | |
105 | 92 | | |
106 | 93 | | |
| 94 | + | |
107 | 95 | | |
108 | 96 | | |
109 | 97 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
420 | 420 | | |
421 | 421 | | |
422 | 422 | | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
423 | 436 | | |
424 | 437 | | |
425 | 438 | | |
| |||
445 | 458 | | |
446 | 459 | | |
447 | 460 | | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
448 | 472 | | |
449 | 473 | | |
450 | 474 | | |
451 | 475 | | |
452 | | - | |
| 476 | + | |
453 | 477 | | |
454 | 478 | | |
455 | 479 | | |
| |||
471 | 495 | | |
472 | 496 | | |
473 | 497 | | |
474 | | - | |
| 498 | + | |
475 | 499 | | |
476 | 500 | | |
477 | 501 | | |
| |||
485 | 509 | | |
486 | 510 | | |
487 | 511 | | |
488 | | - | |
| 512 | + | |
489 | 513 | | |
490 | 514 | | |
491 | 515 | | |
| |||
1820 | 1844 | | |
1821 | 1845 | | |
1822 | 1846 | | |
1823 | | - | |
1824 | | - | |
1825 | | - | |
1826 | | - | |
1827 | | - | |
1828 | | - | |
1829 | | - | |
1830 | | - | |
1831 | | - | |
1832 | | - | |
1833 | | - | |
1834 | | - | |
1835 | | - | |
1836 | | - | |
1837 | | - | |
1838 | | - | |
1839 | | - | |
1840 | | - | |
1841 | | - | |
1842 | | - | |
1843 | | - | |
1844 | | - | |
1845 | | - | |
1846 | | - | |
1847 | | - | |
1848 | | - | |
1849 | | - | |
1850 | | - | |
1851 | | - | |
1852 | | - | |
1853 | | - | |
1854 | | - | |
1855 | | - | |
1856 | | - | |
1857 | | - | |
1858 | | - | |
1859 | | - | |
1860 | | - | |
1861 | | - | |
1862 | | - | |
1863 | | - | |
1864 | | - | |
1865 | | - | |
1866 | | - | |
1867 | | - | |
1868 | | - | |
1869 | | - | |
1870 | | - | |
1871 | | - | |
1872 | | - | |
1873 | | - | |
1874 | | - | |
1875 | | - | |
1876 | | - | |
1877 | | - | |
1878 | | - | |
1879 | | - | |
1880 | | - | |
1881 | | - | |
1882 | | - | |
1883 | | - | |
1884 | | - | |
1885 | | - | |
1886 | | - | |
1887 | | - | |
1888 | | - | |
1889 | | - | |
1890 | | - | |
1891 | | - | |
1892 | | - | |
1893 | | - | |
1894 | | - | |
1895 | | - | |
1896 | | - | |
1897 | | - | |
1898 | | - | |
1899 | | - | |
1900 | | - | |
1901 | | - | |
1902 | | - | |
1903 | | - | |
1904 | | - | |
1905 | | - | |
1906 | | - | |
1907 | | - | |
1908 | | - | |
1909 | | - | |
1910 | | - | |
1911 | | - | |
1912 | | - | |
1913 | | - | |
1914 | | - | |
1915 | | - | |
1916 | | - | |
1917 | 1847 | | |
1918 | 1848 | | |
1919 | 1849 | | |
| |||
1991 | 1921 | | |
1992 | 1922 | | |
1993 | 1923 | | |
1994 | | - | |
| 1924 | + | |
1995 | 1925 | | |
1996 | 1926 | | |
1997 | 1927 | | |
| |||
0 commit comments