Skip to content

Commit f29c7f8

Browse files
committed
Merge remote-tracking branch 'upstream/main' into merged-main-dev-1.30
2 parents c612009 + 114fa30 commit f29c7f8

File tree

21 files changed

+937
-184
lines changed

21 files changed

+937
-184
lines changed

OWNERS_ALIASES

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@ aliases:
22
sig-docs-blog-owners: # Approvers for blog content
33
- mrbobbytables
44
- nate-double-u
5-
- onlydole
65
- sftim
76
sig-docs-blog-reviewers: # Reviewers for blog content
87
- Gauravpadam
98
- mrbobbytables
109
- nate-double-u
11-
- onlydole
1210
- sftim
1311
sig-docs-localization-owners: # Admins for localization content
1412
- a-mccarthy
1513
- divya-mohan0209
1614
- natalisucks
17-
- onlydole
1815
- reylejano
1916
- sftim
2017
- seokho-son
@@ -32,7 +29,6 @@ aliases:
3229
- katcosgrove # RT 1.30 Lead
3330
- natalisucks
3431
- nate-double-u
35-
- onlydole
3632
- reylejano
3733
- sftim
3834
- tengqm
@@ -45,7 +41,6 @@ aliases:
4541
- mengjiao-liu
4642
- natalisucks
4743
- nate-double-u
48-
- onlydole
4944
- reylejano
5045
- sftim
5146
- shannonxtreme
@@ -126,7 +121,6 @@ aliases:
126121
sig-docs-leads: # Website chairs and tech leads
127122
- divya-mohan0209
128123
- natalisucks
129-
- onlydole
130124
- reylejano
131125
- sftim
132126
- tengqm
@@ -231,7 +225,7 @@ aliases:
231225
- jimangel # Release Manager Associate
232226
- jrsapi # Release Manager Associate
233227
- salaxander # Release Manager Associate
234-
# authoritative source: https://github.com/kubernetes/committee-security-response/blob/main/OWNERS_ALIASES
228+
# authoritative source: https://github.com/kubernetes/committee-security-response/blob/main/OWNERS_ALIASES
235229
committee-security-response:
236230
- cjcullen
237231
- cji
@@ -241,7 +235,7 @@ aliases:
241235
- ritazh
242236
- SaranBalaji90
243237
- tabbysable
244-
# authoritative source: https://github.com/kubernetes/sig-security/blob/main/OWNERS_ALIASES
238+
# authoritative source: https://github.com/kubernetes/sig-security/blob/main/OWNERS_ALIASES
245239
sig-security-leads:
246240
- IanColdwater
247241
- tabbysable

assets/scss/_custom.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,11 @@ main.content {
680680
}
681681
}
682682

683+
.td-blog .header-hero h1, .td-blog .header-hero h2 {
684+
font-size: 2.25rem; // match rest of site, even if it is actually h2
685+
margin-bottom: 20px;
686+
}
687+
683688
/* CASE-STUDIES */
684689

685690
// Many of the case studies have small variations in markup and styles;
@@ -819,7 +824,8 @@ body.td-documentation {
819824
}
820825
}
821826

822-
#announcement + .header-hero.filler {
827+
/* don't display the hero header for some pages when there is a banner active */
828+
#announcement + .header-hero.filler, .td-page.td-blog #announcement + .header-hero {
823829
display: none;
824830
}
825831

