Merge branch 'dev-1.33' into dev-1.33-ga

Author: sunnylovestiramisu

.gitignore

@@ -32,7 +32,6 @@ nohup.out
 .hugo_build.lock
 
 # Netlify Functions build output
-package-lock.json
 /functions/
 /node_modules/
 

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "themes/docsy"]
-	path = themes/docsy
-	url = https://github.com/google/docsy.git
-	branch = v0.3.0
 [submodule "api-ref-generator"]
 	path = api-ref-generator
 	url = https://github.com/kubernetes-sigs/reference-docs

Dockerfile

@@ -4,7 +4,7 @@
 # change is that the Hugo version is now an overridable argument rather than a fixed
 # environment variable.
 
-FROM docker.io/library/golang:1.23.0-alpine3.20
+FROM docker.io/library/golang:1.23.1-alpine3.20
 
 RUN apk add --no-cache \
     curl \
@@ -22,11 +22,12 @@ RUN mkdir $HOME/src && \
     cd "hugo-${HUGO_VERSION}" && \
     go install --tags extended
 
-FROM docker.io/library/golang:1.23.0-alpine3.20
+FROM docker.io/library/golang:1.23.1-alpine3.20
 
 RUN apk add --no-cache \
     runuser \
     git \
+    gcompat \
     openssh-client \
     rsync \
     npm

Makefile

@@ -7,11 +7,24 @@ NETLIFY_FUNC      = $(NODE_BIN)/netlify-lambda
 # CONTAINER_ENGINE=podman make container-image
 CONTAINER_ENGINE ?= docker
 IMAGE_REGISTRY ?= gcr.io/k8s-staging-sig-docs
-IMAGE_VERSION=$(shell scripts/hash-files.sh Dockerfile Makefile | cut -c 1-12)
+IMAGE_VERSION=$(shell scripts/hash-files.sh Dockerfile Makefile package.json package-lock.json | cut -c 1-12)
 CONTAINER_IMAGE   = $(IMAGE_REGISTRY)/k8s-website-hugo:v$(HUGO_VERSION)-$(IMAGE_VERSION)
 # 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"
