Skip to content

Commit cc72f48

Browse files
author
Cui Shuaijie
committed
fix(platform): update csi images repo && csi-operator doc(#1414)
1 parent 38a3797 commit cc72f48

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

hack/addon/readme/CSIOperator.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# CSIOperator
22

3-
## CSIOperator 介绍
3+
## CSIOperator 介绍
44

55
Container Storage Interface Operator(CSIOperator)用于部署和更新 Kubernetes 集群中的 CSI 驱动和外部存储组件。
66

@@ -31,6 +31,23 @@ CSIOperator 用于支持集群方便的使用存储资源,当前支持的存
3131
4. 在弹出的扩展组件列表里,滑动列表窗口找到 CSIOperator
3232
5. 单击【完成】进行安装
3333

34+
### 镜像准备
35+
36+
当前支持的存储插件包括 RBD、CephFS、TencentCBS 和 TencentCFS(测试中,暂不支持),
37+
针对不同的模式,依赖不同的 csi 镜像:
38+
39+
| csi 类型及版本 |依赖的镜像及拉取命令|
40+
|--------------|--------|
41+
| CephRBD V0 |docker pull tkestack/csi-provisioner:v0.4.2 <br>docker pull tkestack/csi-attacher:v0.4.2 <br>docker pull tkestack/csi-snapshotter:v0.4.1 <br/>docker pull tkestack/livenessprobe:v0.4.1 <br/>docker pull tkestack/driver-registrar:v0.3.0 <br/>docker pull tkestack/rbdplugin:v0.3.0|
42+
| CephRBD V1 |docker pull tkestack/csi-provisioner:v1.0.1 <br>docker pull tkestack/csi-attacher:v1.1.0<br>docker pull tkestack/csi-snapshotter:v1.1.0 <br/>docker pull tkestack/livenessprobe:v1.1.0<br/>docker pull tkestack/csi-node-driver-registrar:v1.1.0 <br/>docker pull tkestack/rbdplugin:v1.0.0|
43+
| CephFS V0 |docker pull tkestack/csi-provisioner:v0.4.2 <br>docker pull tkestack/csi-attacher:v0.4.2 <br>docker pull tkestack/livenessprobe:v0.4.1 <br/>docker pull tkestack/driver-registrar:v0.3.0 <br/>docker pull tkestack/cephfsplugin:v0.3.0|
44+
| CephFS V1 |docker pull tkestack/csi-provisioner:v1.0.1 <br/>docker pull tkestack/csi-attacher:v1.1.0<br/>docker pull tkestack/livenessprobe:v1.1.0<br/>docker pull tkestack/csi-node-driver-registrar:v1.1.0<br/>docker pull tkestack/cephfsplugin:v1.0.0|
45+
| TencentCBS V0 |docker pull tkestack/csi-provisioner:v1.0.1 <br/>docker pull tkestack/csi-attacher:v1.1.0<br/>docker pull tkestack/driver-registrar:v0.3.0<br/>docker pull tkestack/csi-tencentcloud-cbs:v0.2.1|
46+
| TencentCBS V1 |docker pull tkestack/csi-provisioner:v1.2.0 <br/>docker pull tkestack/csi-attacher:v1.1.0<br/>docker pull tkestack/csi-snapshotter:v1.2.2<br/>docker pull tkestack/csi-node-driver-registrar:v1.1.0<br/>docker pull tkestack/csi-tencentcloud-cbs:v1.0.0 <br />docker pull tkestack/csi-resizer:v0.5.0|
47+
| TencentCBS V1P1 |docker pull tkestack/csi-provisioner:v1.2.0 <br/>docker pull tkestack/csi-attacher:v1.1.0<br/>docker pull tkestack/csi-snapshotter:v1.2.2<br/>docker pull tkestack/csi-node-driver-registrar:v1.1.0<br/>docker pull tkestack/csi-tencentcloud-cbs:v1.2.0 <br />docker pull tkestack/csi-resizer:v0.5.0|
48+
49+
所有镜像均已上传 [公网 dockerhub](https://hub.docker.com/),使用时 `csi-operator`根据配置的 存储类型拉取所需的镜像
50+
3451
### 通过 CSIOperator 使用腾讯云存储资源
3552
1. 登录 TKEStack
3653

@@ -92,4 +109,3 @@ CSIOperator 用于支持集群方便的使用存储资源,当前支持的存
92109

93110
详情请见 [CSIOperator Example](https://github.com/tkestack/csi-operator/blob/master/examples)
94111

95-

pkg/platform/controller/addon/storage/csioperator/controller.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ import (
2525
"sync"
2626
"time"
2727

28-
"tkestack.io/tke/pkg/platform/provider/baremetal/phases/csioperator/images"
29-
3028
appsv1 "k8s.io/api/apps/v1"
3129
corev1 "k8s.io/api/core/v1"
3230
rbacv1 "k8s.io/api/rbac/v1"
@@ -40,14 +38,15 @@ import (
4038
"k8s.io/client-go/kubernetes"
4139
"k8s.io/client-go/tools/cache"
4240
"k8s.io/client-go/util/workqueue"
41+
4342
clientset "tkestack.io/tke/api/client/clientset/versioned"
4443
platformv1informer "tkestack.io/tke/api/client/informers/externalversions/platform/v1"
4544
platformv1lister "tkestack.io/tke/api/client/listers/platform/v1"
4645
v1 "tkestack.io/tke/api/platform/v1"
4746
controllerutil "tkestack.io/tke/pkg/controller"
4847
storageutil "tkestack.io/tke/pkg/platform/controller/addon/storage/util"
48+
"tkestack.io/tke/pkg/platform/provider/baremetal/phases/csioperator/images"
4949
"tkestack.io/tke/pkg/platform/util"
50-
containerregistryutil "tkestack.io/tke/pkg/util/containerregistry"
5150
"tkestack.io/tke/pkg/util/log"
5251
"tkestack.io/tke/pkg/util/metrics"
5352
)
@@ -64,6 +63,9 @@ const (
6463

6564
timeOut = 5 * time.Minute
6665
maxRetryCount = 5
66+
67+
// CSIRepo link to internet docker hub, where stores all csi depends images.
68+
CSIRepo = "tkestack"
6769
)
6870

6971
// Controller is responsible for performing actions dependent upon a CSIOperator phase.
@@ -614,7 +616,7 @@ func genContainerArgs(svInfo *storageutil.SVInfo) []string {
614616
args := []string{
615617
"--leader-election=true",
616618
"--kubelet-root-dir=/var/lib/kubelet",
617-
"--registry-domain=" + containerregistryutil.GetPrefix(),
619+
"--registry-domain=" + CSIRepo,
618620
"--logtostderr=true",
619621
"--v=5",
620622
}

0 commit comments

Comments
 (0)