cli: use the older build of 1-18

chanwit · Jul 24, 2021 · b0928b3 · b0928b3
1 parent 3585294
commit b0928b3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/cmd/ekz/create_cluster_ekz.go b/cmd/ekz/create_cluster_ekz.go
@@ -28,16 +28,16 @@ func createClusterEKZ() error {
 	var ekzImageBuild string
 	switch eksdVersion {
 	case V1_18_Image:
-		ekzImageBuild = EKZ_V1_18_ImageBuild
+		ekzImageBuild = "." + EKZ_V1_18_ImageBuild
 	case V1_19_Image:
-		ekzImageBuild = EKZ_V1_19_ImageBuild
+		ekzImageBuild = "." + EKZ_V1_19_ImageBuild
 	case V1_20_Image:
-		ekzImageBuild = EKZ_V1_20_ImageBuild
+		ekzImageBuild = "." + EKZ_V1_20_ImageBuild
 	case V1_21_Image:
-		ekzImageBuild = EKZ_V1_21_ImageBuild
+		ekzImageBuild = "." + EKZ_V1_21_ImageBuild
 	}
 
-	imageName := fmt.Sprintf("quay.io/ekz-io/ekz:%s.%s", eksdVersion, ekzImageBuild)
+	imageName := fmt.Sprintf("quay.io/ekz-io/ekz:%s%s", eksdVersion, ekzImageBuild)
 	containerName := fmt.Sprintf("%s-controller-0", clusterName)
 
 	logger.Actionf("pulling image: %s ...", imageName)

diff --git a/cmd/ekz/create_cluster_kind.go b/cmd/ekz/create_cluster_kind.go
@@ -16,16 +16,16 @@ func createClusterKIND() error {
 	var buildNo string
 	switch eksdVersion {
 	case V1_18_Image:
-		buildNo = KIND_V1_18_ImageBuild
+		buildNo = "." + KIND_V1_18_ImageBuild
 	case V1_19_Image:
-		buildNo = KIND_V1_19_ImageBuild
+		buildNo = "." + KIND_V1_19_ImageBuild
 	case V1_20_Image:
-		buildNo = KIND_V1_20_ImageBuild
+		buildNo = "." + KIND_V1_20_ImageBuild
 	case V1_21_Image:
-		buildNo = KIND_V1_21_ImageBuild
+		buildNo = "." + KIND_V1_21_ImageBuild
 	}
 
-	image := fmt.Sprintf("quay.io/ekz-io/kind:%s.%s", eksdVersion, buildNo)
+	image := fmt.Sprintf("quay.io/ekz-io/kind:%s%s", eksdVersion, buildNo)
 
 	logger.Actionf("pulling image %s ...", image)
 	err := script.Exec("docker", "pull", image).Run()

diff --git a/cmd/ekz/image_versions.go b/cmd/ekz/image_versions.go
@@ -6,7 +6,7 @@ const (
 	V1_20_Image = "v1.20.7-eks-1-20-3"
 	V1_21_Image = "v1.21.2-eks-1-21-1"
 
-	EKZ_V1_18_ImageBuild = "1"
+	EKZ_V1_18_ImageBuild = "0"
 	EKZ_V1_19_ImageBuild = "1"
 	EKZ_V1_20_ImageBuild = "1"
 	EKZ_V1_21_ImageBuild = "0"

diff --git a/docs/cmd/ekz_create_cluster.md b/docs/cmd/ekz_create_cluster.md
@@ -52,7 +52,7 @@ ekz create cluster [flags]
 ### Options
 
 ```
-  -d, --eksd-version string   specify a distro version of EKS-D (default "v1.20.7-eks-1-20-3")
+  -d, --eksd-version string   specify a distro version of EKS-D (default "v1.21.2-eks-1-21-1")
   -h, --help                  help for cluster
       --host                  run in the host mode
       --map-to-host-volume    map /var/lib/k0s to the host directory