pkg/operator Filter out non-MCO CRDs when re-syncing modified MCO CRDs by sgreene570 · Pull Request #832 · openshift/machine-config-operator

sgreene570 · 2019-06-06T22:45:38Z

Fixes #815

- What I did
Following #817, added a label for mco-built-in/crd to MCO CRDs in the manifests/ directory.
Then modified apiExtSharedInformer to filter based on this label.
Tested on an AWS cluster to be working.

- How to verify it
Add logging statements to the enqueue function in pkg/operator/operator.go and watch machine-config-operator pod logs in kube and verify that non-MCO CRDs are not being re-synced (when they don't need to be, as seen in the issue, #815 ).

- Description for the changelog

Filter out object changes not pertaining to MCO when re-syncing MCO CRDs.

kikisdeliveryservice

a couple comments and question

kikisdeliveryservice · 2019-06-06T23:38:47Z

aws route 53 errors.

/retest

sgreene570 · 2019-06-06T23:56:28Z

Fixed variable/function naming issues. Trying CI again.
/retest

kikisdeliveryservice · 2019-06-07T00:15:22Z

Just double checking, it seems that this requires settling on the proper label (it will depend on whatever is used here: #817 (comment) ) right @runcom @sgreene570 ?

runcom · 2019-06-07T08:09:07Z

Just double checking, it seems that this requires settling on the proper label (it will depend on whatever is used here: #817 (comment) ) right @runcom @sgreene570 ?

yep, correct, I will follow up on that.

sgreene570 · 2019-06-10T16:28:38Z

/retest

sgreene570 · 2019-06-10T21:54:07Z

strange timeout / monitoring CI errors, trying again.
/retest

kikisdeliveryservice · 2019-06-10T21:58:55Z

etcd-quorum-loss is very flaky, so I wouldn't bother retesting for that one @sgreene570

kikisdeliveryservice · 2019-06-11T19:20:57Z

/skip

kikisdeliveryservice · 2019-06-11T19:22:19Z

putting a hold, since it's pending #817 (comment) resolution

/hold

runcom · 2019-06-13T14:08:14Z

still ongoing here #817 (comment)

sgreene570 · 2019-06-17T17:40:14Z

/test e2e-aws-upgrade

sgreene570 · 2019-06-20T18:07:03Z

Applied the proper label from #817 and rebased.

runcom · 2019-06-25T15:37:09Z

/approve
/lgtm

kikisdeliveryservice · 2019-06-25T19:35:20Z

@runcom I saw that you lgtm'ed but didnt lift the hold on this PR. also #817 still has a hold. are we waiting for that to merge first then?

runcom · 2019-06-25T19:40:26Z

@runcom I saw that you lgtm'ed but didnt lift the hold on this PR. also #817 still has a hold. are we waiting for that to merge first then?

I oversaw the hold, we can lift it here and I'll lift it in my other PR once I get back to that 👍

/hold cancel

kikisdeliveryservice · 2019-06-25T19:59:56Z

/retest

kikisdeliveryservice · 2019-06-25T20:01:05Z

@sgreene570 i think you might want to rebase to pick up the latest changes in the repo. i suspect this is why pr is failing.

openshift-ci-robot · 2019-06-25T20:01:20Z

@sgreene570: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/prow/e2e-etcd-quorum-loss	5ccbfcd2bb21d76e17732dee8aab045fd971b055	link	`/test e2e-etcd-quorum-loss`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

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. I understand the commands that are listed here.

kikisdeliveryservice · 2019-06-25T20:17:14Z

@sgreene570 i think you might want to rebase to pick up the latest changes in the repo. i suspect this is why pr is failing.

Rebase did the trick, PR is now past the build errors

/LGTM

openshift-ci-robot · 2019-06-25T20:17:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kikisdeliveryservice, runcom, sgreene570

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [kikisdeliveryservice,runcom]

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

openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 6, 2019

openshift-ci-robot requested review from cgwalters and runcom June 6, 2019 22:45

kikisdeliveryservice reviewed Jun 6, 2019

View reviewed changes

Comment thread pkg/controller/common/controller_context.go Outdated

Comment thread pkg/controller/common/controller_context.go Outdated

Comment thread pkg/controller/common/controller_context.go Outdated

sgreene570 force-pushed the filter-object-changes branch from af3213f to 5ccbfcd Compare June 6, 2019 23:54

sgreene570 closed this Jun 10, 2019

sgreene570 reopened this Jun 10, 2019

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 11, 2019

runcom reviewed Jun 13, 2019

View reviewed changes

Comment thread pkg/controller/common/controller_context.go Outdated

runcom reviewed Jun 13, 2019

View reviewed changes

sgreene570 force-pushed the filter-object-changes branch from 5ccbfcd to 33c9df6 Compare June 13, 2019 23:12

sgreene570 force-pushed the filter-object-changes branch 2 times, most recently from ae3c504 to e5eeb94 Compare June 20, 2019 18:06

openshift-ci-robot assigned runcom Jun 25, 2019

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 25, 2019

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 25, 2019

sgreene570 added 3 commits June 25, 2019 13:07

manifests: Update MCO CRDs to have MCO label

bf75762

pkg/operator: Update bindata.go

5d1dea6

pkg/controller: Filter non-MCO object changes from syncing

26291bd

sgreene570 force-pushed the filter-object-changes branch from e5eeb94 to 26291bd Compare June 25, 2019 20:08

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jun 25, 2019

openshift-ci-robot assigned kikisdeliveryservice Jun 25, 2019

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 25, 2019

openshift-merge-robot merged commit 0ebe474 into openshift:master Jun 25, 2019

sgreene570 mentioned this pull request Aug 13, 2019

[4.3] pkg/daemon: MCD constants fixup #1058

Merged

Conversation

sgreene570 commented Jun 6, 2019

Uh oh!

kikisdeliveryservice left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kikisdeliveryservice commented Jun 6, 2019

Uh oh!

sgreene570 commented Jun 6, 2019

Uh oh!

kikisdeliveryservice commented Jun 7, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

runcom commented Jun 7, 2019

Uh oh!

sgreene570 commented Jun 10, 2019

Uh oh!

sgreene570 commented Jun 10, 2019

Uh oh!

kikisdeliveryservice commented Jun 10, 2019

Uh oh!

kikisdeliveryservice commented Jun 11, 2019

Uh oh!

kikisdeliveryservice commented Jun 11, 2019

Uh oh!

Uh oh!

runcom Jun 13, 2019

Choose a reason for hiding this comment

Uh oh!

sgreene570 commented Jun 17, 2019

Uh oh!

sgreene570 commented Jun 20, 2019

Uh oh!

runcom commented Jun 25, 2019

Uh oh!

kikisdeliveryservice commented Jun 25, 2019

Uh oh!

runcom commented Jun 25, 2019

Uh oh!

kikisdeliveryservice commented Jun 25, 2019

Uh oh!

kikisdeliveryservice commented Jun 25, 2019

Uh oh!

openshift-ci-robot commented Jun 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kikisdeliveryservice commented Jun 25, 2019

Uh oh!

openshift-ci-robot commented Jun 25, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

kikisdeliveryservice commented Jun 7, 2019 •

edited

Loading

openshift-ci-robot commented Jun 25, 2019 •

edited

Loading