Skip to content

OCPBUGS-61873: Revert #475 "OPRUN-4076, OPRUN-4078: Replace kustomize config with helm config" #478

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

OCPBUGS-61873: Revert #475 "OPRUN-4076, OPRUN-4078: Replace kustomize config with helm config" #478

wants to merge 1 commit into from

Conversation

sosiouxme
Copy link
Member

@sosiouxme sosiouxme commented Sep 17, 2025 •
edited
Loading

Reverts #475 ; tracked by OCPBUGS-61873

Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

olm cluster operator causes failed upgrades. See failures against https://amd64.ocp.releases.ci.openshift.org/releasestream/4.21.0-0.ci/release/4.21.0-0.ci-2025-09-17-081925 e.g. https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade/1968230337565691904
from camgi see:

      message: "CatalogdStaticResourcesDegraded: \"catalogd/manifests/04-configmap-openshift-catalogd-catalogd-trusted-ca-bundle.yml\" (string): configmaps \"catalogd-trusted-ca-bundle\" is forbidden: User \"system:serviceaccount:openshift-cluster-olm-operator:cluster-olm-operator\" cannot update resource \"configmaps\" in API group \"\" in the namespace \"openshift-catalogd\"\nCatalogdStaticResourcesDegraded: \"catalogd/manifests/26-servicemonitor-openshift-catalogd-catalogd-metrics-monitor.yml\" (string): servicemonitors.monitoring.coreos.com \"catalogd-metrics-monitor\" is forbidden: User \"system:serviceaccount:openshift-cluster-olm-operator:cluster-olm-operator\" cannot update resource \"servicemonitors\" in API group \"monitoring.coreos.com\" in the namespace \"openshift-catalogd\"\nCatalogdStaticResourcesDegraded: \nOperatorControllerStaticResourcesDegraded: \"operator-controller/manifests/04-configmap-openshift-operator-controller-operator-controller-trusted-ca-bundle.yml\" (string): configmaps \"operator-controller-trusted-ca-bundle\" is forbidden: User \"system:serviceaccount:openshift-cluster-olm-operator:cluster-olm-operator\" cannot update resource \"configmaps\" in API group \"\" in the namespace \"openshift-operator-controller\"\nOperatorControllerStaticResourcesDegraded: \"operator-controller/manifests/22-servicemonitor-openshift-operator-controller-operator-controller-metrics-monitor.yml\" (string): servicemonitors.monitoring.coreos.com \"operator-controller-metrics-monitor\" is forbidden: User \"system:serviceaccount:openshift-cluster-olm-operator:cluster-olm-operator\" cannot update resource \"servicemonitors\" in API group \"monitoring.coreos.com\" in the namespace \"openshift-operator-controller\"\nOperatorControllerStaticResourcesDegraded: "

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR and check the result of these jobs to confirm the fix has corrected the problem:

run payload job with /payload-job periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade

CC: @tmshort

PR created by Revertomatic™️

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 17, 2025
@openshift-ci-robot
Copy link

@sosiouxme: This pull request references Jira Issue OCPBUGS-61873, which is invalid:

  • expected the bug to target the "4.21.0" version, but no target version was set

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.

In response to this:

Reverts #475 ; tracked by OCPBUGS-61873

Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

olm cluster operator causes failed upgrades

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR and check the result of these jobs to confirm the fix has corrected the problem:

run payload job with /payload periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade

CC: @tmshort

PR created by Revertomatic™️

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 17, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: sosiouxme
Once this PR has been reviewed and has the lgtm label, please assign tmshort for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@sosiouxme
Copy link
Member Author

/payload periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 17, 2025

@sosiouxme: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@sosiouxme
UPSTREAM: <carry>: Revert "Merge pull request openshift#475 from tmsh…
23ab348 
…ort/helm-config"

This reverts commit 8854919, reversing
changes made to db481dd.
@petr-muller
Copy link
Member

/payload-job periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Sep 17, 2025

@petr-muller: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5be41860-93ee-11f0-9fa4-5f7eddcb83a2-0

