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

feat(controllers): make resyncPeriod configurable #1519

Merged
merged 1 commit into from
Nov 5, 2020

Conversation

knight42
Copy link
Collaborator

@knight42 knight42 commented Nov 5, 2020

What this PR does / why we need it:

Make resyncPeriod configurable

Which issue(s) this PR is related to (optional, link to 3rd issue(s)):

Fixes #

Reference to #

Special notes for your reviewer:

/cc @zhujian7

Release note:

NONE

@caicloud-bot caicloud-bot added release-note-none Denotes a PR that doesn't merit a release note. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 5, 2020
@zhujian7
Copy link
Collaborator

zhujian7 commented Nov 5, 2020

/ok-to-test

@zhujian7
Copy link
Collaborator

zhujian7 commented Nov 5, 2020

/lgtm

@caicloud-bot caicloud-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 5, 2020
@caicloud-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zhujian7

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

@caicloud-bot caicloud-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 5, 2020
@caicloud-bot caicloud-bot merged commit 4319aaf into caicloud:master Nov 5, 2020
@zhujian7
Copy link
Collaborator

zhujian7 commented Nov 8, 2020

/cherrypick cps-2.10

@knight42 knight42 deleted the feat/config-resync-period branch November 8, 2020 06:21
@caicloud-bot
Copy link
Collaborator

@zhujian7: #1519 failed to apply on top of branch "cps-2.10":

Using index info to reconstruct a base tree...
M	Makefile
M	pkg/workflow/common/const.go
M	pkg/workflow/controller/config.go
M	pkg/workflow/controller/controllers/exucution_cluster.go
M	pkg/workflow/controller/controllers/pod.go
M	pkg/workflow/controller/controllers/workflow_trigger.go
M	pkg/workflow/controller/controllers/workflowrun.go
M	pkg/workflow/controller/handlers/workflowrun/handler.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/workflow/controller/handlers/workflowrun/handler.go
CONFLICT (content): Merge conflict in pkg/workflow/controller/handlers/workflowrun/handler.go
Auto-merging pkg/workflow/controller/controllers/workflowrun.go
Auto-merging pkg/workflow/controller/controllers/workflow_trigger.go
Auto-merging pkg/workflow/controller/controllers/pod.go
Auto-merging pkg/workflow/controller/controllers/exucution_cluster.go
Auto-merging pkg/workflow/controller/config.go
CONFLICT (content): Merge conflict in pkg/workflow/controller/config.go
Auto-merging pkg/workflow/common/const.go
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
Patch failed at 0001 feat(controllers): make resyncPeriod configurable

In response to this:

/cherrypick cps-2.10

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. caicloud-cla: yes Indicates the PR's author has not signed the Caicloud CLA. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants