From 6cba9fe74bd730e8c756dfb13379417b6f8421a0 Mon Sep 17 00:00:00 2001 From: YASH PANDEY Date: Thu, 9 Jan 2025 14:57:09 +0530 Subject: [PATCH] Version updates Signed-off-by: YASH PANDEY --- hack/util.sh | 2 +- operator/config/samples/karmada.yaml | 17 ++++++++++------- pkg/karmadactl/cmdinit/kubernetes/deploy.go | 4 ++-- .../cmdinit/kubernetes/deploy_test.go | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/hack/util.sh b/hack/util.sh index fb2f996ceee0..a2d84af25940 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -769,7 +769,7 @@ function util::set_mirror_registry_for_china_mainland() { ) for dockerfile in "${dockerfile_list[@]}"; do grep 'mirrors.ustc.edu.cn' ${repo_root}/${dockerfile} > /dev/null || sed -i'' -e "/FROM alpine:/a\\ -RUN echo -e http://mirrors.ustc.edu.cn/alpine/v3.17/main/ > /etc/apk/repositories" ${repo_root}/${dockerfile} +RUN echo -e http://mirrors.ustc.edu.cn/alpine/v3.21/main/ > /etc/apk/repositories" ${repo_root}/${dockerfile} done } diff --git a/operator/config/samples/karmada.yaml b/operator/config/samples/karmada.yaml index b4bce18b73c4..b84930db963b 100644 --- a/operator/config/samples/karmada.yaml +++ b/operator/config/samples/karmada.yaml @@ -4,6 +4,9 @@ metadata: name: karmada-demo namespace: test spec: + crdTarball: + httpSource: + url: "https://github.com/karmada-io/karmada/releases/download/v1.12.2/crds.tar.gz" components: etcd: local: @@ -31,19 +34,19 @@ spec: serviceSubnet: 10.96.0.0/12 karmadaAggregatedAPIServer: imageRepository: docker.io/karmada/karmada-aggregated-apiserver - imageTag: v1.11.1 + imageTag: v1.12.2 replicas: 1 karmadaControllerManager: imageRepository: docker.io/karmada/karmada-controller-manager - imageTag: v1.11.1 + imageTag: v1.12.2 replicas: 1 karmadaScheduler: imageRepository: docker.io/karmada/karmada-scheduler - imageTag: v1.11.1 + imageTag: v1.12.2 replicas: 1 karmadaWebhook: imageRepository: docker.io/karmada/karmada-webhook - imageTag: v1.11.1 + imageTag: v1.12.2 replicas: 1 kubeControllerManager: imageRepository: registry.k8s.io/kube-controller-manager @@ -51,15 +54,15 @@ spec: replicas: 1 karmadaMetricsAdapter: imageRepository: docker.io/karmada/karmada-metrics-adapter - imageTag: v1.11.1 + imageTag: v1.12.2 replicas: 2 # karmadaSearch: # the component `Karmadasearch` is not installed by default, if you need to install it, uncomment it and note the formatting # imageRepository: docker.io/karmada/karmada-search - # imageTag: v1.11.1 + # imageTag: v1.12.2 # replicas: 1 # karmadaDescheduler: # the component `KarmadaDescheduler` is not installed by default, if you need to install it, uncomment it and note the formatting # imageRepository: docker.io/karmada/karmada-descheduler - # imageTag: v1.11.1 + # imageTag: v1.12.2 # replicas: 1 hostCluster: networking: diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy.go b/pkg/karmadactl/cmdinit/kubernetes/deploy.go index 75cd73adbc60..7e83b6dba831 100644 --- a/pkg/karmadactl/cmdinit/kubernetes/deploy.go +++ b/pkg/karmadactl/cmdinit/kubernetes/deploy.go @@ -117,7 +117,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.19.1" + DefaultInitImage = "docker.io/alpine:3.21.0" 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()) @@ -683,7 +683,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.19.1" + return i.ImageRegistry + "/alpine:3.21.0" } return i.EtcdInitImage } diff --git a/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go b/pkg/karmadactl/cmdinit/kubernetes/deploy_test.go index dba8ccb1584c..91bd3389ffc3 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.19.1", + expected: "my-registry/alpine:3.21.0", }, { name: "EtcdInitImage is set to a non-default value",