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.

Sign up for GitHub

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

Jump to bottom

remove loop from flush(). start/stop informers depending on k8s master #580

Merged
merged 1 commit into from
Dec 14, 2018
Merged

remove loop from flush(). start/stop informers depending on k8s master #580

merged 1 commit into from
Dec 14, 2018

Conversation

agau4779
Copy link
Contributor

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 13, 2018
@k8s-ci-robot
Copy link
Contributor

Hi @agau4779. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 13, 2018
@agau4779
Copy link
Contributor Author

/assign @rramkumar1

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 13, 2018
@rramkumar1
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 14, 2018
rramkumar1
rramkumar1 reviewed Dec 14, 2018
View reviewed changes
pkg/e2e/status.go
@@ -116,6 +116,15 @@ func (sm *StatusManager) startInformer() {
cmInformer.AddEventHandler(cache.ResourceEventHandlerFuncs{
UpdateFunc: func(old, cur interface{}) {
curCm := cur.(*v1.ConfigMap)
upgradeTs := curCm.Data[masterUpgradingKey]
Copy link
Contributor

Choose a reason for hiding this comment

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

Discussed offline. Don't need this.

pkg/e2e/status.go
@@ -152,66 +161,77 @@ func (sm *StatusManager) putStatus(key string, status IngressStability) {
sm.cm.Data[key] = string(status)
}

func (sm *StatusManager) setMasterUpgrading(ts string) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Discussed offline. Don't need this.

Copy link
Contributor

Choose a reason for hiding this comment

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

Disregard comment that we don't need this. We do.

Can we call this updateLocalConfigMap() though? And when you use it, just update the whole config map rather than one key.

rramkumar1
rramkumar1 reviewed Dec 14, 2018
View reviewed changes
cmd/e2e-test/upgrade_test.go Outdated
@@ -88,12 +88,6 @@ func TestUpgrade(t *testing.T) {
}
}

// While k8s master is upgrading, it will return a connection refused
Copy link
Contributor

Choose a reason for hiding this comment

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

We still want this.

pkg/e2e/sandbox.go Outdated
@@ -87,9 +87,3 @@ func (s *Sandbox) PutStatus(status IngressStability) {
func (s *Sandbox) MasterUpgraded() bool {
return s.f.statusManager.masterUpgraded()
}

Copy link
Contributor

Choose a reason for hiding this comment

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

We still want this.

pkg/e2e/status.go Outdated
@@ -217,6 +174,20 @@ func (sm *StatusManager) flush() {
updatedCm.Data = make(map[string]string)
}

// If master is in the process of upgrading, we exit early and turn off the
Copy link
Contributor

Choose a reason for hiding this comment

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

How come this was moved back down? Where it was originally was fine.

@agau4779
Copy link
Contributor Author

/assign bowei

@rramkumar1
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 14, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agau4779, rramkumar1

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 14, 2018
@k8s-ci-robot k8s-ci-robot merged commit 90d4e55 into kubernetes:master Dec 14, 2018
@agau4779 agau4779 deleted the master-upgrading branch February 6, 2019 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rramkumar1 rramkumar1 rramkumar1 left review comments

@MrHohn MrHohn Awaiting requested review from MrHohn

Assignees

@bowei bowei

@rramkumar1 rramkumar1

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@agau4779 @k8s-ci-robot @rramkumar1 @bowei