Fix issues in e2e test #442
Conversation
kevinliu24
added
do not review
pkg/util/extender/unstructured.go
Outdated
| @@ -183,8 +183,7 @@ func ObjectEqual(newUnstruct, oldUnstruct *unstructured.Unstructured) bool { | |||
| annotations := map[string]string{} | |||
| for k, v := range oldUnstruct.GetAnnotations() { | |||
| if k == annotation.AnnLastAppliedConfigKey || | |||
| k == annotation.AnnRestartTimestamp || | |||
| k == annotation.AnnLastReplicas { | |||
| k == annotation.AnnRestartTimestamp { | |||
There was a problem hiding this comment.
why remove this annotation
There was a problem hiding this comment.
@MegaByte875 I removed this check to fix the Graphd is stuck in "Scale In" though the nebula cluster is ready issue. This is due to new_replicas not equal to last_replicas which is because last_replicas wasn't updated to the correct value. So we shouldn't ignore the annotation AnnLastReplicas when checking equality so we can perform an update.
There was a problem hiding this comment.
According to @MegaByte875 k == annotation.AnnLastReplicas was added to fix a bug. Will leave alone for know. @MegaByte875 will look into why the replicas are not equal.
| @@ -57,9 +57,16 @@ jobs: | |||
| export E2E_DOCKER_CONFIG_JSON_SECRET=`cat ~/.docker/config.json| base64 -w 0` | |||
| make e2e E2EARGS="-v=5 -skip-features 'pv expansion|custom config for dynamic|tools for exporter'" | |||
| env: | |||
| E2E_AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} | |||
| E2E_AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | |||
| E2E_BR_IMAGE: reg.vesoft-inc.com/cloud-dev/br-ent | |||
There was a problem hiding this comment.
Currently br-ent is in cloud-dev. @MegaByte875 to move them into the CI folder
| E2E_OPERATOR_IMAGE: reg.vesoft-inc.com/ci/nebula-operator:ci-e2e | ||
| E2E_OPERATOR_INSTALL: "true" | ||
| E2E_NC_VERSION: v3.6.0 | ||
| E2E_NC_VERSION: v3.7.0 | ||
| E2E_NC_AGENT_IMAGE: reg.vesoft-inc.com/cloud-dev/nebula-agent |
There was a problem hiding this comment.
@MegaByte875 to move them into the CI folder
What type of PR is this?
What problem(s) does this PR solve?
Issue(s) number:
Description:
How do you solve it?
Special notes for your reviewer, ex. impact of this fix, design document, etc: