Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make StsWebhook and PodWebhook work #2664

Merged
merged 8 commits into from
Jun 10, 2020
Merged

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Jun 9, 2020

What problem does this PR solve?

Close #2095

Currently sts webhook and pod webhook couldn't work at the same time because when pod webhook enabled, the sts partition would direct be set as 0.

This pr fix this and make e2e test to ensure it.

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

Make StatefulSet and Pod validation webhook could work at the sametime.

@Yisaer Yisaer marked this pull request as draft June 9, 2020 04:38
debug in ci

debug ci

fix e2e checking

add log

E2e CI job use memory storage for etcd (pingcap#2633)

* support memory storage for etcd in kind

* export ETCD_STORAGE_TYPE=memory in e2e_kind.groovy

* fix a bug

* use KIND_ETCD_DATADIR instead of ETCD_STORAGE_TYPE

* fix typos

* fix bugs

* Revert "fix bugs"

This reverts commit 3ae083b.

* revert format and simplified extraMounts

Hide datasource information for backup job (pingcap#2652)

Co-authored-by: pingcap-github-bot <sre-bot@pingcap.com>

use crd

Update pingcap_tidb_operator_build_kind.groovy
@Yisaer Yisaer marked this pull request as ready for review June 9, 2020 08:25
Comment on lines +141 to +144
tc := fixture.GetTidbCluster(ns, "admission", utilimage.TiDBV3Version)
tc.Spec.PD.Replicas = 3
tc.Spec.TiKV.Replicas = 3
tc.Spec.TiDB.Replicas = 2
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use crd instead

return fmt.Errorf("fail to set annotation for [%s/%s], component: %s, partition: %d, err: %v, output: %s", namespace, tcName, component, ordinal, err, string(output))
}
return nil
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use framework.RunKubectl or related functions to run kubectl command, e.g.

args := []string{
"exec", "-n", ns,
fmt.Sprintf("%s-0", controller.TiCDCMemberName(fromTCName)),
"--",
"/cdc", "cli", "changefeed", "create",
fmt.Sprintf("--sink-uri=tidb://root:@%s:4000/", controller.TiDBMemberName(toTCName)),
fmt.Sprintf("--pd=http://%s:2379", controller.PDMemberName(fromTCName)),
}
data, err := framework.RunKubectl(args...)
framework.ExpectNoError(err, fmt.Sprintf("failed to create change feed task: %s, %v", string(data), err))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

@Yisaer
Copy link
Contributor Author

Yisaer commented Jun 10, 2020

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Jun 10, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Jun 10, 2020

/run-all-tests

@sre-bot sre-bot merged commit 4d7a43e into pingcap:master Jun 10, 2020
sre-bot pushed a commit to sre-bot/tidb-operator that referenced this pull request Jun 10, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Jun 10, 2020

cherry pick to release-1.1 in PR #2676

sre-bot added a commit that referenced this pull request Jun 10, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>

Co-authored-by: Song Gao <disxiaofei@163.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

StatefulSet webhook couldn't work with Pod Webhook
4 participants