From 1964f6dc7830ccd26d69d9940c51227436d97ca2 Mon Sep 17 00:00:00 2001 From: zhzhuang-zju Date: Tue, 1 Apr 2025 10:01:57 +0800 Subject: [PATCH 1/3] correct the charts readme Signed-off-by: zhzhuang-zju --- charts/karmada/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/karmada/README.md b/charts/karmada/README.md index 21ddb6091..1fe78d1ed 100644 --- a/charts/karmada/README.md +++ b/charts/karmada/README.md @@ -108,9 +108,9 @@ The command removes all the Kubernetes components associated with the chart and > **Note**: There are some RBAC resources that are used by the `preJob` that can not be deleted by the `uninstall` command above. You might have to clean them manually with tools like `kubectl`. You can clean them by commands: ```console -kubectl delete sa/karmada-pre-job -nkarmada-system -kubectl delete clusterRole/karmada-pre-job -kubectl delete clusterRoleBinding/karmada-pre-job +kubectl delete sa/karmada-hook-job -nkarmada-system +kubectl delete clusterRole/karmada-hook-job +kubectl delete clusterRoleBinding/karmada-hook-job kubectl delete ns karmada-system ``` From f43597eaa0d1aabd787dbe7e39dd55ea5bfb4443 Mon Sep 17 00:00:00 2001 From: zhzhuang-zju Date: Tue, 1 Apr 2025 10:04:22 +0800 Subject: [PATCH 2/3] operator: update the crdtarball url in sample file Signed-off-by: zhzhuang-zju --- operator/config/samples/karmada.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml index 466eb588a..f8ee59fc3 100644 --- a/operator/config/samples/karmada.yaml +++ b/operator/config/samples/karmada.yaml @@ -6,7 +6,7 @@ metadata: spec: crdTarball: httpSource: - url: "https://github.com/karmada-io/karmada/releases/download/v1.12.2/crds.tar.gz" + url: "https://github.com/karmada-io/karmada/releases/download/v1.13.0/crds.tar.gz" components: etcd: local: From d9318779fd4821689b412ef33fb469f907541d8b Mon Sep 17 00:00:00 2001 From: zhzhuang-zju Date: Tue, 1 Apr 2025 10:07:11 +0800 Subject: [PATCH 3/3] update alpine version used by karmadactl init to 3.21.3 Signed-off-by: zhzhuang-zju --- pkg/karmadactl/cmdinit/kubernetes/deploy.go | 4 ++-- pkg/karmadactl/cmdinit/kubernetes/deploy_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy.go b/pkg/karmadactl/cmdinit/kubernetes/deploy.go index b81a67a6a..8fd1d7910 100644 --- a/pkg/karmadactl/cmdinit/kubernetes/deploy.go +++ b/pkg/karmadactl/cmdinit/kubernetes/deploy.go @@ -129,7 +129,7 @@ func init() { karmadaRelease = releaseVer.ReleaseVersion() DefaultCrdURL = fmt.Sprintf("https://github.com/karmada-io/karmada/releases/download/%s/crds.tar.gz", releaseVer.ReleaseVersion()) - DefaultInitImage = "docker.io/alpine:3.21.0" + DefaultInitImage = "docker.io/alpine:3.21.3" DefaultKarmadaSchedulerImage = fmt.Sprintf("docker.io/karmada/karmada-scheduler:%s", releaseVer.ReleaseVersion()) DefaultKarmadaControllerManagerImage = fmt.Sprintf("docker.io/karmada/karmada-controller-manager:%s", releaseVer.ReleaseVersion()) DefaultKarmadaWebhookImage = fmt.Sprintf("docker.io/karmada/karmada-webhook:%s", releaseVer.ReleaseVersion()) @@ -722,7 +722,7 @@ func (i *CommandInitOption) kubeControllerManagerImage() string { // get etcd-init image func (i *CommandInitOption) etcdInitImage() string { if i.ImageRegistry != "" && i.EtcdInitImage == DefaultInitImage { - return i.ImageRegistry + "/alpine:3.21.0" + return i.ImageRegistry + "/alpine:3.21.3" } return i.EtcdInitImage } diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go b/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go index 91bd3389f..03bfdd5fa 100644 --- a/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go +++ b/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go @@ -401,7 +401,7 @@ func TestEtcdInitImage(t *testing.T) { ImageRegistry: "my-registry", EtcdInitImage: DefaultInitImage, }, - expected: "my-registry/alpine:3.21.0", + expected: "my-registry/alpine:3.21.3", }, { name: "EtcdInitImage is set to a non-default value",