From fc2ce05658a3861628cbc48a615b1896cb86a053 Mon Sep 17 00:00:00 2001 From: pixiake Date: Thu, 8 Aug 2024 10:50:57 +0800 Subject: [PATCH 1/2] fix: does not upgrade Kubernetes to v1.30 (#2350) Signed-off-by: pixiake --- cmd/kk/pkg/version/kubernetes/version_enum.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/kk/pkg/version/kubernetes/version_enum.go b/cmd/kk/pkg/version/kubernetes/version_enum.go index c3194e797..4a0be4535 100644 --- 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" } From b4c30e8cdfb5df85d11e8108816c60c0f43ac7d9 Mon Sep 17 00:00:00 2001 From: pixiake Date: Thu, 8 Aug 2024 16:47:58 +0800 Subject: [PATCH 2/2] fix: does not push image to registry (#2352) Signed-off-by: pixiake --- cmd/kk/pkg/images/tasks.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/kk/pkg/images/tasks.go b/cmd/kk/pkg/images/tasks.go index a9c088efb..d341a3847 100644 --- 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)