[release-4.4] Bug 1829651: MC CRD: preserve unknown fields #1698

runcom · 2020-04-30T01:43:27Z

TL;DR; if somebody provides fields like disks and other we don't specify in the crd
those get dropped and can cause whatever issue you can think of.
I think adding that will preserve the unknown field.

Signed-off-by: Antonio Murdaca [email protected]

holding pending tests

openshift-ci-robot · 2020-04-30T01:43:30Z

@runcom: This pull request references Bugzilla bug 1829138, which is invalid:

expected Bugzilla bug 1829138 to depend on a bug targeting a release in 4.5.0, 4.5.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1829138: [release-4.4] MC CRD: preserve unknown fields

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.

kikisdeliveryservice · 2020-04-30T01:49:01Z

need a make update

cgwalters · 2020-04-30T01:49:01Z

Needs a bindata update

runcom · 2020-04-30T01:49:35Z

yeah lol doing it rn

wking · 2020-04-30T01:50:11Z

/bugzilla refresh

openshift-ci-robot · 2020-04-30T01:50:14Z

@wking: This pull request references Bugzilla bug 1829138, which is invalid:

expected the bug to target the "4.4.0" release, but it targets "4.5.0" instead
expected Bugzilla bug 1829138 to depend on a bug targeting a release in 4.5.0, 4.5.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

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.

runcom · 2020-04-30T01:51:40Z

/bugzilla refresh

I'll fix BZs

runcom · 2020-04-30T01:52:04Z

I'm now wondering if every object in the tree needs this tweak also, I guess I'll find out shortly

sdodson · 2020-04-30T02:16:50Z

/retitle Bug 1829138: MC CRD: preserve unknown fields

sdodson · 2020-04-30T02:17:21Z

/retitle Bug 1829651: MC CRD: preserve unknown fields

openshift-ci-robot · 2020-04-30T02:17:39Z

@runcom: This pull request references Bugzilla bug 1829651, which is invalid:

expected dependent Bugzilla bug 1829138 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is NEW instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1829651: MC CRD: preserve unknown fields

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.

cgwalters · 2020-04-30T02:19:18Z

Anyone who wants to test this, it should be sufficient to do oc create on this: https://github.com/openshift/release/blob/23b3ddb6b32e8157e9b882172264b8d1b008070c/clusters/build-clusters/01_cluster/machine_config/m5d4x_machineconfig.yaml

Then, notice the storage/disks field is dropped:

$ oc describe machineconfig/m5d4x
...
    storage: {}

After this PR merges you should see the storage section from the submitted object.

kikisdeliveryservice · 2020-04-30T02:32:46Z

 level=fatal msg="failed to fetch Cluster: failed to fetch dependency of \"Cluster\": failed to generate asset \"Platform Permissions Check\": validate AWS credentials: checking install permissions: error simulating policy: Throttling: Rate exceeded\n\tstatus code: 400, request id: f6c3c3fb-9fc2-49e7-9717-395724888e9f"
error: failed to execute wrapped command: exit status 1

retest

wking · 2020-04-30T02:32:50Z

e2e-aws died in a throttled setup.

/test e2e-aws

cgwalters · 2020-04-30T02:33:47Z

OK I tested this and it didn't work at first; ended up interactively editing the CRD with more x-kubernetes-preserve-unknown-fields: true and got it to work, will re-test with a clean diff from source.

TL;DR; if somebody provides fields like disks and other we don't specify in the crd those get dropped and can cause whatever issue you can think of. I think adding that will preserve the unkwown field. Signed-off-by: Antonio Murdaca <[email protected]>

cgwalters · 2020-04-30T02:39:14Z

Ah, I think I was testing the original version of the PR, then did the fix and committed locally, but in the meantime Antonio pushed the same update I did. So this is likely good.

openshift-cherrypick-robot · 2020-04-30T03:03:17Z

@wking: once the present PR merges, I will cherry-pick it on top of master in a new PR and assign it to you.

Details

In response to this:

/cherrypick master

😆 😭

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.

sdodson · 2020-04-30T03:13:14Z

/cherrypick master

😆 😭

It'll fail on bindata conflicts

openshift-ci-robot · 2020-04-30T03:35:58Z

@runcom: This pull request references Bugzilla bug 1829651, which is invalid:

expected dependent Bugzilla bug 1829138 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is NEW instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

[release-4.4] Bug 1829651: MC CRD: preserve unknown fields

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.

wking · 2020-04-30T03:37:15Z

I've restored the bug-label override after the Bugzilla bot responded to the PR retitle.

wking · 2020-04-30T03:57:07Z

/hold cancel

We're letting this through if it passes CI, and may end up reverting later if something explodes.

kikisdeliveryservice · 2020-04-30T04:01:04Z

failures seem unrelated

/retest

openshift-bot · 2020-04-30T04:07:43Z

/retest

Please review the full test history for this PR and help us cut down flakes.

kikisdeliveryservice · 2020-04-30T04:13:28Z

/skip

openshift-ci-robot · 2020-04-30T05:14:37Z

@runcom: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-scaleup-rhel7	`6f63608`	link	`/test e2e-aws-scaleup-rhel7`

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.

sinnykumari · 2020-04-30T05:16:01Z

/retest

wking · 2020-04-30T05:18:07Z

/override ci/prow/e2e-aws

openshift-ci-robot · 2020-04-30T05:18:21Z

@wking: wking unauthorized: /override is restricted to Repo administrators, approvers in top level OWNERS file.

Details

In response to this:

/override ci/prow/e2e-aws

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.

mrunalp · 2020-04-30T05:20:16Z

/override ci/prow/e2e-aws

openshift-ci-robot · 2020-04-30T05:20:30Z

@mrunalp: mrunalp unauthorized: /override is restricted to Repo administrators, approvers in top level OWNERS file.

Details

In response to this:

/override ci/prow/e2e-aws

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.

kikisdeliveryservice · 2020-04-30T05:21:31Z

/override ci/prow/e2e-aws

openshift-ci-robot · 2020-04-30T05:21:54Z

@kikisdeliveryservice: Overrode contexts on behalf of kikisdeliveryservice: ci/prow/e2e-aws

Details

In response to this:

/override ci/prow/e2e-aws

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.

sinnykumari · 2020-04-30T05:22:13Z

sorry about the mess, i didn't realize that folks are already onto this PR :/ Added retest to get the pr merged soon considering the priority :/

kikisdeliveryservice · 2020-04-30T05:24:10Z

sorry about the mess, i didn't realize that folks are already onto this PR :/ Added retest to get the pr merged soon considering the priority :/

no worries sinny!!! 🤗

openshift-ci-robot · 2020-04-30T05:24:25Z

@runcom: All pull requests linked via external trackers have merged: openshift/machine-config-operator#1698. Bugzilla bug 1829651 has been moved to the MODIFIED state.

Details

In response to this:

[release-4.4] Bug 1829651: MC CRD: preserve unknown fields

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.

openshift-cherrypick-robot · 2020-04-30T05:24:37Z

@wking: #1698 failed to apply on top of branch "master":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	manifests/machineconfig.crd.yaml
M	pkg/operator/assets/bindata.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/operator/assets/bindata.go
CONFLICT (content): Merge conflict in pkg/operator/assets/bindata.go
Auto-merging install/0000_80_machine-config-operator_01_machineconfig.crd.yaml
Patch failed at 0001 MC CRD: preserve unknown fields

Details

In response to this:

/cherrypick master

😆 😭

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.

runcom added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 30, 2020

openshift-ci-robot added bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 30, 2020

openshift-ci-robot requested review from ericavonb and yuqi-zhang April 30, 2020 01:43

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 30, 2020

kikisdeliveryservice self-requested a review April 30, 2020 01:49

runcom force-pushed the ignition-unknown-fields branch from 4905991 to 14284af Compare April 30, 2020 01:50

openshift-ci-robot changed the title ~~Bug 1829138: [release-4.4] MC CRD: preserve unknown fields~~ Bug 1829138: MC CRD: preserve unknown fields Apr 30, 2020

