Skip to content

Commit 9f76854

Browse files
authored
Merge pull request #40532 from mickeyboxell/merged-main-dev-1.27
Merged main dev 1.27
2 parents f287ed4 + 31439e3 commit 9f76854

File tree

89 files changed

+1976
-918
lines changed

Some content is hidden

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

89 files changed

+1976
-918
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ CONTAINER_ENGINE ?= docker
99
IMAGE_REGISTRY ?= gcr.io/k8s-staging-sig-docs
1010
IMAGE_VERSION=$(shell scripts/hash-files.sh Dockerfile Makefile | cut -c 1-12)
1111
CONTAINER_IMAGE = $(IMAGE_REGISTRY)/k8s-website-hugo:v$(HUGO_VERSION)-$(IMAGE_VERSION)
12-
CONTAINER_RUN = "$(CONTAINER_ENGINE)" run --rm --interactive --tty --volume "$(CURDIR):/src"
12+
# Mount read-only to allow use with tools like Podman in SELinux mode
13+
# Container targets don't need to write into /src
14+
CONTAINER_RUN = "$(CONTAINER_ENGINE)" run --rm --interactive --tty --volume "$(CURDIR):/src:ro,Z"
1315

1416
CCRED=\033[0;31m
1517
CCEND=\033[0m

content/de/docs/contribute/localization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ mkdir content/de
111111

112112
### Lokalisierungs README Datei hinzufügen
113113

114-
Um andere Lokalisierungsmitwirkende anzuleiten, füge eine neue [`README-**.md`](https://help.github.com/articles/about-readmes/) auf der obersten Ebene von k/website hinzu, wobei `**` der aus zwei Buchstaben bestehende Sprachcode ist. Eine deutsche README-Datei wäre zum Beispiel `README-de.md`.
114+
Um andere Lokalisierungsmitwirkende anzuleiten, füge eine neue [`README-**.md`](https://help.github.com/articles/about-readmes/) auf der obersten Ebene von kubernetes/website hinzu, wobei `**` der aus zwei Buchstaben bestehende Sprachcode ist. Eine deutsche README-Datei wäre zum Beispiel `README-de.md`.
115115

116116
Gebe den Lokalisierungsmitwirkende in der lokalisierten `README-**.md`-Datei Anleitung zum Mitwirken. Füge dieselben Informationen ein, die auch in `README.md` enthalten sind, sowie:
117117

@@ -262,7 +262,7 @@ In einem Entwicklungszweig zusammenzuarbeiten:
262262

263263
`dev-<Quellversion>-<Sprachcode>.<Team-Meilenstein>`
264264

265-
Beispielsweise öffnet ein Genehmigender in einem deutschen Lokalisierungsteam den Entwicklungszweig `dev-1.12-de.1` direkt gegen das k/website-Repository, basierend auf dem Quellzweig für Kubernetes v1.12.
265+
Beispielsweise öffnet ein Genehmigender in einem deutschen Lokalisierungsteam den Entwicklungszweig `dev-1.12-de.1` direkt gegen das kubernetes/website-Repository, basierend auf dem Quellzweig für Kubernetes v1.12.
266266

267267
2. Einzelne Mitwirkende öffnen Feature-Zweige, die auf dem Entwicklungszweig basieren.
268268

content/en/blog/_posts/2019-12-02-gardener-project-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The essential idea is that so-called **seed** clusters are used to host the
4747
control planes of end-user clusters (botanically named **shoots**). \
4848
Gardener provides vanilla Kubernetes clusters as a service independent of the
4949
underlying infrastructure provider in a homogenous way, utilizing the upstream
50-
provided `k8s.gcr.io/*` images as open distribution. The project is built
50+
provided `k8s.gcr.io/*` images as open distribution _(update: `k8s.gcr.io` has been deprecated in favor of `registry.k8s.io`)._ The project is built
5151
entirely on top of Kubernetes extension concepts, and as such adds a custom API
5252
server, a controller-manager, and a scheduler to create and manage the lifecycle
5353
of Kubernetes clusters. It extends the Kubernetes API with custom resources,

content/en/blog/_posts/2021-04-13-kube-state-metrics-goes-v-2-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ So without further ado, here is the list of more noteworthy user-facing breaking
3535
* Metric labels that relate to Kubernetes were converted to snake_case.
3636
* If you are importing kube-state-metrics as a library, we have updated our go module path to `k8s.io/kube-state-metrics/v2`
3737
* All deprecated stable metrics were removed as per the [notice in the v1.9 release](https://github.com/kubernetes/kube-state-metrics/tree/release-1.9/docs#metrics-deprecation).
38-
* `quay.io/coreos/kube-state-metrics` images will no longer be updated. `k8s.gcr.io/kube-state-metrics/kube-state-metrics` is the new canonical location.
38+
* `quay.io/coreos/kube-state-metrics` images will no longer be updated. `k8s.gcr.io/kube-state-metrics/kube-state-metrics` is the new canonical location _(update: `k8s.gcr.io` has been deprecated in favor of `registry.k8s.io`)._
3939
* The helm chart that is part of the kubernetes/kube-state-metrics repository is deprecated. https://github.com/prometheus-community/helm-charts will be its new location.
4040

4141
For the full list of v2.0 release changes includes features, bug fixes and other breaking changes see the full [CHANGELOG](https://github.com/kubernetes/kube-state-metrics/blob/master/CHANGELOG.md).

content/en/blog/_posts/2023-01-05-retroactive-default-storage-class.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: blog
3-
title: "Kubernetes 1.26: Retroactive Default StorageClass"
3+
title: "Kubernetes v1.26: Retroactive Default StorageClass"
44
date: 2023-01-05
55
slug: retroactive-default-storage-class
66
---
@@ -11,7 +11,7 @@ The v1.25 release of Kubernetes introduced an alpha feature to change how a defa
1111
StorageClass was assigned to a PersistentVolumeClaim (PVC). With the feature enabled,
1212
you no longer need to create a default StorageClass first and PVC second to assign the
1313
class. Additionally, any PVCs without a StorageClass assigned can be updated later.
14-
This feature was graduated to beta in Kubernetes 1.26.
14+
This feature was graduated to beta in Kubernetes v1.26.
1515

1616
You can read [retroactive default StorageClass assignment](/docs/concepts/storage/persistent-volumes/#retroactive-default-storageclass-assignment)
1717
in the Kubernetes documentation for more details about how to use that,
@@ -146,23 +146,35 @@ If you would like to see the feature in action and verify it works fine in your
146146
The PVC won't provision or bind (unless there is an existing, suitable PV already present)
147147
and will remain in <code>Pending</code> state.
148148
149+
```shell
150+
kubectl get pvc
149151
```
150-
$ kc get pvc
152+
153+
The output is similar to this:
154+
```console
151155
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
152156
pvc-1 Pending
153157
```
154158

155159
3. Configure one StorageClass as default.
156160

161+
```shell
162+
kubectl patch sc -p '{"metadata":{"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
157163
```
158-
$ kc patch sc -p '{"metadata":{"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
164+
165+
The output is similar to this:
166+
```console
159167
storageclass.storage.k8s.io/my-storageclass patched
160168
```
161169

162170
4. Verify that PersistentVolumeClaims is now provisioned correctly and was updated retroactively with new default StorageClass.
163171

172+
```shell
173+
kubectl get pvc
164174
```
165-
$ kc get pvc
175+
176+
The output is similar to this:
177+
```console
166178
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
167179
pvc-1 Bound pvc-06a964ca-f997-4780-8627-b5c3bf5a87d8 1Gi RWO my-storageclass 87m
168180
```

0 commit comments

Comments
 (0)