Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-25798,OCPBUGS-25802: [release-4.15] NO-ISSUE: Synchronize From Upstream Repositories #643

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #627

/assign stevekuznetsov

@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-24526 has been cloned as Jira Issue OCPBUGS-25798. Will retitle bug to link to clone.
/retitle [release-4.15] NO-ISSUE: Synchronize From Upstream Repositories

In response to this:

This is an automated cherry-pick of #627

/assign stevekuznetsov

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.

@stevekuznetsov
Copy link
Contributor

/retitle oops

@openshift-ci openshift-ci bot changed the title [release-4.15] NO-ISSUE: Synchronize From Upstream Repositories oops Dec 21, 2023
Juneezee and others added 10 commits December 21, 2023 13:17
At the time of making this commit, the package `github.com/ghodss/yaml`
is no longer actively maintained.

`sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively
maintained by Kubernetes SIG.

Reference: operator-framework/api#308

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: 6df3abad48bb338b51986cc89877d89fc1b3e39d
…e (bundle, channel, package) (#1172)

Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: e5dca1a649fae543cb1caa12ae15dd5163442321
Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
Upstream-repository: operator-registry
Upstream-commit: cf1db12e386a789cac32b228230f60765597cc8b
In the past, OLM moved to using a label selector to filter the informers
that track ConfigMaps in the cluster. However, when this was done,
previous ConfigMaps on the cluster that already existed were not
labelled. Therefore, on old clusters there is a mix of data - ConfigMaps
that OLM created and managed but has now forgotten since they are
missing labels, and conformant objects with the label.

We use ConfigMaps to track whether or not Jobs should be labelled - if a
Job has an OwnerReference to a ConfigMap and the ConfigMap has an
OwnerReference to an OLM GVK, we know that the Job is created and
managed by OLM.

During runtime, the two-hop lookup described above is done by using a
ConfigMap informer, so we're light on client calls during the labelling
phase of startup. However, before the recent labelling work went in, the
ConfigMap informer was *already* filtered by label, so our lookups were
dead-ends for the few old ConfigMaps that had never gotten labels in the
past. However, on startup we use live clients to determine if there are
unlabelled objects we need to handle, so we end up in a state where the
live lookup can detect the errant Jobs but the informer-based labellers
can't see them as needing labels.

This commit is technically a performance regression, as it reverts the
unequivocal ConfigMap informer filtering - we see all ConfigMaps on the
cluster during startup, but continue to filter as expected once
everything has labels.

Ideally, we can come up with some policies for cleanup of things like
these Jobs and ConfigMaps in the future; at a minimum all of the OLM
objects should be labelled and visible to the OLM operators from here on
out.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 8a68d79f7f7e7190a5e5b8d1fc6fc5a16e646053
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 7a056b2fab2068f5593d43efd7c3fb87bb2aefab
ConfigMaps provided for the internal source type are user-created and
won't have our labels, so we need to use a live client to fetch them.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 79b4d4150180456767b676a75939d124d3783386
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 98fe8e536ed6298e4037fbaeb211fb91b8e25f83
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: e2b37687f1311f8e5fe1ec508d33c1cd7ac030a3
…ead of the CatalogSource Namespace.

Signed-off-by: Daniel Franz <dfranz@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: d70de0797c1604cb2b6d6aa043e1e7731fc830e3
Our controllers must not share runtime with controllers of previous
versions, as we expect that the set of actors on the cluster to be
coherent with respect to what they're trying to do. RollingUpdate
strategies do not guarantee this and lead to cases where previous
versions of the operators issue spurious mutating calls that the
current operator needs to un-do.

Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: cee062283539d08f25333bfa53b2963725e35914
@stevekuznetsov
Copy link
Contributor

/retitle OCPBUGS-25798: [release-4.15] NO-ISSUE: Synchronize From Upstream Repositories

@stevekuznetsov
Copy link
Contributor

/jira cherrypick OCPBUGS-25448

@openshift-ci-robot
Copy link

@stevekuznetsov: Jira Issue OCPBUGS-25448 has been cloned as Jira Issue OCPBUGS-25802. Will retitle bug to link to clone.
/retitle OCPBUGS-25802: oops

In response to this:

/jira cherrypick OCPBUGS-25448

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 openshift-ci bot changed the title oops OCPBUGS-25802: oops Dec 21, 2023
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Dec 21, 2023
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-25802, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-25448 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-25448 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #627

/assign stevekuznetsov

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.

@stevekuznetsov
Copy link
Contributor

/retitle OCPBUGS-25798,OCPBUGS-25802: [release-4.15] NO-ISSUE: Synchronize From Upstream Repositories

@openshift-ci openshift-ci bot changed the title OCPBUGS-25802: oops OCPBUGS-25798,OCPBUGS-25802: [release-4.15] NO-ISSUE: Synchronize From Upstream Repositories Dec 21, 2023
@openshift-ci-robot openshift-ci-robot removed the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Dec 21, 2023
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 21, 2023
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-25798, which is invalid:

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

The bug has been updated to refer to the pull request using the external bug tracker.

This pull request references Jira Issue OCPBUGS-25802, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-25448 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-25448 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This is an automated cherry-pick of #627

/assign stevekuznetsov

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.

@stevekuznetsov
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 21, 2023
@openshift-ci-robot
Copy link

@stevekuznetsov: This pull request references Jira Issue OCPBUGS-25798, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-24526 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-24526 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

This pull request references Jira Issue OCPBUGS-25802, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Jira Issue OCPBUGS-25448 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-25448 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
  • bug has dependents

Requesting review from QA contact:
/cc @jianzhangbjz

In response to this:

/jira 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.

@stevekuznetsov
Copy link
Contributor

/test verify

Copy link
Contributor

openshift-ci bot commented Dec 21, 2023

@openshift-cherrypick-robot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-olm 0671ad9 link true /test e2e-gcp-olm

Full PR test history. Your PR dashboard.

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.

@ncdc
Copy link
Contributor

ncdc commented Dec 21, 2023

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2023
Copy link
Contributor

openshift-ci bot commented Dec 21, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ncdc, openshift-cherrypick-robot

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 21, 2023
@oceanc80
Copy link
Contributor

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 21, 2023
@bandrade
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 21, 2023
@ncdc
Copy link
Contributor

ncdc commented Dec 21, 2023

Merging manually to get past test flakes.

@ncdc ncdc merged commit 7077fe6 into openshift:release-4.15 Dec 21, 2023
11 of 13 checks passed
@openshift-ci-robot
Copy link

@openshift-cherrypick-robot: Jira Issue OCPBUGS-25798: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-25798 has been moved to the MODIFIED state.

Jira Issue OCPBUGS-25802: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-25802 has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #627

/assign stevekuznetsov

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-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build operator-lifecycle-manager-container-v4.15.0-202312211752.p0.g7077fe6.assembly.stream for distgit operator-lifecycle-manager.
All builds following this will include this PR.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.15.0-0.nightly-2023-12-21-211153

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet