Skip to content

Conversation

@simu
Copy link
Member

@simu simu commented Jan 16, 2026

Checklist

  • The PR has a meaningful title. It will be used to auto-generate the
    changelog.
    The PR has a meaningful description that sums up the change. It will be
    linked in the changelog.
  • PR contains a single logical change (to build a better changelog).
  • Update the documentation.
  • Categorize the PR by adding one of the labels:
    bug, enhancement, documentation, change, breaking, dependency
    as they show up in the changelog.

@simu simu added the enhancement New feature or request label Jan 16, 2026
@simu simu marked this pull request as draft January 16, 2026 13:50
@simu simu force-pushed the feat/ocp/olm-managed-patch-upgrades branch 5 times, most recently from cdebb64 to b0f5429 Compare January 20, 2026 15:09
@simu simu force-pushed the feat/ocp/olm-managed-patch-upgrades branch 2 times, most recently from d303d4b to a43f4ae Compare January 22, 2026 13:35
@simu simu marked this pull request as ready for review January 22, 2026 14:46
@simu simu requested a review from a team January 22, 2026 14:47
simu added 2 commits January 23, 2026 10:38
…uster bootstrap

We probably still need to deploy the OLM clife-controller-manager
deployment during cluster bootstrap (needs testing). But once the
deployment is managed by the OLM, we don't want ArgoCD to manage it
anymore, since we end in a reconcile loop between OLM and ArgoCD
otherwise.

This commit introduces parameter
`olm.upgrade_strategy.generate_olm_deployment` to control rendering of
the OLM deployment with `generate_subscription=true`
@simu simu force-pushed the feat/ocp/olm-managed-patch-upgrades branch from a43f4ae to 27518f4 Compare January 23, 2026 09:54
simu added 8 commits January 23, 2026 11:01
The Cilium 1.17 manifests don't have that field, while the 1.16
manifests do. I'm not sure whether the field actually causes issues if
the referenced CSV doesn't exist, but since everything seems to work
fine without it, we just drop it if it's present in the input manifest.
@simu simu force-pushed the feat/ocp/olm-managed-patch-upgrades branch from 27518f4 to 3d74335 Compare January 23, 2026 10:01
@simu simu requested a review from bastjan January 23, 2026 10:26
@github-actions
Copy link

github-actions bot commented Jan 23, 2026

🚀 This PR has been released as v3.2.0

Triggering workflows Release

🛠️ Auto tagging enabled with label bump:minor

Copy link
Member

@bastjan bastjan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🥳

@simu simu merged commit 0d1a9f3 into master Jan 23, 2026
28 checks passed
@simu simu deleted the feat/ocp/olm-managed-patch-upgrades branch January 23, 2026 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bump:minor enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants