`karmadactl`: Fixed `init` commands can not select default release version issue. #1456

prodanlabs · 2022-03-08T16:00:15Z

Signed-off-by: prodan pengshihaoren@gmail.com

What type of PR is this?
/kind bug

What this PR does / why we need it:
The images and crd versions of karmadactl init are consistent with the karmadactl version
Which issue(s) this PR fixes:
Fixes #1340

Special notes for your reviewer:

kubectl-karmada version is v0.10.1-547-g0190fda9-dirty

$ ./kubectl-karmada version
kubectl karmada version: version.Info{GitVersion:"v0.10.1-547-g0190fda9-dirty", GitCommit:"0190fda99632c04888ec52fc828985f601bd61a0", GitTreeState:"dirty", BuildDate:"2022-03-08T15:38:46Z", GoVersion:"go1.17.6", Compiler:"gc", Platform:"linux/amd64"}

crd and images version by default

Flags:
      --cert-external-dns string                         the external DNS of Karmada certificate (e.g localhost,localhost.com)
      --cert-external-ip string                          the external IP of Karmada certificate (e.g 192.168.1.2,172.16.1.2)
      --crds string                                      Karmada crds resource.(local file e.g. --crds /root/crds.tar.gz) (default "https://github.com/karmada-io/karmada/releases/download/v0.10.0/crds.tar.gz")
      --etcd-data string                                 etcd data path,valid in hostPath mode. (default "/var/lib/karmada-etcd")
      --etcd-image string                                etcd image (default "k8s.gcr.io/etcd:3.5.1-0")
      --etcd-init-image string                           etcd init container image (default "docker.io/alpine:3.14.3")
      --etcd-node-selector-labels string                 etcd pod select the labels of the node. valid in hostPath mode ( e.g. --etcd-node-selector-labels karmada.io/etcd=true)
      --etcd-pvc-size string                             etcd data path,valid in pvc mode. (default "5Gi")
      --etcd-replicas int32                              etcd replica set, cluster 3,5...singular (default 1)
      --etcd-storage-mode string                         etcd data storage mode(emptyDir,hostPath,PVC). value is PVC, specify --storage-classes-name (default "emptyDir")
  -h, --help                                             help for init
      --karmada-aggregated-apiserver-image string        karmada aggregated apiserver image (default "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-aggregated-apiserver:v0.10.1")
      --karmada-aggregated-apiserver-replicas int32      karmada aggregated apiserver replica set (default 1)
      --karmada-apiserver-image string                   Kubernetes apiserver image (default "k8s.gcr.io/kube-apiserver:v1.21.7")
      --karmada-apiserver-replicas int32                 karmada apiserver replica set (default 1)
      --karmada-controller-manager-image string          karmada controller manager  image (default "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-controller-manager:v0.10.1")
      --karmada-controller-manager-replicas int32        karmada controller manager replica set (default 1)
  -d, --karmada-data string                              karmada data path. kubeconfig cert and crds files (default "/etc/karmada")
      --karmada-kube-controller-manager-image string     Kubernetes controller manager image (default "k8s.gcr.io/kube-controller-manager:v1.21.7")
      --karmada-kube-controller-manager-replicas int32   karmada kube controller manager replica set (default 1)
      --karmada-scheduler-image string                   karmada scheduler image (default "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-scheduler:latest:v0.10.1")
      --karmada-scheduler-replicas int32                 karmada scheduler replica set (default 1)
      --karmada-webhook-image string                     karmada webhook image (default "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-webhook:v0.10.1")
      --karmada-webhook-replicas int32                   karmada webhook replica set (default 1)
  -n, --namespace string                                 Kubernetes namespace (default "karmada-system")
  -p, --port int32                                       Karmada apiserver service node port (default 32443)
      --storage-classes-name string                      Kubernetes StorageClasses Name

Does this PR introduce a user-facing change?:

`karmadactl`: Fixed `init` commands can not select default release version issue.

/cc @RainbowMango
@zach593

karmada-bot · 2022-03-08T16:00:19Z

@prodanlabs: GitHub didn't allow me to request PR reviews from the following users: zach593.

Note that only karmada-io members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

Signed-off-by: prodan pengshihaoren@gmail.com

What type of PR is this?
/kind bug

What this PR does / why we need it:
The images and crd versions of karmadactl init are consistent with the karmadactl version
Which issue(s) this PR fixes:
Fixes #1430

Special notes for your reviewer:

kubectl-karmada version is v0.10.1-547-g0190fda9-dirty

$ ./kubectl-karmada version
kubectl karmada version: version.Info{GitVersion:"v0.10.1-547-g0190fda9-dirty", GitCommit:"0190fda99632c04888ec52fc828985f601bd61a0", GitTreeState:"dirty", BuildDate:"2022-03-08T15:38:46Z", GoVersion:"go1.17.6", Compiler:"gc", Platform:"linux/amd64"}

crd and images version by default

Flags:
     --cert-external-dns string                         the external DNS of Karmada certificate (e.g localhost,localhost.com)
     --cert-external-ip string                          the external IP of Karmada certificate (e.g 192.168.1.2,172.16.1.2)
     --crds string                                      Karmada crds resource.(local file e.g. --crds /root/crds.tar.gz) (default "https://github.com/karmada-io/karmada/releases/download/v0.10.0/crds.tar.gz")
     --etcd-data string                                 etcd data path,valid in hostPath mode. (default "/var/lib/karmada-etcd")
     --etcd-image string                                etcd image (default "k8s.gcr.io/etcd:3.5.1-0")
     --etcd-init-image string                           etcd init container image (default "docker.io/alpine:3.14.3")
     --etcd-node-selector-labels string                 etcd pod select the labels of the node. valid in hostPath mode ( e.g. --etcd-node-selector-labels karmada.io/etcd=true)
     --etcd-pvc-size string                             etcd data path,valid in pvc mode. (default "5Gi")
     --etcd-replicas int32                              etcd replica set, cluster 3,5...singular (default 1)
     --etcd-storage-mode string                         etcd data storage mode(emptyDir,hostPath,PVC). value is PVC, specify --storage-classes-name (default "emptyDir")
 -h, --help                                             help for init
     --karmada-aggregated-apiserver-image string        karmada aggregated apiserver image (default "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-aggregated-apiserver:v0.10.1")
     --karmada-aggregated-apiserver-replicas int32      karmada aggregated apiserver replica set (default 1)
     --karmada-apiserver-image string                   Kubernetes apiserver image (default "k8s.gcr.io/kube-apiserver:v1.21.7")
     --karmada-apiserver-replicas int32                 karmada apiserver replica set (default 1)
     --karmada-controller-manager-image string          karmada controller manager  image (default "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-controller-manager:v0.10.1")
     --karmada-controller-manager-replicas int32        karmada controller manager replica set (default 1)
 -d, --karmada-data string                              karmada data path. kubeconfig cert and crds files (default "/etc/karmada")
     --karmada-kube-controller-manager-image string     Kubernetes controller manager image (default "k8s.gcr.io/kube-controller-manager:v1.21.7")
     --karmada-kube-controller-manager-replicas int32   karmada kube controller manager replica set (default 1)
     --karmada-scheduler-image string                   karmada scheduler image (default "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-scheduler:latest:v0.10.1")
     --karmada-scheduler-replicas int32                 karmada scheduler replica set (default 1)
     --karmada-webhook-image string                     karmada webhook image (default "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-webhook:v0.10.1")
     --karmada-webhook-replicas int32                   karmada webhook replica set (default 1)
 -n, --namespace string                                 Kubernetes namespace (default "karmada-system")
 -p, --port int32                                       Karmada apiserver service node port (default 32443)
     --storage-classes-name string                      Kubernetes StorageClasses Name

Does this PR introduce a user-facing change?:


The images and crd versions of `karmadactl init` are the same as the karmadactl version by default

/cc @RainbowMango @zach593

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

RainbowMango · 2022-03-08T18:16:53Z

So quick!!! Thanks @prodanlabs

