Skip to content

Commit b18a286

Browse files
authored
Merge pull request #45559 from Vyom-Yadav/merged-main-dev-1.30
Merge main branch into dev-1.30
2 parents b8ec2eb + 1eb315a commit b18a286

File tree

116 files changed

+5998
-497
lines changed

Some content is hidden

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

116 files changed

+5998
-497
lines changed

OWNERS_ALIASES

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ aliases:
4949
- windsonsea
5050
sig-docs-es-owners: # Admins for Spanish content
5151
- 92nqb
52-
- krol3
5352
- electrocucaracha
53+
- krol3
5454
- raelga
5555
- ramrodo
5656
sig-docs-es-reviews: # PR reviews for Spanish content
5757
- 92nqb
58-
- krol3
5958
- electrocucaracha
59+
- jossemarGT
60+
- krol3
6061
- raelga
6162
- ramrodo
6263
sig-docs-fr-owners: # Admins for French content

assets/scss/_custom.scss

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,8 @@ body.td-documentation {
732732
}
733733
}
734734

735+
/* Announcements */
736+
735737
#announcement {
736738
> * {
737739
color: inherit;
@@ -753,10 +755,21 @@ body.td-documentation {
753755
padding-top: 40px;
754756
}
755757

758+
// Don't show announcements when javascript is not available
759+
760+
html.no-js body div#announcement {
761+
display: none;
762+
}
763+
764+
#announcement.display-announcement{
765+
display: block; // apply this class to display the announcement
766+
}
767+
756768
#announcement {
757769
// default background is blue; overrides are possible
758770
color: #fff;
759-
771+
display: none; // When javascript is available, Let javascript handle the state of the announcement
772+
760773
.announcement-main {
761774
margin-left: auto;
762775
margin-right: auto;

content/en/blog/_posts/2021-11-12-are-you-ready-for-dockershim-removal/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ time to review the [dockershim migration documentation](/docs/tasks/administer-c
6464
and consult your Kubernetes hosting vendor (if you have one) what container runtime options are available for you.
6565
Read up [container runtime documentation with instructions on how to use containerd and CRI-O](/docs/setup/production-environment/container-runtimes/#container-runtimes)
6666
to help prepare you when you're ready to upgrade to 1.24. CRI-O, containerd, and
67-
Docker with [Mirantis cri-dockerd](https://github.com/Mirantis/cri-dockerd) are
67+
Docker with [Mirantis cri-dockerd](https://mirantis.github.io/cri-dockerd/) are
6868
not the only container runtime options, we encourage you to explore the [CNCF landscape on container runtimes](https://landscape.cncf.io/?group=projects-and-products&view-mode=card#runtime--container-runtime)
6969
in case another suits you better.
7070

content/en/blog/_posts/2022-02-17-updated-dockershim-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Kubernetes clusters. Containers make this kind of interoperability possible.
109109

110110
Mirantis and Docker have [committed][mirantis] to maintaining a replacement adapter for
111111
Docker Engine, and to maintain that adapter even after the in-tree dockershim is removed
112-
from Kubernetes. The replacement adapter is named [`cri-dockerd`](https://github.com/Mirantis/cri-dockerd).
112+
from Kubernetes. The replacement adapter is named [`cri-dockerd`](https://mirantis.github.io/cri-dockerd/).
113113

114114
You can install `cri-dockerd` and use it to connect the kubelet to Docker Engine. Read [Migrate Docker Engine nodes from dockershim to cri-dockerd](/docs/tasks/administer-cluster/migrating-from-dockershim/migrate-dockershim-dockerd/) to learn more.
115115

content/en/blog/_posts/2023-08-15-pkgs-k8s-io-introduction.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ publishing packages to the Google-hosted repository in the future.
173173
curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
174174
```
175175

176+
_Update: In releases older than Debian 12 and Ubuntu 22.04, the folder `/etc/apt/keyrings` does not exist by default, and it should be created before the curl command._
177+
176178
3. Update the `apt` package index:
177179

178180
```shell

0 commit comments

Comments
 (0)