Skip to content

Commit eed7dea

Browse files
authored
Merge pull request #16216 from afbjorklund/cri-dockerd-docs-build
Don't suggest building cri-dockerd from source
2 parents 69a13ab + 8e56b81 commit eed7dea

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

pkg/minikube/reason/reason.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ var (
474474
475475
Please install cri-dockerd using these instructions:
476476
477-
https://github.com/Mirantis/cri-dockerd#build-and-install`),
477+
https://github.com/Mirantis/cri-dockerd`),
478478
Style: style.Docker,
479479
}
480480
NotFoundDockerd = Kind{

site/content/en/docs/drivers/includes/none_usage.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ A Linux VM with the following:
44

55
* systemd or OpenRC
66
* a container runtime, such as Docker or CRIO
7-
* [cri-dockerd](https://github.com/Mirantis/cri-dockerd#build-and-install) (if using Kubernetes +v1.24 & `docker` container-runtime)
7+
* [cri-dockerd](https://github.com/Mirantis/cri-dockerd) (if using Kubernetes +v1.24 & `docker` container-runtime)
88

99
This VM must also meet the [kubeadm requirements](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/), such as:
1010

site/content/en/docs/drivers/includes/ssh_usage.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ A Linux VM with the following:
44

55
* systemd or OpenRC
66
* a container runtime, such as Docker or CRIO
7-
* [cri-dockerd](https://github.com/Mirantis/cri-dockerd#build-and-install) (if using Kubernetes +v1.24 & `docker` container-runtime)
7+
* [cri-dockerd](https://github.com/Mirantis/cri-dockerd) (if using Kubernetes +v1.24 & `docker` container-runtime)
88

99
This VM must also meet the [kubeadm requirements](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/install-kubeadm/), such as:
1010

translations/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@
733733
"The node {{.name}} has ran out of memory.": "Der Node {{.name}} hat keinen verfügbaren Speicher mehr.",
734734
"The node {{.name}} network is not available. Please verify network settings.": "Das Netzwerk des Node {{.name}}",
735735
"The none driver is not compatible with multi-node clusters.": "Der 'none' Treiber ist nicht kompatibel mit Multi-Node Clustern.",
736-
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "",
736+
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
737737
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
738738
"The number of nodes to spin up. Defaults to 1.": "Die Anzahl der zu startenden Nodes. Default: 1",
739739
"The output format. One of 'json', 'table'": "Das Ausgabe Format. (Entweder 'json' oder 'table')",

translations/es.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@
734734
"The node {{.name}} has ran out of memory.": "",
735735
"The node {{.name}} network is not available. Please verify network settings.": "",
736736
"The none driver is not compatible with multi-node clusters.": "",
737-
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "",
737+
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
738738
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
739739
"The number of nodes to spin up. Defaults to 1.": "",
740740
"The output format. One of 'json', 'table'": "",

translations/fr.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@
715715
"The node {{.name}} has ran out of memory.": "Le nœud {{.name}} est à court de mémoire.",
716716
"The node {{.name}} network is not available. Please verify network settings.": "Le réseau du nœud {{.name}} n'est pas disponible. Veuillez vérifier les paramètres réseau.",
717717
"The none driver is not compatible with multi-node clusters.": "Le pilote none n'est pas compatible avec les clusters multi-nœuds.",
718-
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent cri-dockerd.\n\t\t\n\t\tVeuillez installer cri-dockerd en suivant ces instructions :\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install",
718+
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent cri-dockerd.\n\t\t\n\t\tVeuillez installer cri-dockerd en suivant ces instructions :\n\n\t\thttps://github.com/Mirantis/cri-dockerd",
719719
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Le pilote none avec Kubernetes v1.24+ et l'environnement d'exécution du conteneur docker nécessitent dockerd.\n\t\t\n\t\tVeuillez installer dockerd en suivant ces instructions :\n\n\t\thttps://docs.docker.com/engine/install/",
720720
"The number of bytes to use for 9p packet payload": "Le nombre d'octets à utiliser pour la charge utile du paquet 9p",
721721
"The number of nodes to spin up. Defaults to 1.": "Le nombre de nœuds à faire tourner. La valeur par défaut est 1.",

translations/ja.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@
687687
"The node {{.name}} has ran out of memory.": "{{.name}} ノードはメモリーを使い果たしました。",
688688
"The node {{.name}} network is not available. Please verify network settings.": "{{.name}} ノードはネットワークが使用不能です。ネットワーク設定を検証してください。",
689689
"The none driver is not compatible with multi-node clusters.": "none ドライバーはマルチノードクラスターと互換性がありません。",
690-
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "Kubernetes v1.24+ の none ドライバーと docker container-runtime は cri-dockerd を要求します。\n\t\t\n\t\tこれらの手順を参照して cri-dockerd をインストールしてください:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install",
690+
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "Kubernetes v1.24+ の none ドライバーと docker container-runtime は cri-dockerd を要求します。\n\t\t\n\t\tこれらの手順を参照して cri-dockerd をインストールしてください:\n\n\t\thttps://github.com/Mirantis/cri-dockerd",
691691
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "Kubernetes v1.24+ の none ドライバーと docker container-runtime は dockerd を要求します。\n\t\t\n\t\tこれらの手順を参照して dockerd をインストールしてください:\n\n\t\thttps://docs.docker.com/engine/install/",
692692
"The number of nodes to spin up. Defaults to 1.": "起動するノード数。デフォルトは 1。",
693693
"The output format. One of 'json', 'table'": "出力形式。'json', 'table' のいずれか",

translations/ko.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@
737737
"The node {{.name}} has ran out of memory.": "",
738738
"The node {{.name}} network is not available. Please verify network settings.": "",
739739
"The none driver is not compatible with multi-node clusters.": "",
740-
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "",
740+
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
741741
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
742742
"The number of nodes to spin up. Defaults to 1.": "",
743743
"The output format. One of 'json', 'table'": "",

translations/pl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@
748748
"The node {{.name}} has ran out of memory.": "",
749749
"The node {{.name}} network is not available. Please verify network settings.": "",
750750
"The none driver is not compatible with multi-node clusters.": "",
751-
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "",
751+
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
752752
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
753753
"The number of nodes to spin up. Defaults to 1.": "",
754754
"The output format. One of 'json', 'table'": "",

translations/ru.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@
679679
"The node {{.name}} has ran out of memory.": "",
680680
"The node {{.name}} network is not available. Please verify network settings.": "",
681681
"The none driver is not compatible with multi-node clusters.": "",
682-
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd#build-and-install": "",
682+
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires cri-dockerd.\n\t\t\n\t\tPlease install cri-dockerd using these instructions:\n\n\t\thttps://github.com/Mirantis/cri-dockerd": "",
683683
"The none driver with Kubernetes v1.24+ and the docker container-runtime requires dockerd.\n\t\t\n\t\tPlease install dockerd using these instructions:\n\n\t\thttps://docs.docker.com/engine/install/": "",
684684
"The number of nodes to spin up. Defaults to 1.": "",
685685
"The output format. One of 'json', 'table'": "",

0 commit comments

Comments
 (0)