part of the e2e test of the kubeclipper #161

Metrora · 2022-08-26T09:06:34Z

Signed-off-by: Liucw liu.chuwei@99cloud.net

What type of PR is this?

/area testing

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #75

Special notes for reviewers:

Does this PR introduced a user-facing change?

None

Additional documentation, usage docs, etc.:

@x893675

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

codecov-commenter · 2022-08-26T09:12:32Z

Codecov Report

Merging #161 (6468abd) into master (3232cf2) will increase coverage by 0.00%.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #161   +/-   ##
=======================================
  Coverage   12.63%   12.63%           
=======================================
  Files         103      104    +1     
  Lines       15959    15987   +28     
=======================================
+ Hits         2016     2020    +4     
- Misses      13698    13718   +20     
- Partials      245      249    +4

Impacted Files	Coverage Δ
pkg/query/query.go	`11.58% <ø> (ø)`
pkg/cli/registry/registry.go	`0.00% <0.00%> (ø)`
pkg/utils/sshutils/sshcmd.go	`0.00% <0.00%> (ø)`
pkg/cli/deploy/deploy.go	`16.56% <0.00%> (+0.28%)`	⬆️

x893675 · 2022-08-29T02:45:33Z

/area testing

x893675 · 2022-08-29T02:45:44Z

/cc @lixd @Xvv-v

lixd · 2022-08-29T02:55:12Z

pkg/simple/client/kc/request.go