openshift-ci-robot changed the title ~~Bug 1829138: MC CRD: preserve unknown fields~~ Bug 1829651: MC CRD: preserve unknown fields Apr 30, 2020

runcom force-pushed the ignition-unknown-fields branch from 14284af to e2b47b5 Compare April 30, 2020 02:18

runcom force-pushed the ignition-unknown-fields branch from e2b47b5 to b15c501 Compare April 30, 2020 02:21

MC CRD: preserve unknown fields

6f63608

TL;DR; if somebody provides fields like disks and other we don't specify in the crd those get dropped and can cause whatever issue you can think of. I think adding that will preserve the unkwown field. Signed-off-by: Antonio Murdaca <[email protected]>

cgwalters force-pushed the ignition-unknown-fields branch from b15c501 to 6f63608 Compare April 30, 2020 02:37

openshift-ci-robot added bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. and removed bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 30, 2020

wking added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Apr 30, 2020

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

openshift-merge-robot merged commit 46ea964 into openshift:release-4.4 Apr 30, 2020

wking mentioned this pull request Apr 30, 2020

[release-4.4] crio: Add explicit paths for configuration settings #1700

Closed

runcom deleted the ignition-unknown-fields branch April 30, 2020 14:27

runcom mentioned this pull request May 4, 2020

Bug 1829138: MC CRD: preserve unknown fields #1710

Merged

[release-4.4] Bug 1829651: MC CRD: preserve unknown fields #1698

[release-4.4] Bug 1829651: MC CRD: preserve unknown fields #1698

Uh oh!

Conversation

runcom commented Apr 30, 2020 • edited by wking Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 30, 2020

Uh oh!

kikisdeliveryservice commented Apr 30, 2020

Uh oh!

cgwalters commented Apr 30, 2020

Uh oh!

runcom commented Apr 30, 2020

Uh oh!

wking commented Apr 30, 2020

Uh oh!

openshift-ci-robot commented Apr 30, 2020

Uh oh!

runcom commented Apr 30, 2020

Uh oh!

runcom commented Apr 30, 2020

Uh oh!

sdodson commented Apr 30, 2020

Uh oh!

sdodson commented Apr 30, 2020

Uh oh!

openshift-ci-robot commented Apr 30, 2020

Uh oh!

cgwalters commented Apr 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kikisdeliveryservice commented Apr 30, 2020

Uh oh!

wking commented Apr 30, 2020

Uh oh!

cgwalters commented Apr 30, 2020

Uh oh!

cgwalters commented Apr 30, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 30, 2020

Uh oh!

sdodson commented Apr 30, 2020

Uh oh!

openshift-ci-robot commented Apr 30, 2020

Uh oh!

wking commented Apr 30, 2020

Uh oh!

wking commented Apr 30, 2020

Uh oh!

kikisdeliveryservice commented Apr 30, 2020

Uh oh!

openshift-bot commented Apr 30, 2020

Uh oh!

kikisdeliveryservice commented Apr 30, 2020

Uh oh!

openshift-ci-robot commented Apr 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sinnykumari commented Apr 30, 2020

Uh oh!

wking commented Apr 30, 2020

Uh oh!

openshift-ci-robot commented Apr 30, 2020

Uh oh!

mrunalp commented Apr 30, 2020

Uh oh!

openshift-ci-robot commented Apr 30, 2020

Uh oh!

kikisdeliveryservice commented Apr 30, 2020

Uh oh!

openshift-ci-robot commented Apr 30, 2020

Uh oh!

sinnykumari commented Apr 30, 2020

Uh oh!

kikisdeliveryservice commented Apr 30, 2020

Uh oh!

openshift-ci-robot commented Apr 30, 2020

Uh oh!

openshift-cherrypick-robot commented Apr 30, 2020

runcom commented Apr 30, 2020 •

edited by wking

Loading

cgwalters commented Apr 30, 2020 •

edited

Loading

openshift-ci-robot commented Apr 30, 2020 •

edited

Loading