I'll look at it tomorrow. Looks good after a quick look.

RainbowMango · 2022-03-08T18:19:13Z

pkg/karmadactl/cmdinit/utils/util.go

+func GetInitVersion(version string) InitVersion {
+	// CRD version e.g. v0.10.1-547-g0190fda9-dirty -> v0.10.0
+	n := strings.LastIndex(version, ".") + 1
+
+	return InitVersion{
+		ImageVersion: initImageVersion(version),
+		CRDVersion:   fmt.Sprintf("%s%s", string([]byte(version)[:n]), "0"),
+	}
+}


I guess there will be some tools/packages to handle the git version thing. I'll try to investigate it.

zach593 · 2022-03-10T04:10:14Z

pkg/karmadactl/cmdinit/cmdinit.go

 	flags.StringVar(&opts.CRDs, "crds", crdURL, "Karmada crds resource.(local file e.g. --crds /root/crds.tar.gz)")
 	flags.Int32VarP(&opts.KarmadaAPIServerNodePort, "port", "p", 32443, "Karmada apiserver service node port")
 	flags.StringVarP(&opts.KarmadaDataPath, "karmada-data", "d", "/etc/karmada", "karmada data path. kubeconfig cert and crds files")
 	flags.StringVarP(&opts.KarmadaAPIServerImage, "karmada-apiserver-image", "", "k8s.gcr.io/kube-apiserver:v1.21.7", "Kubernetes apiserver image")
 	flags.Int32VarP(&opts.KarmadaAPIServerReplicas, "karmada-apiserver-replicas", "", 1, "karmada apiserver replica set")
-	flags.StringVarP(&opts.KarmadaSchedulerImage, "karmada-scheduler-image", "", "swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-scheduler:latest", "karmada scheduler image")
+	flags.StringVarP(&opts.KarmadaSchedulerImage, "karmada-scheduler-image", "", fmt.Sprintf("swr.ap-southeast-1.myhuaweicloud.com/karmada/karmada-scheduler:latest:%s", v.ImageVersion), "karmada scheduler image")


:latest:%s

oh my fault.

zach593 · 2022-03-10T04:23:10Z

pkg/karmadactl/cmdinit/utils/util_test.go

@@ -24,3 +25,11 @@ func TestDownloadFile(t *testing.T) {
 		panic(err)
 	}
 }
