Skip to content

Commit

Permalink
Version updates
Browse files Browse the repository at this point in the history
Signed-off-by: YASH PANDEY <[email protected]>
  • Loading branch information
yashpandey06 committed Jan 9, 2025
1 parent 56194cb commit 6cba9fe
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion hack/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
17 changes: 10 additions & 7 deletions operator/config/samples/karmada.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -31,35 +34,35 @@ 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
imageTag: v1.31.3
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:
Expand Down
4 changes: 2 additions & 2 deletions pkg/karmadactl/cmdinit/kubernetes/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/karmadactl/cmdinit/kubernetes/deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 6cba9fe

Please sign in to comment.