Bug 1809274: crd/kubelet: do not prune kubelet rawExtension fields #1524

yuqi-zhang · 2020-03-02T20:56:50Z

The kubelet config is now validated, but fields are being silently
dropped since its an "unknown field" (rawExtension), which by
default is pruned by the validator.

Signed-off-by: Yu Qi Zhang jerzhang@redhat.com

openshift-ci-robot · 2020-03-02T20:56:56Z

@yuqi-zhang: This pull request references Bugzilla bug 1809274, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.5.0) matches configured target release for branch (4.5.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1809274: crd/kubelet: do not prune kubelet rawExtension 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.

yuqi-zhang · 2020-03-02T20:57:59Z

/cherry-pick release-4.4

openshift-cherrypick-robot · 2020-03-02T20:58:00Z

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

In response to this:

/cherry-pick release-4.4

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.

yuqi-zhang · 2020-03-02T20:58:25Z

Did some manual validation and can confirm that with the change, the object is no longer being dropped.

kikisdeliveryservice · 2020-03-02T21:05:09Z

Need a make update

seems sane to me

CC: @rphillips

ashcrow · 2020-03-02T21:05:26Z

diff -Naupr hack/../_tmp/pkg/operator/assets/bindata.go hack/../pkg/operator/assets/bindata.go
--- hack/../_tmp/pkg/operator/assets/bindata.go	2020-03-02 21:03:36.448612384 +0000
+++ hack/../pkg/operator/assets/bindata.go	2020-03-02 21:03:37.176676283 +0000
@@ -1155,6 +1155,8 @@ spec:
           properties:
             kubeletConfig:
               type: object
+              x-kubernetes-embedded-resource: true
+              x-kubernetes-preserve-unknown-fields: true
             machineConfigPoolSelector:
               description: A label selector is a label query over a set of resources.
                 The result of matchLabels and matchExpressions are ANDed. An empty
hack/../pkg is out of date. Please run make update

kikisdeliveryservice · 2020-03-02T21:05:46Z

@yuqi-zhang does this mean we also need to update the container runtime cfgs too?

yuqi-zhang · 2020-03-02T21:09:47Z

Need a make update

Done

does this mean we also need to update the container runtime cfgs too?

I don't believe so. That has a defined set of fields. KubeletConfig was the only rawExtension field in our API

yuqi-zhang · 2020-03-02T21:11:54Z

That said by default I don't think we generate a containerruntimeconfig so I wouldn't know what to expect for that one specifically

yuqi-zhang · 2020-03-02T21:17:21Z

I did some testing and can confirm it does validation on valid containerruntimeconfig fields

kikisdeliveryservice · 2020-03-03T01:20:58Z

hmm this is weird for TestKernelType:
mcd_test.go:278: Node ci-op-269qf-w-d-hkp2x.c.openshift-gce-devel-ci.internal did not rollback successfully

/test e2e-gcp-op

runcom · 2020-03-03T13:20:28Z

/approve

ashcrow · 2020-03-03T20:13:21Z

/lgtm

ashcrow · 2020-03-03T20:13:44Z

/hold

@kikisdeliveryservice noted she had a question

kikisdeliveryservice · 2020-03-03T20:14:16Z

@yuqi-zhang is going to update commit message

/hold

The kubelet config is now validated, but fields are being silently dropped since its an "unknown field" (rawExtension), which by default is pruned by the validator. Some more context, the 2 fields that are being added are from kube specifications, that tell the validator to skip validation as well as mark it as an embedded (rawExtention) object which cannot be directly validated. See: https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#rawextension Signed-off-by: Yu Qi Zhang <jerzhang@redhat.com>

yuqi-zhang · 2020-03-03T20:22:14Z

Updated comment for more context

ashcrow · 2020-03-03T20:23:11Z

Content didn't change

/lgtm

Will defer to @kikisdeliveryservice to remove hold

kikisdeliveryservice · 2020-03-03T20:23:25Z

thank you, @yuqi-zhang !

/hold cancel

openshift-ci-robot · 2020-03-03T20:24:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashcrow, runcom, yuqi-zhang

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:

~~OWNERS~~ [ashcrow,runcom,yuqi-zhang]

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

ashcrow · 2020-03-03T21:13:56Z

/test unit

yuqi-zhang · 2020-03-03T21:43:24Z

/retest

ashcrow · 2020-03-03T21:50:29Z

/retest

openshift-bot · 2020-03-04T08:32:58Z

/retest

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

openshift-bot · 2020-03-04T08:38:17Z

/retest

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

runcom · 2020-03-04T09:50:48Z

uhm

/retest

openshift-bot · 2020-03-04T11:00:30Z

/retest

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

openshift-bot · 2020-03-04T11:39:40Z

/retest

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

ashcrow · 2020-03-04T13:54:31Z

/test e2e-gcp-upgrade

yuqi-zhang · 2020-03-04T15:02:57Z

/retest

rphillips · 2020-03-04T15:06:54Z

lgtm, thanks!

openshift-ci-robot · 2020-03-04T16:39:32Z

@yuqi-zhang: All pull requests linked via external trackers have merged. Bugzilla bug 1809274 has been moved to the MODIFIED state.

In response to this:

Bug 1809274: crd/kubelet: do not prune kubelet rawExtension 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-03-04T16:39:50Z

@yuqi-zhang: new pull request created: #1531

In response to this:

/cherry-pick release-4.4

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.

PR openshift#1524 introduced kubeletconfig as an embedded resource: x-kubernetes-embedded-resource: true This validates our config against the upstream config which differs in the placement of api version and kind. The result is that our kubeletconfigs are no longer valid and are unable to be applied. This PR removes the check and unbreaks our kubeletconfigs.

oshoval · 2020-03-08T12:50:05Z

Hi,
how to know please when its part of the official OpenShift ?

openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 2, 2020

openshift-ci-robot requested review from ashcrow and kikisdeliveryservice March 2, 2020 20:58

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

yuqi-zhang force-pushed the fix-kubelet-crd branch from 29f7916 to f973a16 Compare March 2, 2020 21:09

ashcrow approved these changes Mar 3, 2020

View reviewed changes

openshift-ci-robot assigned ashcrow Mar 3, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 3, 2020

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

yuqi-zhang force-pushed the fix-kubelet-crd branch from f973a16 to f473d5d Compare March 3, 2020 20:21

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Mar 3, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 3, 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 Mar 3, 2020

openshift-merge-robot merged commit 71db579 into openshift:master Mar 4, 2020

openshift-cherrypick-robot mentioned this pull request Mar 4, 2020

[release-4.4] Bug 1809334: crd/kubelet: do not prune kubelet rawExtension fields #1531

Merged

yuqi-zhang mentioned this pull request Mar 6, 2020

Bug 1811211: remove validation of kubeletcfg which is breaking our kubeletcfg #1541

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1809274: crd/kubelet: do not prune kubelet rawExtension fields #1524

Bug 1809274: crd/kubelet: do not prune kubelet rawExtension fields #1524

yuqi-zhang commented Mar 2, 2020

openshift-ci-robot commented Mar 2, 2020

yuqi-zhang commented Mar 2, 2020

openshift-cherrypick-robot commented Mar 2, 2020

yuqi-zhang commented Mar 2, 2020

kikisdeliveryservice commented Mar 2, 2020

ashcrow commented Mar 2, 2020

kikisdeliveryservice commented Mar 2, 2020

yuqi-zhang commented Mar 2, 2020 •

edited

yuqi-zhang commented Mar 2, 2020

yuqi-zhang commented Mar 2, 2020

kikisdeliveryservice commented Mar 3, 2020

runcom commented Mar 3, 2020

ashcrow commented Mar 3, 2020

ashcrow commented Mar 3, 2020

kikisdeliveryservice commented Mar 3, 2020

yuqi-zhang commented Mar 3, 2020

ashcrow commented Mar 3, 2020

kikisdeliveryservice commented Mar 3, 2020

openshift-ci-robot commented Mar 3, 2020

ashcrow commented Mar 3, 2020

yuqi-zhang commented Mar 3, 2020

ashcrow commented Mar 3, 2020

openshift-bot commented Mar 4, 2020

openshift-bot commented Mar 4, 2020

runcom commented Mar 4, 2020

openshift-bot commented Mar 4, 2020

openshift-bot commented Mar 4, 2020

ashcrow commented Mar 4, 2020

yuqi-zhang commented Mar 4, 2020

rphillips commented Mar 4, 2020

openshift-ci-robot commented Mar 4, 2020

openshift-cherrypick-robot commented Mar 4, 2020

oshoval commented Mar 8, 2020

Bug 1809274: crd/kubelet: do not prune kubelet rawExtension fields #1524

Bug 1809274: crd/kubelet: do not prune kubelet rawExtension fields #1524

Conversation

yuqi-zhang commented Mar 2, 2020

openshift-ci-robot commented Mar 2, 2020

yuqi-zhang commented Mar 2, 2020

openshift-cherrypick-robot commented Mar 2, 2020

yuqi-zhang commented Mar 2, 2020

kikisdeliveryservice commented Mar 2, 2020

ashcrow commented Mar 2, 2020

kikisdeliveryservice commented Mar 2, 2020

yuqi-zhang commented Mar 2, 2020 • edited

yuqi-zhang commented Mar 2, 2020

yuqi-zhang commented Mar 2, 2020

kikisdeliveryservice commented Mar 3, 2020

runcom commented Mar 3, 2020

ashcrow commented Mar 3, 2020

ashcrow commented Mar 3, 2020

kikisdeliveryservice commented Mar 3, 2020

yuqi-zhang commented Mar 3, 2020

ashcrow commented Mar 3, 2020

kikisdeliveryservice commented Mar 3, 2020

openshift-ci-robot commented Mar 3, 2020

ashcrow commented Mar 3, 2020

yuqi-zhang commented Mar 3, 2020

ashcrow commented Mar 3, 2020

openshift-bot commented Mar 4, 2020

openshift-bot commented Mar 4, 2020

runcom commented Mar 4, 2020

openshift-bot commented Mar 4, 2020

openshift-bot commented Mar 4, 2020

ashcrow commented Mar 4, 2020

yuqi-zhang commented Mar 4, 2020

rphillips commented Mar 4, 2020

openshift-ci-robot commented Mar 4, 2020

openshift-cherrypick-robot commented Mar 4, 2020

oshoval commented Mar 8, 2020

yuqi-zhang commented Mar 2, 2020 •

edited