+	if q.Token != "" {
+		queryParameters.Set(query.ParameterToken, fmt.Sprintf("token=%s", q.Token))
+	}
+	if q.Message != "" {


fmt.Sprintf with wrong field (replace token -> message)

lixd · 2022-08-29T03:02:00Z

test/e2e/cluster/add_node.go

+		ginkgo.By("check node is added")
+		clus, err := f.Client.DescribeCluster(context.TODO(), clu.Name)
+		framework.ExpectNoError(err)
+		if !(clus.Items[0].Workers[0].ID == nodeID) {


maybe clus.Items[0].Workers[0].ID != nodeID is ok.

lixd · 2022-08-29T03:09:41Z

test/e2e/cluster/add_node.go

+}
+
+func createClusterWithWorkerNodeBeforeEach(f *framework.Framework, clusterName string, initial initfunc) (*kc.ClustersList, error) {
+	var nodeID []string


maybe nodeIDs is more clear

lixd · 2022-08-29T03:13:12Z

test/e2e/cluster/upgrade.go

+
+	ginkgo.It("upgrade online cluster and ensure cluster is upgraded", func() {
+		ginkgo.By("upgrade cluster")
+		err := f.Client.UpgradeCluster(context.TODO(), clu.Name, initUpgradeCluster(false, "v1.23.9"))


extract v1.23.9 to const

lixd · 2022-08-29T03:15:50Z

test/e2e/cluster/upgrade.go

+		framework.ExpectNoError(err)
+
+		ginkgo.By("check cluster status is running")
+		err = cluster.WaitForClusterRunning(f.Client, clu.Name, f.Timeouts.ClusterInstall)


maybe replace WaitForClusterRunning to WaitForUpgrade like online is better ?

lixd · 2022-08-29T05:19:58Z

test/e2e/node/disable_node.go

+	"github.com/kubeclipper/kubeclipper/test/framework"
+)
+
+var _ = cluster2.SIGDescribe("[Slow] [Serial] Disable node", func() {


disable node is fast, replace [Slow] tag.and check others tag.

lixd · 2022-08-29T05:22:22Z

test/e2e/node/disable_node.go

+		ginkgo.By("Check that there are enough available nodes")
+		nodes, err := f.Client.ListNodes(context.TODO(), kc.Queries{
+			Pagination:    query.NoPagination(),
+			LabelSelector: fmt.Sprintf("!%s", common.LabelNodeRole),


maybe you want common.LabelNodeDisable

lixd · 2022-08-29T05:23:19Z

test/e2e/node/disable_node.go

+		ginkgo.By("Check that there are enough available nodes")
+		nodes, err := f.Client.ListNodes(context.TODO(), kc.Queries{
+			Pagination:    query.NoPagination(),
+			LabelSelector: fmt.Sprintf("!%s", common.LabelNodeRole),


maybe you want !common.LabelNodeDisable

lixd · 2022-08-29T05:35:54Z

test/e2e/cluster/upgrade.go

+
+	ginkgo.It("upgrade online cluster and ensure cluster is upgraded", func() {
+		ginkgo.By("upgrade cluster")
+		err := f.Client.UpgradeCluster(context.TODO(), clu.Name, initUpgradeCluster(false, "v1.23.9"))


online upgrade needs set mirrors when creating cluster

lixd · 2022-08-29T05:36:30Z

test/e2e/cluster/upgrade.go

+
+	ginkgo.It("upgrade offline cluster and ensure cluster is upgraded", func() {
+		ginkgo.By("upgrade cluster")
+		err := f.Client.UpgradeCluster(context.TODO(), clu.Name, initUpgradeCluster(true, "v1.23.9"))


offline upgrade needs check offline packages

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

lixd · 2022-08-30T01:28:09Z

pkg/simple/client/kc/client.go

@@ -71,6 +71,11 @@ func (cli *Client) Host() string {
 	return cli.host
 }

+func (cli *Client) Token(ctx context.Context, body LoginRequest) (string, error) {
+	token, err := cli.Login(ctx, body)


just return cli.bearerToken,without login.

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

lixd

/lgtm

kubeclipper-bot · 2022-08-30T06:54:53Z

LGTM label has been added.

Git tree hash: 5752361efea8ed4d52e36ee27c9ca730478acb83

x893675 · 2022-08-30T07:46:06Z

pkg/query/query.go

@@ -84,6 +86,9 @@ type Query struct {
 	AllowWatchBookmarks  bool
 	ResourceVersionMatch string
 	FuzzySearch          map[string]string
+	Name                 string


need rename

x893675 · 2022-08-30T07:46:31Z

pkg/query/query.go

@@ -84,6 +86,9 @@ type Query struct {
 	AllowWatchBookmarks  bool
 	ResourceVersionMatch string
 	FuzzySearch          map[string]string
+	Name                 string
+	Token                string


need rename

x893675 · 2022-08-30T07:46:37Z

pkg/query/query.go

@@ -84,6 +86,9 @@ type Query struct {
 	AllowWatchBookmarks  bool
 	ResourceVersionMatch string
 	FuzzySearch          map[string]string
+	Name                 string
+	Token                string
+	Message              string


need rename

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

Xvv-v · 2022-08-30T09:13:04Z

test/e2e/cluster/add_node.go

+		clu = clus.Items[0].DeepCopy()
+	})
+
+	ginkgo.BeforeEach(func() {


为啥要写两个 beforeEach 啊

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

Xvv-v · 2022-08-31T02:00:06Z

/lgtm

kubeclipper-bot · 2022-08-31T02:00:12Z

LGTM label has been added.

Git tree hash: 210d17be219a1837ca4649fa233a558e038a67db

x893675 · 2022-08-31T03:56:11Z

/approve

kubeclipper-bot · 2022-08-31T03:56:18Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lixd, Metrora, x893675

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~~ [x893675]

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

part of the e2e test of the kubeclipper

10febb7

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

kubeclipper-bot added release-note-none kind/feature Categorizes issue or PR as related to a new feature. dco-signoff: yes size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 26, 2022

kubeclipper-bot added the area/testing Categorizes issue or PR as related to testing. label Aug 29, 2022

kubeclipper-bot requested review from lixd and Xvv-v August 29, 2022 02:45

lixd reviewed Aug 29, 2022

View reviewed changes

Liucw added 3 commits August 29, 2022 18:25

update 2022/08/29

158bf92

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

update 2022/08/29 sec.

a1cc735

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

update 2022/08/29 third.

9f0cc37

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

lixd reviewed Aug 30, 2022

View reviewed changes

update 2022/08/30

d616508

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

kubeclipper-bot added dco-signoff: no and removed dco-signoff: yes labels Aug 30, 2022

update 2022/08/30 sec.

6468abd

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

kubeclipper-bot added dco-signoff: yes and removed dco-signoff: no labels Aug 30, 2022

lixd approved these changes Aug 30, 2022

View reviewed changes

kubeclipper-bot assigned lixd Aug 30, 2022

kubeclipper-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 30, 2022

x893675 reviewed Aug 30, 2022

View reviewed changes

update 2022/08/30 third.

e214425

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

kubeclipper-bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 30, 2022

Xvv-v reviewed Aug 30, 2022

View reviewed changes

update 2022/08/30 forth.

de7c85e

Signed-off-by: Liucw <liu.chuwei@99cloud.net>

kubeclipper-bot assigned Xvv-v Aug 31, 2022

kubeclipper-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 31, 2022

kubeclipper-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 31, 2022

kubeclipper-bot merged commit 267a254 into kubeclipper:master Aug 31, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

part of the e2e test of the kubeclipper #161

part of the e2e test of the kubeclipper #161

Metrora commented Aug 26, 2022 •

edited by x893675

codecov-commenter commented Aug 26, 2022 •

edited

x893675 commented Aug 29, 2022

x893675 commented Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 29, 2022

lixd Aug 30, 2022

lixd left a comment

kubeclipper-bot commented Aug 30, 2022

x893675 Aug 30, 2022 •

edited

x893675 Aug 30, 2022

x893675 Aug 30, 2022

Xvv-v Aug 30, 2022

Xvv-v commented Aug 31, 2022

kubeclipper-bot commented Aug 31, 2022

x893675 commented Aug 31, 2022

kubeclipper-bot commented Aug 31, 2022

part of the e2e test of the kubeclipper #161

part of the e2e test of the kubeclipper #161

Conversation

Metrora commented Aug 26, 2022 • edited by x893675

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for reviewers:

Does this PR introduced a user-facing change?

Additional documentation, usage docs, etc.:

codecov-commenter commented Aug 26, 2022 • edited

Codecov Report

x893675 commented Aug 29, 2022

x893675 commented Aug 29, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lixd left a comment

Choose a reason for hiding this comment

kubeclipper-bot commented Aug 30, 2022

x893675 Aug 30, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Xvv-v commented Aug 31, 2022

kubeclipper-bot commented Aug 31, 2022

x893675 commented Aug 31, 2022

kubeclipper-bot commented Aug 31, 2022

Metrora commented Aug 26, 2022 •

edited by x893675

codecov-commenter commented Aug 26, 2022 •

edited

x893675 Aug 30, 2022 •

edited