Bug 1881522: packageserver CSV: add missing properties #84

vrutkovs · 2021-06-02T12:32:38Z

Some properties are unset and being set to defaults. CVO is however unware of it, so it attempts to remove the fields which are unset in the manifest files.

This PR should prevent CVO from hotlooping on this manifest. Verified that its no longer happening:

$ curl -sL https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/logs/release-openshift-origin-installer-launch-aws/1400074947912536064/artifacts/launch/pods/openshift-cluster-version_cluster-version-operator-7d4cc845f6-pwfcm_cluster-version-operator.log | grep -oP "Updating \K.+ due to diff" | cut -d' ' -f1 | sort | uniq -c
    448 Deployment
     14 PriorityClass

Some properties are unset and being set to defaults. CVO is however unware of it, so it attempts to remove the fields which are unset in the manifest files. This PR should prevent CVO from hotlooping on this manifest

vrutkovs · 2021-06-02T13:44:51Z

/test e2e-gcp

Install never started

openshift-ci · 2021-06-02T15:00:42Z

@vrutkovs: This pull request references Bugzilla bug 1881522, which is invalid:

expected the bug to target the "4.8.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:

Bug 1881522: packageserver CSV: add missing properties

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.

vrutkovs · 2021-06-02T15:05:18Z

/bugzilla refresh

openshift-ci · 2021-06-02T15:05:26Z

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

Requesting review from QA contact:
/cc @jianlinliu

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.

vrutkovs · 2021-06-02T16:28:03Z

/retest

vrutkovs · 2021-06-02T19:24:38Z

/cherrypick release-4.7

openshift-cherrypick-robot · 2021-06-02T19:24:39Z

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

In response to this:

/cherrypick release-4.7

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.

timflannagan · 2021-06-03T15:33:57Z

/lgtm

timflannagan · 2021-06-07T16:05:24Z

/approve

openshift-ci · 2021-06-07T16:05:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timflannagan, vrutkovs

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

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

openshift-ci · 2021-06-07T16:06:33Z

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

openshift/operator-framework-olm#84

Bugzilla bug 1881522 has been moved to the MODIFIED state.

In response to this:

Bug 1881522: packageserver CSV: add missing properties

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-06-07T16:07:10Z

@vrutkovs: #84 failed to apply on top of branch "release-4.7":

Applying: packageserver CSV: add missing properties
Using index info to reconstruct a base tree...
M	manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 packageserver CSV: add missing properties
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:

/cherrypick release-4.7

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.

…generate manifests Update the staging/operator-lifecycle-manager helm charts for the PackageServer CSV resource and add the defaults for various fields to avoid the CVO hotlooping when attempting to create this resource. These changes were introduced directly into the root list of manifests in openshift#84 and this PR attempts to ensure those changes were also propagated to the helm charts and regenerated to keep the manifest directory in sync.

packageserver CSV: add missing properties

afcaa06

Some properties are unset and being set to defaults. CVO is however unware of it, so it attempts to remove the fields which are unset in the manifest files. This PR should prevent CVO from hotlooping on this manifest

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2021

vrutkovs mentioned this pull request Jun 2, 2021

Bug 1879184: Log object updates and show existing/required diff openshift/cluster-version-operator#561

Merged

openshift-ci bot requested review from ankitathomas and timflannagan June 2, 2021 12:35

vrutkovs changed the title ~~WIP packageserver CSV: add missing properties~~ Bug 1881522: packageserver CSV: add missing properties Jun 2, 2021

openshift-ci bot added bugzilla/severity-low Referenced Bugzilla bug's severity is low for the branch this PR is targeting. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jun 2, 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 Jun 2, 2021

openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jun 2, 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 Jun 2, 2021

openshift-ci bot requested a review from jianlinliu June 2, 2021 15:05

openshift-ci bot assigned timflannagan Jun 3, 2021

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

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 7, 2021

openshift-merge-robot merged commit 1adb449 into openshift:master Jun 7, 2021

This was referenced Jun 8, 2021

Bug 1969320: [release-4.7] packageserver CSV: add missing properties #89

Closed

[release-4.7] Bug 1969320: packageserver CSV: add missing properties operator-framework/operator-lifecycle-manager#2192

Merged

timflannagan mentioned this pull request Jun 14, 2021

manifests,staging: Add default values to the PackageServer CSV and regenerate manifests #94

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Bug 1881522: packageserver CSV: add missing properties #84

Bug 1881522: packageserver CSV: add missing properties #84

Uh oh!

vrutkovs commented Jun 2, 2021 •

edited

Loading

Uh oh!

vrutkovs commented Jun 2, 2021

Uh oh!

openshift-ci bot commented Jun 2, 2021

Uh oh!

vrutkovs commented Jun 2, 2021

Uh oh!

openshift-ci bot commented Jun 2, 2021

Uh oh!

vrutkovs commented Jun 2, 2021

Uh oh!

vrutkovs commented Jun 2, 2021

Uh oh!

openshift-cherrypick-robot commented Jun 2, 2021

Uh oh!

timflannagan commented Jun 3, 2021

Uh oh!

timflannagan commented Jun 7, 2021

Uh oh!

openshift-ci bot commented Jun 7, 2021

Uh oh!

openshift-ci bot commented Jun 7, 2021

Uh oh!

openshift-cherrypick-robot commented Jun 7, 2021

Uh oh!

Uh oh!

Bug 1881522: packageserver CSV: add missing properties #84

Bug 1881522: packageserver CSV: add missing properties #84

Uh oh!

Conversation

vrutkovs commented Jun 2, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vrutkovs commented Jun 2, 2021

Uh oh!

openshift-ci bot commented Jun 2, 2021

Uh oh!

vrutkovs commented Jun 2, 2021

Uh oh!

openshift-ci bot commented Jun 2, 2021

Uh oh!

vrutkovs commented Jun 2, 2021

Uh oh!

vrutkovs commented Jun 2, 2021

Uh oh!

openshift-cherrypick-robot commented Jun 2, 2021

Uh oh!

timflannagan commented Jun 3, 2021

Uh oh!

timflannagan commented Jun 7, 2021

Uh oh!

openshift-ci bot commented Jun 7, 2021

Uh oh!

openshift-ci bot commented Jun 7, 2021

Uh oh!

openshift-cherrypick-robot commented Jun 7, 2021

Uh oh!

Uh oh!

vrutkovs commented Jun 2, 2021 •

edited

Loading