Skip to content

Commit 35b1ebe

Browse files
authored
Merge pull request #51678 from ryan-su-12/sync-main-into-dev-1.34-v2
Merge main branch into dev-1.34
2 parents ab5c2db + 9a93a45 commit 35b1ebe

File tree

55 files changed

+2583
-428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2583
-428
lines changed

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ HUGO_VERSION = $(shell grep ^HUGO_VERSION netlify.toml | tail -n 1 | cut -d
22
NODE_BIN = node_modules/.bin
33
NETLIFY_FUNC = $(NODE_BIN)/netlify-lambda
44

5+
# The segments variable is used to specify which segments to render.
6+
segments ?= all
7+
58
# The CONTAINER_ENGINE variable is used for specifying the container engine. By default 'docker' is used
69
# but this can be overridden when calling make, e.g.
710
# CONTAINER_ENGINE=podman make container-image
@@ -69,7 +72,7 @@ non-production-build: module-check ## Build the non-production site, which adds
6972
GOMAXPROCS=1 hugo --cleanDestinationDir --enableGitInfo --environment nonprod
7073

7174
serve: module-check ## Boot the development server.
72-
hugo server --buildDrafts --buildFuture --environment development
75+
hugo server --buildDrafts --buildFuture --environment development --renderSegments $(segments)
7376

7477
docker-image:
7578
@echo -e "$(CCRED)**** The use of docker-image is deprecated. Use container-image instead. ****$(CCEND)"
@@ -118,7 +121,7 @@ container-build: module-check
118121
container-serve: module-check ## Boot the development server using container.
119122
$(CONTAINER_RUN_TTY) --cap-drop=ALL --cap-add=AUDIT_WRITE $(CONTAINER_HUGO_MOUNTS) \
120123
-p 1313:1313 $(CONTAINER_IMAGE) \
121-
hugo server --buildDrafts --buildFuture --environment development --bind 0.0.0.0 --destination /tmp/public --cleanDestinationDir --noBuildLock
124+
hugo server --buildDrafts --buildFuture --environment development --bind 0.0.0.0 --destination /tmp/public --cleanDestinationDir --noBuildLock --renderSegments $(segments)
122125

123126
test-examples:
124127
scripts/test_examples.sh install

README.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,20 @@ To build the site in a container, run the following:
5555

5656
```bash
5757
# You can set $CONTAINER_ENGINE to the name of any Docker-like container tool
58+
59+
# Render the full website
5860
make container-serve
61+
62+
# Render only a specific language segment (e.g., English)
63+
make container-serve segments=en
64+
65+
# Render multiple languages (e.g., English and Korean)
66+
make container-serve segments=en,ko
5967
```
6068

61-
If you see errors, it probably means that the hugo container did not have enough computing resources available. To solve it, increase the amount of allowed CPU and memory usage for Docker on your machine ([MacOS](https://docs.docker.com/desktop/settings/mac/) and [Windows](https://docs.docker.com/desktop/settings/windows/)).
69+
**💡 Tip:** Using _Hugo segments_ speeds up local preview builds, by rendering only selected language(s).
70+
71+
If you see errors, it probably means that the Hugo container did not have enough computing resources available. To solve it, increase the amount of allowed CPU and memory usage for Docker on your machine ([macOS](https://docs.docker.com/desktop/settings/mac/) and [Windows](https://docs.docker.com/desktop/settings/windows/)).
6272

6373
Open up your browser to <http://localhost:1313> to view the website. As you make changes to the source files, Hugo updates the website and forces a browser refresh.
6474

@@ -70,9 +80,19 @@ To install dependencies, deploy and test the site locally, run:
7080

7181
```bash
7282
npm ci
83+
84+
# Render the full site (default)
7385
make serve
86+
87+
# Render only a specific language segment
88+
make serve segments=en
89+
90+
# Render multiple language segments
91+
make serve segments=en,ko
7492
```
7593

94+
**💡 Tip:** Hugo segments are defined in `hugo.toml` and allow faster rendering by limiting the scope to specific language(s).
95+
7696
- For Windows (PowerShell)
7797

7898
```powershell
@@ -82,6 +102,7 @@ To install dependencies, deploy and test the site locally, run:
82102

83103
This will start the local Hugo server on port 1313. Open up your browser to <http://localhost:1313> to view the website. As you make changes to the source files, Hugo updates the website and forces a browser refresh.
84104

105+
85106
## Building the API reference pages
86107

87108
The API reference pages located in `content/en/docs/reference/kubernetes-api` are built from the Swagger specification, also known as OpenAPI specification, using <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs>.

content/en/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ In order to monitor resources provided by device plugins, monitoring agents need
246246
discover the set of devices that are in-use on the node and obtain metadata to describe which
247247
container the metric should be associated with. [Prometheus](https://prometheus.io/) metrics
248248
exposed by device monitoring agents should follow the
249-
[Kubernetes Instrumentation Guidelines](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/instrumentation.md),
249+
[Kubernetes Instrumentation Guidelines](https://github.com/kubernetes/community/blob/master/contributors/devel/sig-instrumentation/metric-instrumentation.md),
250250
identifying containers using `pod`, `namespace`, and `container` prometheus labels.
251251

252252
The kubelet provides a gRPC service to enable discovery of in-use devices, and to provide metadata

content/en/docs/concepts/extend-kubernetes/operator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ operator.
117117
* [Kopf](https://github.com/nolar/kopf) (Kubernetes Operator Pythonic Framework)
118118
* [kube-rs](https://kube.rs/) (Rust)
119119
* [kubebuilder](https://book.kubebuilder.io/)
120-
* [KubeOps](https://buehler.github.io/dotnet-operator-sdk/) (.NET operator SDK)
120+
* [KubeOps](https://dotnet.github.io/dotnet-operator-sdk/) (.NET operator SDK)
121121
* [Mast](https://docs.ansi.services/mast/user_guide/operator/)
122122
* [Metacontroller](https://metacontroller.github.io/metacontroller/intro.html) along with WebHooks that
123123
you implement yourself

content/en/docs/concepts/services-networking/dns-pod-service.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Kube-DNS versions, prior to the implementation of the
105105
had the following DNS resolution:
106106

107107
```
108-
pod-ipv4-address.my-namespace.pod.cluster-domain.example
108+
<pod-IPv4-address>.<namespace>.pod.<cluster-domain>
109109
```
110110

111111
For example, if a Pod in the `default` namespace has the IP address 172.17.0.3,
@@ -121,6 +121,14 @@ Some cluster DNS mechanisms, like [CoreDNS](https://coredns.io/), also provide `
121121
<pod-ipv4-address>.<service-name>.<my-namespace>.svc.<cluster-domain.example>
122122
```
123123

124+
For example, if a Pod in the `cafe` namespace has the IP address 172.17.0.3,
125+
is an endpoint of a Service named `barista`, and the domain name for your cluster is
126+
`cluster.local`, then the Pod would have this service-scoped DNS `A` record.
127+
128+
```
129+
172-17-0-3.barista.cafe.svc.cluster.local
130+
```
131+
124132
### Pod's hostname and subdomain fields
125133

126134
Currently when a Pod is created, its hostname (as observed from within the Pod)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: APIServingWithRoute
2+
title: APIServingWithRoutine
33
content_type: feature_gate
44
_build:
55
list: never

content/en/docs/reference/glossary/kubelet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Kubelet
33
id: kubelet
44
date: 2018-04-12
5-
full_link: /docs/reference/generated/kubelet
5+
full_link: /docs/reference/command-line-tools-reference/kubelet
66
short_description: >
77
An agent that runs on each node in the cluster. It makes sure that containers are running in a pod.
88

0 commit comments

Comments
 (0)