content/en/docs/concepts/extend-kubernetes/api-extension/_index.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,18 @@
22
title: Extending the Kubernetes API
33
weight: 30
44
---
5+
6+
Custom resources are extensions of the Kubernetes API. Kubernetes provides two ways to add custom resources to your cluster:
7+
8+
- The [CustomResourceDefinition](/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
9+
(CRD) mechanism allows you to declaratively define a new custom API with an API group, kind, and
10+
schema that you specify.
11+
The Kubernetes control plane serves and handles the storage of your custom resource. CRDs allow you to
12+
create new types of resources for your cluster without writing and running a custom API server.
13+
- The [aggregation layer](/docs/concepts/extend-kubernetes/api-extension/apiserver-aggregation/)
14+
sits behind the primary API server, which acts as a proxy.
15+
This arrangement is called API Aggregation (AA), which allows you to provide
16+
specialized implementations for your custom resources by writing and
17+
deploying your own API server.
18+
The main API server delegates requests to your API server for the custom APIs that you specify,
19+
making them available to all of its clients.

content/en/docs/reference/command-line-tools-reference/feature-gates/stateful-set-auto-delete-pvc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ stages:
1212
fromVersion: "1.23"
1313
toVersion: "1.26"
1414
- stage: beta
15-
defaultValue: false
15+
defaultValue: true
1616
fromVersion: "1.27"
1717
---
1818
Allows the use of the optional `.spec.persistentVolumeClaimRetentionPolicy` field,

content/en/docs/tasks/manage-gpus/scheduling-gpus.md

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
gpu-vendor.example/example-gpu: 1 # requesting 1 GPU
6565
```
6666
67-
## Clusters containing different types of GPUs
67+
## Manage clusters with different types of GPUs
6868
6969
If different nodes in your cluster have different types of GPUs, then you
7070
can use [Node Labels and Node Selectors](/docs/tasks/configure-pod-container/assign-pods-nodes/)
@@ -83,10 +83,46 @@ a different label key if you prefer.
8383

8484
## Automatic node labelling {#node-labeller}
8585

86-
If you're using AMD GPU devices, you can deploy
87-
[Node Labeller](https://github.com/RadeonOpenCompute/k8s-device-plugin/tree/master/cmd/k8s-node-labeller).
88-
Node Labeller is a {{< glossary_tooltip text="controller" term_id="controller" >}} that automatically
89-
labels your nodes with GPU device properties.
86+
As an administrator, you can automatically discover and label all your GPU enabled nodes
87+
by deploying Kubernetes [Node Feature Discovery](https://github.com/kubernetes-sigs/node-feature-discovery) (NFD).
88+
NFD detects the hardware features that are available on each node in a Kubernetes cluster.
89+
Typically, NFD is configured to advertise those features as node labels, but NFD can also add extended resources, annotations, and node taints.
90+
NFD is compatible with all [supported versions](/releases/version-skew-policy/#supported-versions) of Kubernetes.
91+
By default NFD create the [feature labels](https://kubernetes-sigs.github.io/node-feature-discovery/master/usage/features.html) for the detected features.
92+
Administrators can leverage NFD to also taint nodes with specific features, so that only pods that request those features can be scheduled on those nodes.
9093

91-
Similar functionality for NVIDIA is provided by
92-
[GPU feature discovery](https://github.com/NVIDIA/gpu-feature-discovery/blob/main/README.md).
94+
You also need a plugin for NFD that adds appropriate labels to your nodes; these might be generic
95+
labels or they could be vendor specific. Your GPU vendor may provide a third party
96+
plugin for NFD; check their documentation for more details.
97+
98+
{{< highlight yaml "linenos=false,hl_lines=6-18" >}}
99+
apiVersion: v1
100+
kind: Pod
101+
metadata:
102+
name: example-vector-add
103+
spec:
104+
# You can use Kubernetes node affinity to schedule this Pod onto a node
105+
# that provides the kind of GPU that its container needs in order to work
106+
affinity:
107+
nodeAffinity:
108+
requiredDuringSchedulingIgnoredDuringExecution:
109+
nodeSelectorTerms:
110+
- matchExpressions:
111+
- key: "gpu.gpu-vendor.example/installed-memory"
112+
operator: Gt # (greater than)
113+
values: ["40535"]
114+
- key: "feature.node.kubernetes.io/pci-10.present" # NFD Feature label
115+
values: ["true"] # (optional) only schedule on nodes with PCI device 10
116+
restartPolicy: OnFailure
117+
containers:
118+
- name: example-vector-add
119+
image: "registry.example/example-vector-add:v42"
120+
resources:
121+
limits:
122+
gpu-vendor.example/example-gpu: 1 # requesting 1 GPU
123+
{{< /highlight >}}
124+
125+
#### GPU vendor implementations
126+
127+
- [Intel](https://intel.github.io/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/README.html)
128+
- [NVIDIA](https://github.com/NVIDIA/gpu-feature-discovery/#readme)

content/id/docs/tasks/configure-pod-container/configure-service-account.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Isi dari `token` tidak dirinci di sini.
174174
- Membuat sebuah imagePullSecret, seperti yang dijelaskan pada [Menentukan ImagePullSecret pada Pod](/id/docs/concepts/containers/images/#tentukan-imagepullsecrets-pada-sebuah-pod).
175175

176176
```shell
177-
kubectl create secret docker-registry myregistrykey --docker-server=DUMMY_SERVER \
177+
kubectl create secret docker-registry myregistrykey --docker-server=<registry name> \
178178
--docker-username=DUMMY_USERNAME --docker-password=DUMMY_DOCKER_PASSWORD \
179179
--docker-email=DUMMY_DOCKER_EMAIL
180180
```
@@ -250,7 +250,7 @@ kubectl replace serviceaccount default -f ./sa.yaml
250250
Ketika Pod baru dibuat dalam Namespace yang sedang aktif dan menggunakan ServiceAccount, Pod baru akan memiliki _field_ `spec.imagePullSecrets` yang ditentukan secara otomatis:
251251

252252
```shell
253-
kubectl run nginx --image=nginx --restart=Never
253+
kubectl run nginx --image=<registry name>/nginx --restart=Never
254254
kubectl get pod nginx -o=jsonpath='{.spec.imagePullSecrets[0].name}{"\n"}'
255255
```
256256

content/ru/examples/application/guestbook/frontend-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
spec:
1818
containers:
1919
- name: php-redis
20-
image: gcr.io/google_samples/gb-frontend:v5
20+
image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5
2121
env:
2222
- name: GET_HOSTS_FROM
2323
value: "dns"

content/ru/examples/application/guestbook/redis-follower-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
spec:
2222
containers:
2323
- name: follower
24-
image: gcr.io/google_samples/gb-redis-follower:v2
24+
image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2
2525
resources:
2626
requests:
2727
cpu: 100m

0 commit comments

Comments
 (0)