fix(platform): add csi-operator sidecar and controller images

Author: Cui Shuaijie

pkg/platform/provider/baremetal/phases/csioperator/images/images.go

@@ -26,11 +26,114 @@ import (
 	"tkestack.io/tke/pkg/util/containerregistry"
 )
 
+// CSIVersion indicates the version of CSI external components.
+type CSIVersion string
+
 const (
 	// LatestVersion is latest version of addon.
+	// TODO: bump up to v1.0.3
 	LatestVersion = "v1.0.2"
+
+	// CSIVersionV0 indicates the 0.3.0 version of CSI.
+	CSIVersionV0 = "v0.0"
+	// CSIVersionV1 indicates the 1.x version of CSI.
+	CSIVersionV1 = "v1.0"
+	// CSIVersionV1p1 indicates the 1.1+ version of CSI in tencent cloud cvm,
+	// which does not need to use secret id and key.
+	CSIVersionV1p1 = "v1.1"
+
+	// CSIDriverCephRBD indicates the CephRBD storage type.
+	CSIDriverCephRBD = "csi-rbd"
+	// CSIDriverCephFS indicates the CephFS storage type.
+	CSIDriverCephFS = "csi-cephfs"
+	// CSIDriverTencentCBS indicates the Tencent Cloud CBS storage type.
+	CSIDriverTencentCBS = "com.tencent.cloud.csi.cbs"
 )
 
+// csiVersion is the set of versions of all CSI components.
+type csiVersion struct {
+	Provisioner      string
+	Attacher         string
+	Resizer          string
+	Snapshotter      string
+	LivenessProbe    string
+	NodeRegistrar    string
+	ClusterRegistrar string
+	Driver           string
+}
+
+// csiVersionMap stores all images of CSI need. Refer from
+// <https://github.com/tkestack/csi-operator/blob/74188bd0f7462446109ee82f7488d8bd3646f525/pkg/controller/csi/enhancer/enhancer.go#L64>
+// Need to keep same with the csi-operator version.
+var csiVersionMap = map[string]map[CSIVersion]*csiVersion{
+	CSIDriverCephRBD: {
+		CSIVersionV0: {
+			Provisioner:   "csi-provisioner:v0.4.2",
+			Attacher:      "csi-attacher:v0.4.2",
+			Snapshotter:   "csi-snapshotter:v0.4.1",
+			LivenessProbe: "livenessprobe:v0.4.1",
+			NodeRegistrar: "driver-registrar:v0.3.0",
+			Driver:        "rbdplugin:v0.3.0",
+		},
+		CSIVersionV1: {
+			Provisioner:   "csi-provisioner:v1.0.1",
+			Attacher:      "csi-attacher:v1.1.0",
+			Snapshotter:   "csi-snapshotter:v1.1.0",
+			LivenessProbe: "livenessprobe:v1.1.0",
+			NodeRegistrar: "csi-node-driver-registrar:v1.1.0",
+			Driver:        "rbdplugin:v1.0.0",
+			// TODO: Add resizer.
+			// Resizer:          "v0.1.0",
+		},
+	},
+	CSIDriverCephFS: {
+		CSIVersionV0: {
+			Provisioner:   "csi-provisioner:v0.4.2",
+			Attacher:      "csi-attacher:v0.4.2",
+			LivenessProbe: "livenessprobe:v0.4.1",
+			NodeRegistrar: "driver-registrar:v0.3.0",
+			Driver:        "cephfsplugin:v0.3.0",
+		},
+		CSIVersionV1: {
+			Provisioner:   "csi-provisioner:v1.0.1",
+			Attacher:      "csi-attacher:v1.1.0",
+			LivenessProbe: "livenessprobe:v1.1.0",
+			NodeRegistrar: "csi-node-driver-registrar:v1.1.0",
+			Driver:        "cephfsplugin:v1.0.0",
+			// TODO: Add resizer.
+			// Resizer:          "v0.1.0",
+		},
+	},
+	CSIDriverTencentCBS: {
+		CSIVersionV0: {
+			Provisioner:   "csi-provisioner:v0.4.2",
+			Attacher:      "csi-attacher:v0.4.2",
+			NodeRegistrar: "driver-registrar:v0.3.0",
+			Driver:        "csi-tencentcloud-cbs:v0.2.1",
+		},
+		CSIVersionV1: {
+			Provisioner:   "csi-provisioner:v1.2.0",
+			Attacher:      "csi-attacher:v1.1.0",
+			Snapshotter:   "csi-snapshotter:v1.2.2",
+			NodeRegistrar: "csi-node-driver-registrar:v1.1.0",
+			// TODO:NOTE--TKE Stack now use a old version csi-operator image (ID sha256:b77952b83730),
+			// which only looks like v1.0.2. Version of driver in this image is v1.0.0.
+			// TODO: FIX--After csi-operator bump up to v1.0.3, use the right version v1.2.0
+			//Driver:        "csi-tencentcloud-cbs:v1.2.0",
+			Driver:  "csi-tencentcloud-cbs:v1.0.0",
+			Resizer: "csi-resizer:v0.5.0",
+		},
+		CSIVersionV1p1: {
+			Provisioner:   "csi-provisioner:v1.2.0",
+			Attacher:      "csi-attacher:v1.1.0",
+			Snapshotter:   "csi-snapshotter:v1.2.2",
+			NodeRegistrar: "csi-node-driver-registrar:v1.1.0",
+			Driver:        "csi-tencentcloud-cbs:v1.2.0",
+			Resizer:       "csi-resizer:v0.5.0",
+		},
+	},
+}
+
 type Components struct {
 	CSIOperator containerregistry.Image
 }
@@ -48,6 +151,7 @@ func (c Components) Get(name string) *containerregistry.Image {
 
 var versionMap = map[string]Components{
 	LatestVersion: {
+		// TODO: bump up to v1.0.3
 		CSIOperator: containerregistry.Image{Name: "csi-operator", Tag: "v1.0.2"},
 	},
 }
@@ -63,9 +167,38 @@ func List() []string {
 		}
 	}
 
+	for _, storages := range csiVersionMap {
+		for _, csiV := range storages {
+			items = append(items, getImages(csiV)...)
+		}
+	}
+
 	return items
 }
 
+// getImages return images needed by the csi
+func getImages(csi *csiVersion) []string {
+	images := []string{
+		csi.Attacher,
+		csi.Provisioner,
+		csi.Snapshotter,
+		csi.Resizer,
+		csi.LivenessProbe,
+		csi.NodeRegistrar,
+		csi.ClusterRegistrar,
+		csi.Driver,
+	}
+
+	imagesNeed := make([]string, 0)
+	for _, image := range images {
+		if image != "" {
+			imagesNeed = append(imagesNeed, image)
+		}
+	}
+
+	return imagesNeed
+}
+
 func Versions() []string {
 	keys := make([]string, 0, len(versionMap))
 	for key := range versionMap {