karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6027 from yashpandey06/version-updates 

Version Updates in files
This commit is contained in:
karmada-bot 2025-01-10 09:56:40 +08:00 committed by GitHub
parent 9f8da2c8a8 6cba9fe74b
commit be674c7382
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/util.sh
View File

@ -769,7 +769,7 @@ function util::set_mirror_registry_for_china_mainland() {
) )
for dockerfile in "${dockerfile_list[@]}"; do for dockerfile in "${dockerfile_list[@]}"; do
grep 'mirrors.ustc.edu.cn' ${repo_root}/${dockerfile} > /dev/null || sed -i'' -e "/FROM alpine:/a\\ 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 done
} }

17
operator/config/samples/karmada.yaml
View File

@ -4,6 +4,9 @@ metadata:
name: karmada-demo name: karmada-demo
namespace: test namespace: test
spec: spec:
crdTarball:
httpSource:
url: "https://github.com/karmada-io/karmada/releases/download/v1.12.2/crds.tar.gz"
components: components:
etcd: etcd:
local: local:
@ -31,19 +34,19 @@ spec:
serviceSubnet: 10.96.0.0/12 serviceSubnet: 10.96.0.0/12
karmadaAggregatedAPIServer: karmadaAggregatedAPIServer:
imageRepository: docker.io/karmada/karmada-aggregated-apiserver imageRepository: docker.io/karmada/karmada-aggregated-apiserver
imageTag: v1.11.1 imageTag: v1.12.2
replicas: 1 replicas: 1
karmadaControllerManager: karmadaControllerManager:
imageRepository: docker.io/karmada/karmada-controller-manager imageRepository: docker.io/karmada/karmada-controller-manager
imageTag: v1.11.1 imageTag: v1.12.2
replicas: 1 replicas: 1
karmadaScheduler: karmadaScheduler:
imageRepository: docker.io/karmada/karmada-scheduler imageRepository: docker.io/karmada/karmada-scheduler
imageTag: v1.11.1 imageTag: v1.12.2
replicas: 1 replicas: 1
karmadaWebhook: karmadaWebhook:
imageRepository: docker.io/karmada/karmada-webhook imageRepository: docker.io/karmada/karmada-webhook
imageTag: v1.11.1 imageTag: v1.12.2
replicas: 1 replicas: 1
kubeControllerManager: kubeControllerManager:
imageRepository: registry.k8s.io/kube-controller-manager imageRepository: registry.k8s.io/kube-controller-manager
@ -51,15 +54,15 @@ spec:
replicas: 1 replicas: 1
karmadaMetricsAdapter: karmadaMetricsAdapter:
imageRepository: docker.io/karmada/karmada-metrics-adapter imageRepository: docker.io/karmada/karmada-metrics-adapter
imageTag: v1.11.1 imageTag: v1.12.2
replicas: 2 replicas: 2
# karmadaSearch: # the component `Karmadasearch` is not installed by default, if you need to install it, uncomment it and note the formatting # 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 # imageRepository: docker.io/karmada/karmada-search
# imageTag: v1.11.1 # imageTag: v1.12.2
# replicas: 1 # replicas: 1
# karmadaDescheduler: # the component `KarmadaDescheduler` is not installed by default, if you need to install it, uncomment it and note the formatting # 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 # imageRepository: docker.io/karmada/karmada-descheduler
# imageTag: v1.11.1 # imageTag: v1.12.2
# replicas: 1 # replicas: 1
hostCluster: hostCluster:
networking: networking:

4
pkg/karmadactl/cmdinit/kubernetes/deploy.go
View File

@ -117,7 +117,7 @@ func init() {
karmadaRelease = releaseVer.ReleaseVersion() karmadaRelease = releaseVer.ReleaseVersion()
DefaultCrdURL = fmt.Sprintf("https://github.com/karmada-io/karmada/releases/download/%s/crds.tar.gz", 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()) DefaultKarmadaSchedulerImage = fmt.Sprintf("docker.io/karmada/karmada-scheduler:%s", releaseVer.ReleaseVersion())
DefaultKarmadaControllerManagerImage = fmt.Sprintf("docker.io/karmada/karmada-controller-manager:%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()) DefaultKarmadaWebhookImage = fmt.Sprintf("docker.io/karmada/karmada-webhook:%s", releaseVer.ReleaseVersion())
@ -683,7 +683,7 @@ func (i *CommandInitOption) kubeControllerManagerImage() string {
// get etcd-init image // get etcd-init image
func (i *CommandInitOption) etcdInitImage() string { func (i *CommandInitOption) etcdInitImage() string {
if i.ImageRegistry != "" && i.EtcdInitImage == DefaultInitImage { if i.ImageRegistry != "" && i.EtcdInitImage == DefaultInitImage {
return i.ImageRegistry + "/alpine:3.19.1" return i.ImageRegistry + "/alpine:3.21.0"
} }
return i.EtcdInitImage return i.EtcdInitImage
} }

2
pkg/karmadactl/cmdinit/kubernetes/deploy_test.go
View File

@ -401,7 +401,7 @@ func TestEtcdInitImage(t *testing.T) {
ImageRegistry: "my-registry", ImageRegistry: "my-registry",
EtcdInitImage: DefaultInitImage, 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", name: "EtcdInitImage is set to a non-default value",