+
+// TestGetInitVersion test GetInitVersion
+func TestGetInitVersion(t *testing.T) {


make it failable, so it could be useful in CI

make it failable, so it could be useful in CI

The version number is passed in when compiling, I feel like I can't do anything in go test.
https://github.com/karmada-io/karmada/blob/master/Makefile#L15

GetInitVersion() get "GitVersion" from param, at least we could still check that the shift logic is correct or not

Signed-off-by: prodan <pengshihaoren@gmail.com>

zach593 · 2022-03-10T05:52:22Z

The images and crd versions of karmadactl init are the same as the karmadactl version by default

and builds by makefile from master branch will refer to latest release version (with best effort)

Signed-off-by: RainbowMango <qdurenhongcai@gmail.com>

RainbowMango · 2022-03-14T07:28:33Z

Hi @prodanlabs I appended a commit on yours, cloud you please help to confirm?

prodanlabs · 2022-03-15T03:02:51Z

Cool！

RainbowMango · 2022-03-15T03:09:56Z

/retitle karmadactl: Fixed init commands can not select default release version issue.

XiShanYongYe-Chang

/lgtm

RainbowMango

/approve

karmada-bot · 2022-03-16T08:16:04Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: RainbowMango

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [RainbowMango]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

…k-of-#1456-#1495-upstream-release-1.1 Automated cherry pick of #1456: fix init image and crd default version #1495: Fix failling test due to outdate vendor

…k-of-#1456-#1495-upstream-release-1.0 Automated cherry pick of #1456: fix init image and crd default version #1495: Fix failling test due to outdate vendor

karmada-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Mar 8, 2022

karmada-bot requested a review from RainbowMango March 8, 2022 16:00

karmada-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 8, 2022

prodanlabs force-pushed the karmadactl-init-fix branch 3 times, most recently from 2894640 to 3eed758 Compare March 8, 2022 16:46

RainbowMango reviewed Mar 8, 2022

View reviewed changes

zach593 reviewed Mar 10, 2022

View reviewed changes

fix init image and crd default version

66c5f27

Signed-off-by: prodan <pengshihaoren@gmail.com>

prodanlabs force-pushed the karmadactl-init-fix branch from 3eed758 to 66c5f27 Compare March 10, 2022 04:30

RainbowMango mentioned this pull request Mar 14, 2022

fix default image tags for <karmadactl/kubectl-karmada> init #1358

Closed

Add another idea about release version

9279870

Signed-off-by: RainbowMango <qdurenhongcai@gmail.com>

karmada-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 14, 2022

karmada-bot changed the title ~~fix init image and crd default version~~ karmadactl: Fixed init commands can not select default release version issue. Mar 15, 2022

XiShanYongYe-Chang reviewed Mar 16, 2022

View reviewed changes

karmada-bot assigned XiShanYongYe-Chang Mar 16, 2022

karmada-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 16, 2022

RainbowMango approved these changes Mar 16, 2022

View reviewed changes

karmada-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 16, 2022

karmada-bot merged commit df93b7d into karmada-io:master Mar 16, 2022

RainbowMango mentioned this pull request Mar 16, 2022

Fix failling test due to outdated vendor #1495

Merged

This was referenced Mar 16, 2022

Automated cherry pick of #1456: fix init image and crd default version #1495: Fix failling test due to outdate vendor #1496

Merged

Automated cherry pick of #1456: fix init image and crd default version #1495: Fix failling test due to outdate vendor #1497

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`karmadactl`: Fixed `init` commands can not select default release version issue. #1456

`karmadactl`: Fixed `init` commands can not select default release version issue. #1456

prodanlabs commented Mar 8, 2022 •

edited by RainbowMango

Loading

karmada-bot commented Mar 8, 2022

RainbowMango commented Mar 8, 2022

RainbowMango Mar 8, 2022

zach593 Mar 10, 2022

prodanlabs Mar 10, 2022

zach593 Mar 10, 2022

prodanlabs Mar 10, 2022 •

edited

Loading

zach593 Mar 10, 2022

zach593 commented Mar 10, 2022

RainbowMango commented Mar 14, 2022

prodanlabs commented Mar 15, 2022

RainbowMango commented Mar 15, 2022

XiShanYongYe-Chang left a comment

RainbowMango left a comment

karmada-bot commented Mar 16, 2022

karmadactl: Fixed init commands can not select default release version issue. #1456

karmadactl: Fixed init commands can not select default release version issue. #1456

Conversation

prodanlabs commented Mar 8, 2022 • edited by RainbowMango Loading

karmada-bot commented Mar 8, 2022

RainbowMango commented Mar 8, 2022

RainbowMango Mar 8, 2022

Choose a reason for hiding this comment

zach593 Mar 10, 2022

Choose a reason for hiding this comment

prodanlabs Mar 10, 2022

Choose a reason for hiding this comment

zach593 Mar 10, 2022

Choose a reason for hiding this comment

prodanlabs Mar 10, 2022 • edited Loading

Choose a reason for hiding this comment

zach593 Mar 10, 2022

Choose a reason for hiding this comment

zach593 commented Mar 10, 2022

RainbowMango commented Mar 14, 2022

prodanlabs commented Mar 15, 2022

RainbowMango commented Mar 15, 2022

XiShanYongYe-Chang left a comment

Choose a reason for hiding this comment

RainbowMango left a comment

Choose a reason for hiding this comment

karmada-bot commented Mar 16, 2022

`karmadactl`: Fixed `init` commands can not select default release version issue. #1456

`karmadactl`: Fixed `init` commands can not select default release version issue. #1456

prodanlabs commented Mar 8, 2022 •

edited by RainbowMango

Loading

prodanlabs Mar 10, 2022 •

edited

Loading