Skip to content

Commit 53c80f3

Browse files
committed
upload docker multi-arch image arm adn amd
1 parent a63670a commit 53c80f3

File tree

12 files changed

+94
-6
lines changed

12 files changed

+94
-6
lines changed

.DS_Store

6 KB
Binary file not shown.

.idea/.gitignore

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/bertreyking.github.io.iml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/SUMMARY.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
- [Harbor]()
6161
- [docker 安装](other/harbor/harbor-install-doc.md)
6262
- [k8s 安装](other/harbor/harbor-install.md)
63+
- [docker 融合镜像](other/harbor/docker-multi-arch.md)
6364
- [Image-syncer 使用](other/imagesyncer/image-syncer.md)
6465
---
6566

src/kubernetes/k8s-install-doc.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@
568568
[root@k8s-master01 ~]# kubectl calico -h
569569
Usage:
570570
kubectl-calico [options] <command> [<args>...]
571-
571+
572572
create Create a resource by file, directory or stdin.
573573
replace Replace a resource by file, directory or stdin.
574574
apply Apply a resource by file, directory or stdin. This creates a resource
@@ -584,21 +584,21 @@
584584
node Calico node management.
585585
version Display the version of this binary.
586586
datastore Calico datastore management.
587-
587+
588588
Options:
589589
-h --help Show this screen.
590590
-l --log-level=<level> Set the log level (one of panic, fatal, error,
591591
warn, info, debug) [default: panic]
592592
--context=<context> The name of the kubeconfig context to use.
593593
--allow-version-mismatch Allow client and cluster versions mismatch.
594-
594+
595595
Description:
596596
The calico kubectl plugin is used to manage Calico network and security
597597
policy, to view and manage endpoint configuration, and to manage a Calico
598598
node instance.
599-
599+
600600
See 'kubectl-calico <command> --help' to read about a specific subcommand.
601-
601+
602602
- 安装 helm 组件
603603
[root@k8s-master01 ~]# twget https://get.helm.sh/helm-v3.13.3-linux-amd64.tar.gz
604604
[root@k8s-master01 ~]# tar -zxvf helm-v3.13.3-linux-amd64.tar.gz
@@ -708,7 +708,6 @@
708708
709709
![k8s-install-error](../png/k8s-install-error.jpg)
710710
711-
712711
- 现象
713712
1. 🈚️任何 pod 创建,kubelet、containerd 没有任何日志且服务运行正常
714713
2. 以为是超时导致,更改了 init 时使用的集群配置文件 `timeoutForControlPlane: 10m0s` 无效

0 commit comments

Comments
 (0)