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 #2840 from helen-frank/feature/AddKubeVersion 

introduce kube-image-tag flag to karmadactl init
This commit is contained in:
karmada-bot 2022-12-16 15:21:43 +08:00 committed by GitHub
parent 73a1b8236e 5eaf574d4b
commit 9b626c0f01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/karmadactl/cmdinit/cmdinit.go
View File

@ -98,6 +98,7 @@ func NewCmdInit(parentCommand string) *cobra.Command {
// kube image registry
flags.StringVarP(&opts.KubeImageMirrorCountry, "kube-image-mirror-country", "", "", "Country code of the kube image registry to be used. For Chinese mainland users, set it to cn")
flags.StringVarP(&opts.KubeImageRegistry, "kube-image-registry", "", "", "Kube image registry. For Chinese mainland users, you may use local gcr.io mirrors such as registry.cn-hangzhou.aliyuncs.com/google_containers to override default kube image registry")
flags.StringVar(&opts.KubeImageTag, "kube-image-tag", "v1.25.2", "Choose a specific Kubernetes version for the control plane.")
// cert
flags.StringVar(&opts.ExternalIP, "cert-external-ip", "", "the external IP of Karmada certificate (e.g 192.168.1.2,172.16.1.2)")
flags.StringVar(&opts.ExternalDNS, "cert-external-dns", "", "the external DNS of Karmada certificate (e.g localhost,localhost.com)")

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

@ -47,9 +47,7 @@ var (
karmadaRelease string
defaultEtcdImage = "etcd:3.5.3-0"
defaultKubeAPIServerImage = "kube-apiserver:v1.25.2"
defaultKubeControllerManagerImage = "kube-controller-manager:v1.25.2"
defaultEtcdImage = "etcd:3.5.3-0"
// DefaultCrdURL Karmada crds resource
DefaultCrdURL string
@ -92,6 +90,7 @@ type CommandInitOption struct {
ImageRegistry string
KubeImageRegistry string
KubeImageMirrorCountry string
KubeImageTag string
EtcdImage string
EtcdReplicas int32
EtcdInitImage string
@ -552,7 +551,8 @@ func (i *CommandInitOption) kubeAPIServerImage() string {
if i.KarmadaAPIServerImage != "" {
return i.KarmadaAPIServerImage
}
return i.kubeRegistry() + "/" + defaultKubeAPIServerImage
return i.kubeRegistry() + "/kube-apiserver:" + i.KubeImageTag
}
// get kube-controller-manager image
@ -560,7 +560,8 @@ func (i *CommandInitOption) kubeControllerManagerImage() string {
if i.KubeControllerManagerImage != "" {
return i.KubeControllerManagerImage
}
return i.kubeRegistry() + "/" + defaultKubeControllerManagerImage
return i.kubeRegistry() + "/kube-controller-manager:" + i.KubeImageTag
}
// get etcd-init image