@sosiouxme sosiouxme force-pushed the revert-475-1758130246099 branch from 87b09d4 to 23ab348 Compare September 17, 2025 17:50
@sosiouxme
Copy link
Member Author

/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 Sep 17, 2025
@openshift-ci-robot
Copy link

@sosiouxme: This pull request references Jira Issue OCPBUGS-61873, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.21.0) matches configured target version for branch (4.21.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot mentioned this pull request Sep 18, 2025
Merged
@jianzhangbjz
Copy link
Contributor

I believe openshift/cluster-olm-operator#139 addresses OCPBUGS-61873, so this PR is no longer needed.

@sosiouxme sosiouxme closed this Sep 18, 2025
@openshift-ci-robot
Copy link

@sosiouxme: This pull request references Jira Issue OCPBUGS-61873. The bug has been updated to no longer refer to the pull request using the external bug tracker.

In response to this:

Reverts #475 ; tracked by OCPBUGS-61873

Per OpenShift policy, we are reverting this breaking change to get CI and/or nightly payloads flowing again.

olm cluster operator causes failed upgrades. See failures against https://amd64.ocp.releases.ci.openshift.org/releasestream/4.21.0-0.ci/release/4.21.0-0.ci-2025-09-17-081925 e.g. https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade/1968230337565691904
from camgi see:

     message: "CatalogdStaticResourcesDegraded: \"catalogd/manifests/04-configmap-openshift-catalogd-catalogd-trusted-ca-bundle.yml\" (string): configmaps \"catalogd-trusted-ca-bundle\" is forbidden: User \"system:serviceaccount:openshift-cluster-olm-operator:cluster-olm-operator\" cannot update resource \"configmaps\" in API group \"\" in the namespace \"openshift-catalogd\"\nCatalogdStaticResourcesDegraded: \"catalogd/manifests/26-servicemonitor-openshift-catalogd-catalogd-metrics-monitor.yml\" (string): servicemonitors.monitoring.coreos.com \"catalogd-metrics-monitor\" is forbidden: User \"system:serviceaccount:openshift-cluster-olm-operator:cluster-olm-operator\" cannot update resource \"servicemonitors\" in API group \"monitoring.coreos.com\" in the namespace \"openshift-catalogd\"\nCatalogdStaticResourcesDegraded: \nOperatorControllerStaticResourcesDegraded: \"operator-controller/manifests/04-configmap-openshift-operator-controller-operator-controller-trusted-ca-bundle.yml\" (string): configmaps \"operator-controller-trusted-ca-bundle\" is forbidden: User \"system:serviceaccount:openshift-cluster-olm-operator:cluster-olm-operator\" cannot update resource \"configmaps\" in API group \"\" in the namespace \"openshift-operator-controller\"\nOperatorControllerStaticResourcesDegraded: \"operator-controller/manifests/22-servicemonitor-openshift-operator-controller-operator-controller-metrics-monitor.yml\" (string): servicemonitors.monitoring.coreos.com \"operator-controller-metrics-monitor\" is forbidden: User \"system:serviceaccount:openshift-cluster-olm-operator:cluster-olm-operator\" cannot update resource \"servicemonitors\" in API group \"monitoring.coreos.com\" in the namespace \"openshift-operator-controller\"\nOperatorControllerStaticResourcesDegraded: "

To unrevert this, revert this PR, and layer an additional separate commit on top that addresses the problem. Before merging the unrevert, please run these jobs on the PR and check the result of these jobs to confirm the fix has corrected the problem:

run payload job with /payload-job periodic-ci-openshift-release-master-ci-4.21-upgrade-from-stable-4.20-e2e-aws-ovn-upgrade

CC: @tmshort

PR created by Revertomatic™️

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 openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@perdasilva perdasilva Awaiting requested review from perdasilva

@thetechnick thetechnick Awaiting requested review from thetechnick

Assignees
No one assigned
Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sosiouxme @openshift-ci-robot @petr-muller @jianzhangbjz