Merge remote-tracking branch 'origin/master' into release-3.1

kubesphere · Aug 8, 2024 · 09effbe · 09effbe
2 parents b3bb853 + b4c30e8
commit 09effbe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/cmd/kk/pkg/images/tasks.go b/cmd/kk/pkg/images/tasks.go
@@ -156,7 +156,7 @@ func GetImage(runtime connector.ModuleRuntime, kubeConf *common.KubeConf, name s
 type SaveImages struct {
 	common.ArtifactAction
 	ImageStartIndex int
-	ImageTransport string
+	ImageTransport  string
 }
 
 func (s *SaveImages) Execute(runtime connector.Runtime) error {
@@ -314,7 +314,12 @@ func (c *CopyImagesToRegistry) Execute(runtime connector.Runtime) error {
 		}
 
 		srcName := fmt.Sprintf("oci:%s:%s", imagesPath, ref)
-		destName := formatImageName(c.ImageTransport, uniqueImage)
+		destName := formatImageName(c.ImageTransport, image.ImageName())
+
+		if c.ImageTransport == common.DockerDaemon {
+			destName = formatImageName(c.ImageTransport, uniqueImage)
+		}
+
 		logger.Log.Infof("Source: %s", srcName)
 		logger.Log.Infof("Destination: %s", destName)
 

diff --git a/cmd/kk/pkg/version/kubernetes/version_enum.go b/cmd/kk/pkg/version/kubernetes/version_enum.go
@@ -39,6 +39,7 @@ const (
 	V127
 	V128
 	V129
+	V130
 )
 
 var VersionList = []Version{
@@ -53,6 +54,7 @@ var VersionList = []Version{
 	V127,
 	V128,
 	V129,
+	V130,
 }
 
 func (v Version) String() string {
@@ -79,6 +81,8 @@ func (v Version) String() string {
 		return "v1.28"
 	case V129:
 		return "v1.29"
+	case V130:
+		return "v1.30"
 	default:
 		return "invalid option"
 	}