Bug 1978798: Update ovnKubernetesConfig.policyAuditConfig Default #993

astoycos · 2021-08-20T20:22:14Z

We need to initialize ovnKubernetesConfig.policyAuditConfig
so that the proper defaults are populated when a CNO config
object is created

Signed-off-by: astoycos [email protected]

openshift-ci · 2021-08-20T20:22:20Z

@astoycos: This pull request references Bugzilla bug 1978798, 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.9.0) matches configured target release for branch (4.9.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @asood-rh

In response to this:

Bug 1978798: Update ovnKubernetesConfig.policyAuditConfig Default

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.

astoycos · 2021-08-20T20:38:20Z

/assign @sttts

sttts · 2021-08-20T21:36:57Z

operator/v1/0000_70_cluster-network-operator_01_crd.yaml

@@ -239,6 +239,7 @@ spec:
                        policyAuditConfig:
                          description: policyAuditConfig is the configuration for network policy audit events. If unset, reported defaults are used.
                          type: object
+                          default: null


this looks wrong. What is kubebuilder doing here?

Not sure Maybe I need to specify the object here? Let me give that a try.

Two ways to solve this:

fix kubebuilder's controller-gen upstream

use a yaml patch as we do in similar cases where kubebuilder is broken. Look in this repo for yaml-patch files as blueprint. A yaml patch allows you to set {} here explicitly as value. It is applied after controller-gen has been run.

+1 sounds good I'll give a stab at debugging kubebuilder first, thanks!

openshift-merge-robot · 2021-09-06T07:21:03Z

/bugzilla refresh

The requirements for Bugzilla bugs have changed, recalculating validity.

openshift-ci · 2021-09-06T07:22:08Z

@openshift-merge-robot: This pull request references Bugzilla bug 1978798, which is invalid:

expected the bug to target the "4.10.0" release, but it targets "---" 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.

In response to this:

/bugzilla refresh

The requirements for Bugzilla bugs have changed, recalculating validity.

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.

astoycos · 2021-09-21T22:08:07Z

@sttts I bashed my head against kubebuilder for a while trying to fix this, however based on the design of controller-tools it doesn't seem like a very trivial thing to fix. I opened kubernetes-sigs/controller-tools#622 and asked for help in upstream/ and downstream slack channels to no avail. :(

For now I'd like to get this bug fixed with the following patch and then fix properly upstream once I can get more help/time.

operator/v1/0000_70_cluster-network-operator_01_crd.yaml

operator/v1/0000_70_cluster-network-operator_01.crd.yaml-patch

sttts · 2021-09-22T12:11:14Z

/lgtm
/approve

Rename the Cluster Network Operator's CRD so that a post schema generation patches can be used on the generated CRD Shema Signed-off-by: astoycos <[email protected]>

operator/v1/types_network.go

astoycos · 2021-09-22T12:56:32Z

Sounds good I'll fix these... Also when I changed the naming to .crd.yaml from _crd.yaml we also seemed to have picked up some additional formatting that provides a maximum line length which wasn't done on the _crd.yaml this results in reformatting of the entire file so I'll add another commit for that too

sttts · 2021-09-22T13:00:44Z

The patch tool uses another library to format the yaml. So that's expected, ugly, but expected.

We need to initialize `ovnKubernetesConfig.policyAuditConfig` so that the proper defaults are populated when a CNO config object is created It would be better to do this using the `+kubebuilder:default` flag however it is broken for this case as described in this [upstream issue](kubernetes-sigs/controller-tools#622) Signed-off-by: astoycos <[email protected]>

astoycos · 2021-09-22T13:22:51Z

ACK I though I did something wrong :)

Removed the comments, should be good to go

astoycos · 2021-09-22T13:24:50Z

/bugzilla refresh

openshift-ci · 2021-09-22T13:24:54Z

@astoycos: This pull request references Bugzilla bug 1978798, which is valid.

3 validation(s) were run on this bug

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

Requesting review from QA contact:
/cc @asood-rh

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.

sttts · 2021-09-22T16:08:31Z

/lgtm

openshift-ci · 2021-09-22T16:13:50Z

@astoycos: All pull requests linked via external trackers have merged:

openshift/api#993

Bugzilla bug 1978798 has been moved to the MODIFIED state.

In response to this:

Bug 1978798: Update ovnKubernetesConfig.policyAuditConfig Default

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-ci · 2021-09-22T16:14:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: astoycos, sttts

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~~ [sttts]

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

astoycos · 2021-09-22T18:14:55Z

/cherry-pick release-4.9

astoycos · 2021-09-22T18:15:06Z

/cherry-pick release-4.8

openshift-cherrypick-robot · 2021-09-22T18:15:35Z

@astoycos: new pull request created: #1014

In response to this:

/cherry-pick release-4.9

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 · 2021-09-22T18:15:41Z

@astoycos: #993 failed to apply on top of branch "release-4.8":

Applying: Rename the CNO CRD
Applying: Update ovnKubernetesConfig.policyAuditConfig Default
Using index info to reconstruct a base tree...
M	operator/v1/0000_70_cluster-network-operator_01.crd.yaml
Falling back to patching base and 3-way merge...
Auto-merging operator/v1/0000_70_cluster-network-operator_01.crd.yaml
CONFLICT (content): Merge conflict in operator/v1/0000_70_cluster-network-operator_01.crd.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Update ovnKubernetesConfig.policyAuditConfig Default
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.8

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.

astoycos · 2021-09-27T17:22:09Z

/cherry-pick release-4.9

openshift-cherrypick-robot · 2021-09-27T17:22:48Z

@astoycos: new pull request could not be created: failed to create pull request against openshift/api#release-4.9 from head openshift-cherrypick-robot:cherry-pick-993-to-release-4.9: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for openshift-cherrypick-robot:cherry-pick-993-to-release-4.9."}],"documentation_url":"https://docs.github.com/rest/reference/pulls#create-a-pull-request"}

In response to this:

/cherry-pick release-4.9

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-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Aug 20, 2021

openshift-ci bot requested review from asood-rh, jwforres and smarterclayton August 20, 2021 20:22

openshift-ci bot assigned sttts Aug 20, 2021

sttts reviewed Aug 20, 2021

View reviewed changes

openshift-ci bot removed the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 6, 2021

openshift-ci bot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Sep 6, 2021

astoycos force-pushed the fix-audit-logging branch 2 times, most recently from 889a5f7 to 78c2313 Compare September 21, 2021 22:03

sttts reviewed Sep 22, 2021

View reviewed changes

operator/v1/0000_70_cluster-network-operator_01_crd.yaml Show resolved Hide resolved

sttts reviewed Sep 22, 2021

View reviewed changes

operator/v1/0000_70_cluster-network-operator_01.crd.yaml-patch Outdated Show resolved Hide resolved

astoycos force-pushed the fix-audit-logging branch from 78c2313 to 5efff77 Compare September 22, 2021 12:05

openshift-ci bot 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 Sep 22, 2021

Rename the CNO CRD

21ac9e0

Rename the Cluster Network Operator's CRD so that a post schema generation patches can be used on the generated CRD Shema Signed-off-by: astoycos <[email protected]>

astoycos force-pushed the fix-audit-logging branch from 5efff77 to aeb12f5 Compare September 22, 2021 12:21

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2021

sttts reviewed Sep 22, 2021

View reviewed changes

operator/v1/types_network.go Outdated Show resolved Hide resolved

sttts reviewed Sep 22, 2021

View reviewed changes

operator/v1/types_network.go Outdated Show resolved Hide resolved

astoycos force-pushed the fix-audit-logging branch from aeb12f5 to 6f0ce8c Compare September 22, 2021 13:22

openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 22, 2021

openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Sep 22, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 22, 2021

openshift-merge-robot merged commit ba55515 into openshift:master Sep 22, 2021

openshift-cherrypick-robot mentioned this pull request Sep 22, 2021

Bug 2008249: Update ovnKubernetesConfig.policyAuditConfig Default #1014

Closed

openshift-ci bot mentioned this pull request Jul 12, 2022

Bug 1978798: Revert "Update ovnKubernetesConfig.policyAuditConfig Default" #1102

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1978798: Update ovnKubernetesConfig.policyAuditConfig Default #993

Bug 1978798: Update ovnKubernetesConfig.policyAuditConfig Default #993

astoycos commented Aug 20, 2021

openshift-ci bot commented Aug 20, 2021

astoycos commented Aug 20, 2021

sttts Aug 20, 2021

astoycos Aug 23, 2021

sttts Aug 25, 2021

astoycos Aug 25, 2021

openshift-merge-robot commented Sep 6, 2021

openshift-ci bot commented Sep 6, 2021

astoycos commented Sep 21, 2021

sttts commented Sep 22, 2021

astoycos commented Sep 22, 2021 •

edited

Loading

sttts commented Sep 22, 2021

astoycos commented Sep 22, 2021

astoycos commented Sep 22, 2021

openshift-ci bot commented Sep 22, 2021

sttts commented Sep 22, 2021

openshift-ci bot commented Sep 22, 2021

openshift-ci bot commented Sep 22, 2021

astoycos commented Sep 22, 2021

astoycos commented Sep 22, 2021

openshift-cherrypick-robot commented Sep 22, 2021

openshift-cherrypick-robot commented Sep 22, 2021

astoycos commented Sep 27, 2021

openshift-cherrypick-robot commented Sep 27, 2021

Bug 1978798: Update ovnKubernetesConfig.policyAuditConfig Default #993

Bug 1978798: Update ovnKubernetesConfig.policyAuditConfig Default #993

Conversation

astoycos commented Aug 20, 2021

openshift-ci bot commented Aug 20, 2021

astoycos commented Aug 20, 2021

sttts Aug 20, 2021

Choose a reason for hiding this comment

astoycos Aug 23, 2021

Choose a reason for hiding this comment

sttts Aug 25, 2021

Choose a reason for hiding this comment

astoycos Aug 25, 2021

Choose a reason for hiding this comment

openshift-merge-robot commented Sep 6, 2021

openshift-ci bot commented Sep 6, 2021

astoycos commented Sep 21, 2021

sttts commented Sep 22, 2021

astoycos commented Sep 22, 2021 • edited Loading

sttts commented Sep 22, 2021

astoycos commented Sep 22, 2021

astoycos commented Sep 22, 2021

openshift-ci bot commented Sep 22, 2021

sttts commented Sep 22, 2021

openshift-ci bot commented Sep 22, 2021

openshift-ci bot commented Sep 22, 2021

astoycos commented Sep 22, 2021

astoycos commented Sep 22, 2021

openshift-cherrypick-robot commented Sep 22, 2021

openshift-cherrypick-robot commented Sep 22, 2021

astoycos commented Sep 27, 2021

openshift-cherrypick-robot commented Sep 27, 2021

astoycos commented Sep 22, 2021 •

edited

Loading