+CONTAINER_RUN_TTY = "$(CONTAINER_ENGINE)" run --rm --interactive --tty
+CONTAINER_HUGO_MOUNTS = \
+	--read-only \
+	--mount type=bind,source=$(CURDIR)/.git,target=/src/.git,readonly \
+	--mount type=bind,source=$(CURDIR)/archetypes,target=/src/archetypes,readonly \
+	--mount type=bind,source=$(CURDIR)/assets,target=/src/assets,readonly \
+	--mount type=bind,source=$(CURDIR)/content,target=/src/content,readonly \
+	--mount type=bind,source=$(CURDIR)/data,target=/src/data,readonly \
+	--mount type=bind,source=$(CURDIR)/i18n,target=/src/i18n,readonly \
+	--mount type=bind,source=$(CURDIR)/layouts,target=/src/layouts,readonly \
+	--mount type=bind,source=$(CURDIR)/static,target=/src/static,readonly \
+	--mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 \
+	--mount type=bind,source=$(CURDIR)/hugo.toml,target=/src/hugo.toml,readonly
 
 CCRED=\033[0;31m
 CCEND=\033[0m
@@ -98,15 +111,13 @@ docker-push: ## Build a multi-architecture image and push that into the registry
 
 container-build: module-check
 	mkdir -p public
-	$(CONTAINER_RUN) --read-only \
-		--mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 \
-		--mount type=bind,source=$(CURDIR)/public,target=/src/public $(CONTAINER_IMAGE) \
-		hugo --cleanDestinationDir --buildDrafts --buildFuture --environment preview --noBuildLock
+	$(CONTAINER_RUN_TTY) $(CONTAINER_HUGO_MOUNTS) $(CONTAINER_IMAGE) \
+		hugo --destination /tmp/public --cleanDestinationDir --buildDrafts --buildFuture --environment preview --noBuildLock
 
 # no build lock to allow for read-only mounts
 container-serve: module-check ## Boot the development server using container.
-	$(CONTAINER_RUN) --cap-drop=ALL --cap-add=AUDIT_WRITE --read-only \
-		--mount type=tmpfs,destination=/tmp,tmpfs-mode=01777 -p 1313:1313 $(CONTAINER_IMAGE) \
+	$(CONTAINER_RUN_TTY) --cap-drop=ALL --cap-add=AUDIT_WRITE $(CONTAINER_HUGO_MOUNTS) \
+		-p 1313:1313 $(CONTAINER_IMAGE) \
 		hugo server --buildDrafts --buildFuture --environment development --bind 0.0.0.0 --destination /tmp/public --cleanDestinationDir --noBuildLock
 
 test-examples:

OWNERS_ALIASES

@@ -1,11 +1,13 @@
 aliases:
   sig-docs-blog-owners: # Approvers for blog content
     - mrbobbytables
+    - natalisucks
     - nate-double-u
     - sftim
   sig-docs-blog-reviewers: # Reviewers for blog content
     - Gauravpadam
     - mrbobbytables
+    - natalisucks
     - nate-double-u
     - sftim
   sig-docs-website-owners: # Admins for overall website
@@ -60,11 +62,11 @@ aliases:
     - katcosgrove
     - natalisucks
     - nate-double-u
+    - rayandas # RT 1.33 Docs Lead
     - reylejano
     - salaxander
     - sftim
     - tengqm
-    - chanieljdan # RT 1.32 Docs Lead
   sig-docs-en-reviews: # PR reviews for English content
     - dipesh-rawat
     - divya-mohan0209
@@ -156,10 +158,10 @@ aliases:
     - ysyukr
   sig-docs-leads: # Website chairs and tech leads
     - divya-mohan0209
+    - katcosgrove
     - natalisucks
     - reylejano
     - salaxander
-    - sftim
     - tengqm
   sig-docs-zh-owners: # Admins for Chinese content
     - chenrui333

README.md

@@ -30,7 +30,7 @@ git clone https://github.com/kubernetes/website.git
 cd website
 ```
 
-The Kubernetes website uses the [Docsy Hugo theme](https://github.com/google/docsy#readme). Even if you plan to run the website in a container, we strongly recommend pulling in the submodule and other development dependencies by running the following:
+The Kubernetes website uses git submodules. Even if you plan to run the website in a container, we strongly recommend pulling in the submodule and other development dependencies by running the following:
 
 ### Windows
 

static/images/kubernetes-horizontal-color.png assets/images/kubernetes-horizontal-color.png

@@ -21,21 +21,25 @@ $(document).ready(function() {
 
   /* Check the presence of a cookie */
   let announcement = document.querySelector("#announcement");
-  let token = `announcement_ack_${announcement.getAttribute('data-announcement-name').replace(/\s/g, '_')}`; // Generate the unique token for announcement
-  let acknowledged = getCookie(token);
-  if (acknowledged === "true") {
-    announcement.remove(); // Remove the announcement if the cookie is set
-  }
-  else {
-    announcement.classList.add('display-announcement') // Display the announcement if the cookie is not set
-  }
+  if (announcement) {
+    let token = `announcement_ack_${announcement.getAttribute('data-announcement-name').replace(/\s/g, '_')}`; // Generate the unique token for announcement
+    let acknowledged = getCookie(token);
+    if (acknowledged === "true") {
+      announcement.remove(); // Remove the announcement if the cookie is set
+    }
+    else {
+      announcement.classList.add('display-announcement') // Display the announcement if the cookie is not set
+    }
+  }
 
   /* Driver code to set the cookie */
   let button = document.querySelector('#banner-dismiss');
-  button.removeAttribute('style');
-  button.addEventListener('click', function() {
-    setCookie(token, "true", 
-    button.getAttribute('data-ttl')); // Set a cookie with time to live parameter
-    announcement.remove();
-  });
+  if (button) {
+    button.removeAttribute('style');
+    button.addEventListener('click', function() {
+      setCookie(token, "true",
+      button.getAttribute('data-ttl')); // Set a cookie with time to live parameter
+      announcement.remove();
+    });
+  }
 });

assets/js/banner-dismiss.js

@@ -545,16 +545,27 @@ section#cncf {
     margin-bottom: 20px;
   }
 
-  #desktopKCButton {
-    position: absolute;
+  // All #desktopKCButton blocks are left for back compatibility and
+  // should be removed later, leaving .desktopKCButton only
+  // See https://github.com/kubernetes/website/pull/49167 for details
+  #desktopKCButton, .desktopKCButton {
+    display: inline-block;
     font-size: 18px;
     background-color: $dark-grey;
     border-radius: 8px;
     color: $white;
+    padding: 2px 8px;
+    margin: 5px;
+  }
+  
+  #desktopKCButton {
+    display: inline;
+    position: absolute;
     padding: 20px 10px 20px 10px;
+    margin: 0;
   }
 
-  #desktopKCButton:hover{
+  #desktopKCButton:hover, .desktopKCButton:hover{
     background-color: #ffffff;
     color: #326ce5;
     transition: 150ms;
@@ -567,7 +578,7 @@ section#cncf {
     border-radius: 8px;
     color: $primary;
     padding: 15px 30px 15px 80px;
-    margin-bottom: 15px;
+    margin-bottom: 35px;
 
     &:before {
       content: "";

assets/js/sweetalert-2.1.2.min.js

@@ -98,10 +98,7 @@ body.td-home main[role="main"] > section:first-of-type .content p:first-child {
 
 body.td-404 main .error-details {
   max-width: 1100px;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 4em;
-  margin-bottom: 0;
+  margin: 0 auto;
 }
 
 /* Global - Mermaid.js diagrams */
@@ -1138,7 +1135,7 @@ body.cid-community #cncf-code-of-conduct h2:after {
     color: #fff;
     padding: 0;
     margin: 0;
-    width: 100vw;
+    width: 100%;
 }
 #caseStudies body > #deprecation-warning, body.cid-casestudies > #deprecation-warning {
     padding-top: 32px;
@@ -1591,7 +1588,7 @@ html.no-js body div#announcement {
   // default background is blue; overrides are possible
   color: #fff;
   display: none; // When javascript is available, Let javascript handle the state of the announcement
-  
+
   .announcement-main {
     margin-left: auto;
     margin-right: auto;
@@ -1828,7 +1825,7 @@ div.alert > em.javascript-required {
   align-items: center;
   background-color: #fff;
   border: 1px solid #4c4c4c;
-  border-radius: 20px; 
+  border-radius: 20px;
   vertical-align: middle;
   flex-grow: 1;
   overflow-x: hidden;
@@ -1857,7 +1854,7 @@ div.alert > em.javascript-required {
 #search .pagefind-ui form input  {
   background-color: #fff;
   border: 1px solid #4c4c4c;
-  border-radius: 20px; 
+  border-radius: 20px;
   overflow-x: hidden;
   width: auto;
   padding: 6px 10px !important;
@@ -1912,7 +1909,7 @@ body.td-search #search {
 }
 
 /* CSS for 'figure' full-screen display */
- 
+
 /* Define styles for full-screen overlay */
 .figure-fullscreen-overlay {
   position: fixed;
@@ -1941,7 +1938,7 @@ body.td-search #search {
 /* Define styles for close button */
 .figure-close-button {
   position: absolute;
-  top: 1%; 
+  top: 1%;
   right: 2%;
   cursor: pointer;
   font-size: calc(5vw + 10px);
@@ -1950,10 +1947,24 @@ body.td-search #search {
 
 .code-sample > .copy-code-icon {
   cursor: pointer;
-  text-align: right;
+  display: flex;
+  gap:1rem;
+  justify-content: right;
   padding: 0.2rem;
 }
 
+.includecode .highlight {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+#toast-container > *{
+  background: $primary;
+}
+
+.toast-success {
+  background-color: $primary !important; 
+  color: #ffffff !important; 
+}
 
 // handle main page features on narrow viewports
 @media screen and (max-width: 768px) {

assets/js/toastr-2.1.4.min.js

@@ -1,6 +1,6 @@
 $main-max-width: 1200px;
 $vendor-strip-height: 44px;
-$video-section-height: 550px;
+$video-section-height: 580px;
 
 @media screen and (min-width: 1024px) {
 
@@ -96,4 +96,4 @@ $video-section-height: 550px;
       min-height: 260px;
     }
   }
-}
+}

assets/scss/_base.scss

@@ -136,7 +136,7 @@ $video-section-height: 400px;
   #video {
     height: $video-section-height;
     display: block;
-    height: 500px;
+    height: 550px;
 
     & > .light-text {
       display: block;

assets/scss/_custom.scss

@@ -41,7 +41,7 @@ <h2>Impact</h2>
 
 <p>Box's cloud native journey accelerated that June, when Ghods attended <a href="https://www.docker.com/events/dockercon">DockerCon</a>. The company had come to the realization that it could no longer run its applications only off bare metal, and was researching containerizing with Docker, virtualizing with OpenStack, and supporting public cloud.</p>
 
-<p>At that conference, Google announced the release of its Kubernetes container management system, and Ghods was won over. "We looked at a lot of different options, but Kubernetes really stood out, especially because of the incredibly strong team of <a href="https://research.google.com/pubs/pub43438.html">Borg</a> veterans and the vision of having a completely infrastructure-agnostic way of being able to run cloud software," he says, referencing Google's internal container orchestrator Borg. "The fact that on day one it was designed to run on bare metal just as well as <a href="https://cloud.google.com/">Google Cloud</a> meant that we could actually migrate to it inside of our data centers, and then use those same tools and concepts to run across public cloud providers as well."</p>
+<p>At that conference, Google announced the release of its Kubernetes container management system, and Ghods was won over. "We looked at a lot of different options, but Kubernetes really stood out, especially because of the incredibly strong team of <a href="https://research.google/pubs/large-scale-cluster-management-at-google-with-borg/">Borg</a> veterans and the vision of having a completely infrastructure-agnostic way of being able to run cloud software," he says, referencing Google's internal container orchestrator Borg. "The fact that on day one it was designed to run on bare metal just as well as <a href="https://cloud.google.com/">Google Cloud</a> meant that we could actually migrate to it inside of our data centers, and then use those same tools and concepts to run across public cloud providers as well."</p>
 
 <p>Another plus: Ghods liked that <a href="https://kubernetes.io/">Kubernetes</a> has a universal set of API objects like pod, service, replica set and deployment object, which created a consistent surface to build tooling against. "Even PaaS layers like <a href="https://www.openshift.com/">OpenShift</a> or <a href="http://deis.io/">Deis</a> that build on top of Kubernetes still treat those objects as first-class principles," he says. "We were excited about having these abstractions shared across the entire ecosystem, which would result in a lot more momentum than we saw in other potential solutions."</p>
 

assets/scss/_desktop.scss

@@ -392,7 +392,7 @@ init কন্টেইনারগুলির জন্য আপনাকে
 কুবারনেটিস কেন অন্যান্য রিসোর্সগুলিতে মোড়ানোর প্রসঙ্গটি বোঝার জন্য একটি সাধারণ পড API (যেমন {{< glossary_tooltip text="স্টেটফুল সেট" term_id="statefulset" >}}) বা {{< glossary_tooltip text="ডিপলয়মেন্ট" term_id="deployment">}}) তে , আপনি পূর্ববর্তী আর্ট সম্পর্কে পড়তে পারেন, যার মধ্যে রয়েছে:
 
 * [Aurora](https://aurora.apache.org/documentation/latest/reference/configuration/#job-schema)
-* [Borg](https://research.google.com/pubs/pub43438.html)
-* [Marathon](https://mesosphere.github.io/marathon/docs/rest-api.html)
+* [Borg](https://research.google/pubs/large-scale-cluster-management-at-google-with-borg/)
+* [Marathon](https://github.com/d2iq-archive/marathon)
 * [Omega](https://research.google/pubs/pub41684/)
 * [Tupperware](https://engineering.fb.com/data-center-engineering/tupperware/)।