Merge branch 'main' into patch-1

Author: michaelruigrok

Dockerfile

@@ -4,7 +4,7 @@
 # change is that the Hugo version is now an overridable argument rather than a fixed
 # environment variable.
 
-FROM golang:1.18-alpine
+FROM docker.io/library/golang:1.20-alpine
 
 LABEL maintainer="Luc Perkins <[email protected]>"
 
@@ -24,7 +24,7 @@ RUN mkdir $HOME/src && \
     cd "hugo-${HUGO_VERSION}" && \
     go install --tags extended
 
-FROM golang:1.18-alpine
+FROM docker.io/library/golang:1.20-alpine
 
 RUN apk add --no-cache \
     runuser \

Makefile

@@ -9,7 +9,9 @@ CONTAINER_ENGINE ?= docker
 IMAGE_REGISTRY ?= gcr.io/k8s-staging-sig-docs
 IMAGE_VERSION=$(shell scripts/hash-files.sh Dockerfile Makefile | cut -c 1-12)
 CONTAINER_IMAGE   = $(IMAGE_REGISTRY)/k8s-website-hugo:v$(HUGO_VERSION)-$(IMAGE_VERSION)
-CONTAINER_RUN     = "$(CONTAINER_ENGINE)" run --rm --interactive --tty --volume "$(CURDIR):/src"
+# Mount read-only to allow use with tools like Podman in SELinux mode
+# Container targets don't need to write into /src
+CONTAINER_RUN     = "$(CONTAINER_ENGINE)" run --rm --interactive --tty --volume "$(CURDIR):/src:ro,Z"
 
 CCRED=\033[0;31m
 CCEND=\033[0m
@@ -38,7 +40,7 @@ build-preview: module-check ## Build site with drafts and future posts enabled
 	hugo --cleanDestinationDir --buildDrafts --buildFuture --environment preview
 
 deploy-preview: ## Deploy preview site via netlify
-	hugo --cleanDestinationDir --enableGitInfo --buildFuture --environment preview -b $(DEPLOY_PRIME_URL)
+	GOMAXPROCS=1 hugo --cleanDestinationDir --enableGitInfo --buildFuture --environment preview -b $(DEPLOY_PRIME_URL)
 
 functions-build:
 	$(NETLIFY_FUNC) build functions-src
@@ -47,11 +49,11 @@ check-headers-file:
 	scripts/check-headers-file.sh
 
 production-build: module-check ## Build the production site and ensure that noindex headers aren't added
-	hugo --cleanDestinationDir --minify --environment production
+	GOMAXPROCS=1 hugo --cleanDestinationDir --minify --environment production
 	HUGO_ENV=production $(MAKE) check-headers-file
 
 non-production-build: module-check ## Build the non-production site, which adds noindex headers to prevent indexing
-	hugo --cleanDestinationDir --enableGitInfo --environment nonprod
+	GOMAXPROCS=1 hugo --cleanDestinationDir --enableGitInfo --environment nonprod
 
 serve: module-check ## Boot the development server.
 	hugo server --buildFuture --environment development

OWNERS_ALIASES

@@ -32,11 +32,11 @@ aliases:
     - bradtopol
     - divya-mohan0209
     - kbhawkey
-    - krol3
     - natalisucks
     - nate-double-u
     - onlydole
     - reylejano
+    - Rishit-dagli # 1.28 Release Team Docs Lead
     - sftim
     - tengqm
   sig-docs-en-reviews: # PR reviews for English content
@@ -53,11 +53,17 @@ aliases:
     - shannonxtreme
     - tengqm
   sig-docs-es-owners: # Admins for Spanish content
+    - 92nqb
+    - krol3
     - electrocucaracha
     - raelga
+    - ramrodo
   sig-docs-es-reviews: # PR reviews for Spanish content
+    - 92nqb
+    - krol3
     - electrocucaracha
     - raelga
+    - ramrodo
   sig-docs-fr-owners: # Admins for French content
     - awkif
     - feloy
@@ -134,13 +140,15 @@ aliases:
     - chenrui333
     - howieyuen
     - mengjiao-liu
+    - my-git9
     - SataQiu
     - Sea-n
     - tanjunchen
     - tengqm
     - windsonsea
     - xichengliudui
   sig-docs-zh-reviews: # PR reviews for Chinese content
+    - asa3311
     - chenrui333
     - chenxuc
     - howieyuen
@@ -161,7 +169,6 @@ aliases:
     - edsoncelio
     - femrtnz
     - jcjesus
-    - rikatz
     - stormqueen1990
     - yagonobre
   sig-docs-pt-reviews: # PR reviews for Portugese content
@@ -170,7 +177,6 @@ aliases:
     - femrtnz
     - jcjesus
     - mrerlison
-    - rikatz
     - stormqueen1990
     - yagonobre
   sig-docs-vi-owners: # Admins for Vietnamese content

README-zh.md

@@ -22,11 +22,11 @@ This repository contains the assets required to build the [Kubernetes website an
 <!--
 ## Using this repository
 
-You can run the website locally using Hugo (Extended version), or you can run it in a container runtime. We strongly recommend using the container runtime, as it gives deployment consistency with the live website.
+You can run the website locally using [Hugo (Extended version)](https://gohugo.io/), or you can run it in a container runtime. We strongly recommend using the container runtime, as it gives deployment consistency with the live website.
 -->
 ## 使用这个仓库
 
-可以使用 Hugo（扩展版）在本地运行网站，也可以在容器中运行它。强烈建议使用容器，因为这样可以和在线网站的部署保持一致。
+可以使用 [Hugo（扩展版）](https://gohugo.io/)在本地运行网站，也可以在容器中运行它。强烈建议使用容器，因为这样可以和在线网站的部署保持一致。
 
 <!--
 ## Prerequisites
@@ -150,11 +150,11 @@ This will start the local Hugo server on port 1313. Open up your browser to <htt
 ## 构建 API 参考页面
 
 <!--
-The API reference pages located in `content/en/docs/reference/kubernetes-api` are built from the Swagger specification, using <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs>.
+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>.
 
 To update the reference pages for a new Kubernetes release follow these steps:
 -->
-位于 `content/en/docs/reference/kubernetes-api` 的 API 参考页面是根据 Swagger 规范构建的，使用 <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs>。
+位于 `content/en/docs/reference/kubernetes-api` 的 API 参考页面是使用 <https://github.com/kubernetes-sigs/reference-docs/tree/master/gen-resourcesdocs> 根据 Swagger 规范（也称为 OpenAPI 规范）构建的。
 
 要更新 Kubernetes 新版本的参考页面，请执行以下步骤：
 

api-ref-assets/api/swagger.json

@@ -99,6 +99,7 @@
     - initContainerStatuses
     - containerStatuses
     - ephemeralContainerStatuses
+    - resize
 
 - definition: io.k8s.api.core.v1.Container
   field_categories:
@@ -127,6 +128,7 @@
   - name: Resources
     fields:
     - resources
+    - resizePolicy
   - name: Lifecycle
     fields:
     - lifecycle
@@ -219,6 +221,9 @@
     fields:
     - volumeMounts
     - volumeDevices
+  - name: Resources
+    fields:
+    - resizePolicy
   - name: Lifecycle
     fields:
     - terminationMessagePath

api-ref-assets/config/fields.yaml

@@ -66,18 +66,18 @@ parts:
   - name: PriorityClass
     group: scheduling.k8s.io
     version: v1
-  - name: PodScheduling
+  - name: PodSchedulingContext
     group: resource.k8s.io
-    version: v1alpha1
+    version: v1alpha2
   - name: ResourceClaim
     group: resource.k8s.io
-    version: v1alpha1
+    version: v1alpha2
   - name: ResourceClaimTemplate
     group: resource.k8s.io
-    version: v1alpha1
+    version: v1alpha2
   - name: ResourceClass
     group: resource.k8s.io
-    version: v1alpha1
+    version: v1alpha2
 - name: Service Resources
   chapters:
   - name: Service
@@ -148,6 +148,12 @@ parts:
   - name: CertificateSigningRequest
     group: certificates.k8s.io
     version: v1
+  - name: ClusterTrustBundle
+    group: certificates.k8s.io
+    version: v1alpha1
+  - name: SelfSubjectReview
+    group: authentication.k8s.io
+    version: v1beta1
 - name: Authorization Resources
   chapters:
   - name: LocalSubjectAccessReview
@@ -191,6 +197,9 @@ parts:
   - name: PodDisruptionBudget
     group: policy
     version: v1
+  - name: IPAddress
+    group: networking.k8s.io
+    version: v1alpha1
 - name: Extend Resources
   chapters:
   - name: CustomResourceDefinition

api-ref-assets/config/toc.yaml

@@ -102,6 +102,16 @@ main {
   }
 }
 
+::selection {
+  background: #326ce5;
+  color: white;
+}
+
+::-moz-selection {
+  background: #326ce5;
+  color: white;
+}
+
 // HEADER
 
 #hamburger {

assets/scss/_base.scss

@@ -45,6 +45,30 @@ body {
   }
 }
 
+/* Complex table layout support */
+
+.td-content, body.td-content {
+  table.complex-layout {
+    tbody tr,
+    tbody tr:nth-of-type(2n+1) {
+      /* Avoid stripes */
+      background-color: initial;
+    }
+    tbody tr:not(:last-child) > td[colspan] {
+      /* provide a visual break between rows */
+      padding-bottom: 1.5em;
+    }
+    tbody > tr > th[scope="row"]:first-child {
+      min-width: 9em;
+    }
+    tbody > tr > th[rowspan] {
+      vertical-align: middle;
+    }
+    border-collapse: separate;
+    border-spacing: 0 0;
+    max-width: calc(max(min(100vw, 110%), 40vw));
+  }
+}
 
 /* Emphasize first paragraph of running text on site front page */
 body.td-home main[role="main"] > section:first-of-type .content p:first-child {

assets/scss/_custom.scss

@@ -42,12 +42,12 @@ <h2>Die Herausforderungen bei der Migration von über 150 Microservices auf Kube
         <button id="desktopShowVideoButton" onclick="kub.showVideo()">Video ansehen</button>
         <br>
         <br>
-        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" button id="desktopKCButton">Besuchen die KubeCon North America vom 24. bis 28. Oktober 2022</a>
+        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Besuche die KubeCon Europe vom 18. bis 21. April 2023</a>
         <br>
         <br>
         <br>
         <br>
-        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-europe/" button id="desktopKCButton">Besuche die KubeCon Europe vom 17. bis 21. April 2023</a>
+        <a href="https://events.linuxfoundation.org/kubecon-cloudnativecon-north-america/" button id="desktopKCButton">Besuche die KubeCon North America vom 6. bis 9. November 2023</a>
 </div>
 <div id="videoPlayer">
     <iframe data-url="https://www.youtube.com/embed/H06qrNmGqyE?autoplay=1" frameborder="0" allowfullscreen></iframe>