disable namespaceOverride on images push (#2438)

Signed-off-by: pixiake <guofeng@yunify.com>
kubesphere · Oct 30, 2024 · 0067d39 · 0067d39
1 parent 5b3e363
commit 0067d39
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/kubernetes-auto-support.yaml b/.github/workflows/kubernetes-auto-support.yaml
@@ -2,6 +2,7 @@
 name: Kubernetes-Auto-Support
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'
 

diff --git a/cmd/kk/pkg/images/tasks.go b/cmd/kk/pkg/images/tasks.go
@@ -278,7 +278,7 @@ func (c *CopyImagesToRegistry) Execute(runtime connector.Runtime) error {
 		image := Image{
 			RepoAddr:          repoAddr,
 			Namespace:         namespace,
-			NamespaceOverride: c.KubeConf.Cluster.Registry.NamespaceOverride,
+			NamespaceOverride: "",
 			Repo:              imageName,
 			Tag:               imageTag,
 		}

diff --git a/hack/sync-components.sh b/hack/sync-components.sh
@@ -100,8 +100,8 @@ if [ $KUBERNETES_VERSION ]; then
    done
 
    chmod +x binaries/kube/$KUBERNETES_VERSION/amd64/kubeadm
-   binaries/kube/$KUBERNETES_VERSION/amd64/kubeadm config images list --kubernetes-version $KUBERNETES_VERSION | xargs -I {} oras cp {} docker.io/$DOCKERHUB_NAMESPACE/${image##}
-   binaries/kube/$KUBERNETES_VERSION/amd64/kubeadm config images list --kubernetes-version $KUBERNETES_VERSION | xargs -I {} oras cp {} registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/${image##}
+   binaries/kube/$KUBERNETES_VERSION/amd64/kubeadm config images list --kubernetes-version $KUBERNETES_VERSION | xargs -I {} oras cp {} docker.io/$DOCKERHUB_NAMESPACE/$(basename "{}")
+   binaries/kube/$KUBERNETES_VERSION/amd64/kubeadm config images list --kubernetes-version $KUBERNETES_VERSION | xargs -I {} oras cp {} registry.cn-beijing.aliyuncs.com/$ALIYUNCS_NAMESPACE/$(basename "{}")
 
    rm -rf binaries
 fi