ci(mergify): upgrade configuration to current format by mergify[bot] · Pull Request #278 · ogx-ai/ogx-k8s-operator

mergify · 2026-03-30T09:26:24Z

Caution

The transformed Mergify configuration is invalid or still contains deprecated fields that Mergify could not migrate automatically.
This can happen when the deprecated fields live under a shared key or behind YAML anchors — Mergify cannot know what these define, so it cannot modify them — or when a value has no automatic equivalent and needs a manual rewrite.
In order for the configuration to be valid, you will need to manually modify it.
Here is the list of the remaining deprecated fields:

pull_request_rules → actions → merge → commit_message_template
pull_request_rules → actions → merge → commit_message_template

Hey there! 👋

We've noticed that your Mergify configuration is using some deprecated fields.

No worries—we've got your back! This automated PR updates your config to align with the newest standards, ensuring everything keeps running smoothly.

Do not procrastinate! You must upgrade your configuration before 2026-07-31, otherwise your configuration will stop working.

What's Changed?

pull_request_rules → actions → merge → commit_message_template: The commit_message_template setting is deprecated. Use the declarative commit_message_format instead: https://docs.mergify.com/workflow/actions/merge#migrating-from-commit_message_template (deadline: 2026-09-30)
pull_request_rules → actions → delete_head_branch: The delete_head_branch action is deprecated. Use GitHub's native 'Automatically delete head branches' setting instead: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-the-automatic-deletion-of-branches (deadline: 2026-07-31)
The default value of merge_protections_settings.reporting_method is changing from check-runs to deployments. Your configuration has been updated to explicitly set check-runs to preserve current behavior. (deadline: 2026-07-31)

Why This Matters

Keeping your configuration up-to-date means you'll benefit from the latest features and improvements Mergify has to offer. Plus, it helps prevent any unexpected hiccups down the road.

Got Questions? We've Got Answers! 🙌

Is this update safe to merge?

Almost! We got most of the way there, but a couple of manual steps are still needed before it's safe to merge — check what's flagged at the top of this description for what's left to do.

Do I need to do anything special after merging?

Yes — take care of the manual steps flagged at the top of this description first, then you're all set. It's also a good idea to give any custom configurations a quick look to ensure everything's in order.

What if I run into issues or have concerns?

We're here to help! Feel free to reach out to our support team anytime.

Thanks for being awesome and keeping your configuration up-to-date! If you have any thoughts or need a hand, don't hesitate to let us know.

Happy merging! 🎉

## Summary - Introduce spec files for the OGX (Open GenAI Stack) operator rename - Replace `LlamaStackDistribution` (`llamastack.io/v1alpha1`) with `OGXServer` (`ogx.io/v1beta1`) as a breaking change, folding in the expanded API surface from spec 002 (providers, resources, state storage, networking, workload, overrideConfig) - No conversion webhooks — clean break with annotation-driven migration for PVC and networking adoption ## Key Decisions 1. **Breaking change, no webhooks**: The old CRD is replaced entirely. Users manually create new OGXServer CRs and migrate configuration. 2. **Spec 002 types folded in**: The new `OGXServer` CRD includes the expanded API surface from spec 002. Config generation logic is deferred to a follow-up PR. 3. **3-PR implementation strategy**: - **PR 1**: API types + generated artifacts (CRD, deepcopy, samples, CI) - **PR 2**: Controller + adoption logic + tests + migration guide - **PR 3**: Config generation (spec 002 follow-up) 4. **Upstream contracts out of scope**: Runtime contracts (`LLAMA_STACK_CONFIG`, `/etc/llama-stack/config.yaml`, etc.) are being updated upstream — deferred to a follow-up. ## Upgrade Path ```text Step 1: Remove old LLS operator Step 2: Delete orphaned stateless resources (keep PVC + optionally Service/Ingress) Step 3: Install new OGX operator Step 4: Create OGXServer CR with ogx.io/adopt-storage annotation Step 5: (Optional) Add ogx.io/adopt-networking annotation Step 6: Delete old CRD --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com>

) - Introduce the `OGXServer CRD` under `ogx.io/v1beta1` with the full expanded API surface from spec 002 (distribution, providers, resources, state storage, network, workload, externalProviders, overrideConfig) plus adoption annotation helpers and CEL validations. - Redesign `spec.network` to replace AllowedFromSpec and the ConfigMap-based enableNetworkPolicy feature flag with NetworkPolicySpec using native Kubernetes NetworkPolicyIngressRule/NetworkPolicyEgressRule types and a per-CR enabled toggle (hybrid approach). - Rename the operator identity across go.mod, config scaffolding, RBAC, kustomize, CI workflows, Makefile, and all Go import paths from llama-stack to ogx. Legacy api/v1alpha1 is preserved for controller compatibility until PR2. --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com> Co-authored-by: Eoin Fennessy <efenness@redhat.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Pre-req: Review and merge #289 ## Summary - Renames `LlamaStackDistributionReconciler` → `OGXServerReconciler` and rewires the entire controller, `pkg/deploy`, and `pkg/cluster` to the `ogx.io/v1beta1` `OGXServer` CRD types introduced in the prior PR. - Removes the global ConfigMap-based feature flag system (`pkg/featureflags`); NetworkPolicy enablement is now a per-CR toggle via `spec.network.networkPolicy.enabled` (defaults to true). - Updates all kustomize manifests, labels (`ogx-operator`, `ogx`, `ogx.io/watch`), and the leader election ID to the new `ogx.io` identity. - Migrates all controller and package tests to v1beta1 types and the new `OGXServerBuilder` test helper. ## Follow-up PRs - adoption logic + adoption tests - remaining tests + docs + verification ## Test plan - [ ] `go build ./...` passes - [ ] `go vet ./...` passes - [ ] `go test -c ./controllers/...` compiles - [ ] `go test -c ./pkg/...` compiles - [ ] Pre-commit hooks (linters, error message format) pass - [ ] Envtest suite passes with kubebuilder assets - [ ] Verify no remaining references to `v1alpha1`, `LlamaStackDistribution`, `llama-stack-operator`, or `llamastack.io` in `.go`/`.yaml` files --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com>

- Add detailed per-provider configuration: network settings (TLS, proxy, timeouts, headers), allowed models, and refresh controls via `RemoteInferenceCommonConfig` - Replace `CABundleConfig` and `OverrideConfigSpec` with `ConfigMapKeyRef`-based types; add `TLSClientConfig` with mTLS client identity support - Enrich existing providers with missing fields (e.g., Bedrock session token/role ARN, Azure API type, S3 auto-create bucket, LocalFS TTL) - Remove the safety API (provider type, disabled API entry, and CEL validations) - Add `MinItems`/`MaxItems` validation on all custom provider arrays - Removed now-redundant runtime `validateConfigMapKeys` function and test Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

**Pre-req:** Follow-up to #290 . That PR should be reviewed and merged first This PR implements PR 2b of 003-ogx-rename: annotation-driven adoption of legacy LLSD resources into OGXServer, plus adoption-focused test coverage. It adds controller logic to: - adopt legacy storage (PVC) and networking (Service/Ingress) resources - transfer ownership safely to the new OGXServer - update adoption status conditions - handle adoption-specific requeue flow - clean up adopted networking when adoption annotations are removed - Note invalid adoption annotations do not disrupt normal reconcile behavior. --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Eoin Fennessy <efenness@redhat.com>

derekhiggins

lgtm, but before we approve somebody needs to update the repo setting to Automatically delete head branches, I don't seem to have the permission to do this

pull_request_rules → actions → delete_head_branch: The delete_head_branch action is deprecated. Use GitHub's native 'Automatically delete head branches' setting instead: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-the-automatic-deletion-of-branches (deadline: 2026-07-31)

- Rewrite all E2E tests from llamastack.io/v1alpha1 LlamaStackDistribution to ogx.io/v1beta1 OGXServer, updating spec structure, namespaces, and helper utilities - Update all operator documentation (README, CONTRIBUTING, create-operator, ca-bundle-configuration) to reflect OGX naming, new CRD schema, and per-CR network policy model - Create migration guide (docs/migration-guide.md) with step-by-step upgrade instructions, name mapping table, and rollback procedure - Clean up residual legacy naming in pkg/deploy and controller test fixtures - Remove stale CRD YAML (llamastack.io_llamastackdistributions.yaml) --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Eoin Fennessy <fennessyeoin@gmail.com>

StartupScript that is used by custom user config still refers to llama-stack client. This commit fixes the references to point to ogx --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com>

Signed-off-by: Doug Edgar <dedgar@redhat.com>

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 4.0.0 to 4.1.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@4d04d5d...d7f5e7f) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Provides build/test commands, architecture overview, reconciliation pipeline, and code conventions so future Claude Code sessions can be productive immediately. Signed-off-by: Nathan Weinberg <nweinber@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Signed-off-by: Doug Edgar <dedgar@redhat.com>

## Summary - Adds an optional `spec.registryRefreshIntervalSeconds` field (`*int32`, minimum 1) to the OGXServer CRD for configuring the model registry refresh interval - Passes the value as `OGX_REGISTRY_REFRESH_INTERVAL_SECONDS` env var to the container; omitted when unset so the server's built-in default applies - Includes unit tests for env var emission and schema validation tests for the minimum constraint Ref: RHAIENG-5504 ## Test plan - [x] `make lint` passes - [x] `make test` passes (unit + integration) - [ ] Deploy operator with a CR setting `registryRefreshIntervalSeconds: 60` and verify the env var appears on the pod 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Signed-off-by: Doug Edgar <dedgar@redhat.com>

This PR implements and documents the OGX runtime config generation pipeline driven by OGXServer CR fields. Runtime config generation Generates config.yaml from declarative fields: ``` spec.providers spec.resources spec.storage spec.disabledAPIs ``` Uses OCI label `com.ogx.distribution.configs` as primary base config source, with embedded config fallback. Creates immutable generated ConfigMaps (<name>-config-<hash>) and mounts generated config.yaml to the server pod. Preserves precedence: spec.overrideConfig continues to override declarative generation. --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com> Co-authored-by: Eoin Fennessy <efenness@redhat.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Signed-off-by: Doug Edgar <dedgar@redhat.com>

#309) Generated config cleanup lists ReplicaSets to preserve ConfigMaps still referenced by in-flight rollouts. Add ReplicaSet cache coverage and RBAC so that lookup works reliably under the controller-runtime cached client. --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com>

…umps (#311) Signed-off-by: Nathan Weinberg <nweinber@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

mergify · 2026-06-23T13:51:42Z

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

Queue this pull request

## Summary - Adds a Mergify rule to automatically update non-draft, non-conflicting PRs when they fall behind main - Mirrors the change from [ogx-distribution#453](opendatahub-io/ogx-distribution#453) ## Test plan - [ ] Verify Mergify picks up the new rule after merge - [ ] Confirm PRs behind main get auto-updated 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Addressing the disconnected scanner results from https://github.com/opendatahub-io/disconnected-readiness-scorer/actions/runs/27770487578. The remediation documentation for that is located at https://github.com/opendatahub-io/disconnected-readiness-scorer/blob/main/docs/remediation-guide.md. Adds generic `RELATED_IMAGE_*` environment variable override support so OLM can inject mirrored image digests in disconnected/air-gapped OpenShift clusters. This addresses disconnected readiness scanner findings (`image-manifest-complete` and `params-env-wiring` blockers) by following the standard OLM `RELATED_IMAGE` pattern. When no env vars are set, behavior is unchanged. Closes `RHOAIENG-70001` Signed-off-by: Doug Edgar <dedgar@redhat.com> Co-authored-by: Nathan Weinberg <31703736+nathan-weinberg@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Bumps [actions/setup-go](https://github.com/actions/setup-go) from 6.4.0 to 6.5.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/actions/setup-go/releases">actions/setup-go's releases</a>.</em></p> <blockquote> <h2>v6.5.0</h2> <h2>What's Changed</h2> <h3>Dependency update</h3> <ul> <li>Upgrade actions dependencies by <a href="https://github.com/priyagupta108"><code>@priyagupta108</code></a> with <a href="https://github.com/Copilot"><code>@Copilot</code></a> in <a href="https://redirect.github.com/actions/setup-go/pull/744">actions/setup-go#744</a></li> <li>Upgrade <code>@types/node</code> and typescript-eslint dependencies to resolve npm audit findings by <a href="https://github.com/HarithaVattikuti"><code>@HarithaVattikuti</code></a> in <a href="https://redirect.github.com/actions/setup-go/pull/755">actions/setup-go#755</a></li> <li>Upgrade <code>@actions/cache</code> to 5.1.0, log cache write denied by <a href="https://github.com/jasongin"><code>@jasongin</code></a> in <a href="https://redirect.github.com/actions/setup-go/pull/758">actions/setup-go#758</a></li> <li>Upgrade version to 6.5.0 in package.json and package-lock.json by <a href="https://github.com/HarithaVattikuti"><code>@HarithaVattikuti</code></a> in <a href="https://redirect.github.com/actions/setup-go/pull/762">actions/setup-go#762</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/priyagupta108"><code>@priyagupta108</code></a> with <a href="https://github.com/Copilot"><code>@Copilot</code></a> made their first contribution in <a href="https://redirect.github.com/actions/setup-go/pull/744">actions/setup-go#744</a></li> <li><a href="https://github.com/jasongin"><code>@jasongin</code></a> made their first contribution in <a href="https://redirect.github.com/actions/setup-go/pull/758">actions/setup-go#758</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/actions/setup-go/compare/v6...v6.5.0">https://github.com/actions/setup-go/compare/v6...v6.5.0</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/actions/setup-go/commit/924ae3a1cded613372ab5595356fb5720e22ba16"><code>924ae3a</code></a> chore: bump version to 6.5.0 in package.json and package-lock.json (<a href="https://redirect.github.com/actions/setup-go/issues/762">#762</a>)</li> <li><a href="https://github.com/actions/setup-go/commit/e91cc3bfe0c3efd0b2d1dc3a51269c9038deb4f1"><code>e91cc3b</code></a> Bump <code>@actions/cache</code> to 5.1.0, log cache write denied (<a href="https://redirect.github.com/actions/setup-go/issues/758">#758</a>)</li> <li><a href="https://github.com/actions/setup-go/commit/4a2405e6aebff6aabd8e43618539aa35cf90ac92"><code>4a2405e</code></a> chore: update <code>@types/node</code> and <a href="https://github.com/typescript-eslint"><code>@typescript-eslint</code></a> dependencies to latest versi...</li> <li><a href="https://github.com/actions/setup-go/commit/78961f6f84d799cd858575bb931c3e51d3b13290"><code>78961f6</code></a> chore: update <a href="https://github.com/actions"><code>@actions</code></a> dependencies and refresh license cache (<a href="https://redirect.github.com/actions/setup-go/issues/744">#744</a>)</li> <li>See full diff in <a href="https://github.com/actions/setup-go/compare/4a3601121dd01d1626a1e23e37211e3254c1c06c...924ae3a1cded613372ab5595356fb5720e22ba16">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-go&package-manager=github_actions&previous-version=6.4.0&new-version=6.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Signed-off-by: Nathan Weinberg <nweinber@redhat.com>

mergify · 2026-06-30T10:23:44Z

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

Queue this pull request

mergify · 2026-07-01T14:26:02Z

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

Queue this pull request

nathan-weinberg · 2026-07-01T15:08:36Z

woah

mergify · 2026-07-06T14:30:31Z

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

Queue this pull request

mergify · 2026-07-10T10:45:52Z

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

Queue this pull request

mergify Bot requested review from VaishnaviHire, cdoern, derekhiggins, leseb, mfleader, nathan-weinberg, rhdedgar and rhuss as code owners March 30, 2026 09:26

mergify Bot force-pushed the mergify/configuration-deprecated-update branch from 55d7ff0 to 2d2ca4e Compare April 3, 2026 10:19

VaishnaviHire and others added 5 commits April 27, 2026 11:51

derekhiggins reviewed May 13, 2026

View reviewed changes

VaishnaviHire and others added 14 commits May 13, 2026 08:59

fix: Update startupScript with ogx (#297)

a129bee

StartupScript that is used by custom user config still refers to llama-stack client. This commit fixes the references to point to ogx --------- Signed-off-by: Vaishnavi Hire <vhire@redhat.com>

chore: cleanup old unused references to the removed Safety / Shields API

d2ecf4f

Signed-off-by: Doug Edgar <dedgar@redhat.com>

fix: rename distro orgs so images can pull during tests

d3b8e6f

Signed-off-by: Doug Edgar <dedgar@redhat.com>

feat: add CRD scaffolding for metrics and monitoring

f16f55e

Signed-off-by: Doug Edgar <dedgar@redhat.com>

feat: support for PrometheusRules and ServiceMonitors permission

7a0f3d9

Signed-off-by: Doug Edgar <dedgar@redhat.com>

ci: require only 1 approval to auto-merge GitHub Actions dependency b…

efbd3b2

…umps (#311) Signed-off-by: Nathan Weinberg <nweinber@redhat.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

mergify Bot force-pushed the mergify/configuration-deprecated-update branch from 0a5a284 to 5f4aac6 Compare June 23, 2026 13:50

mergify Bot requested a review from skamenan7 as a code owner June 23, 2026 13:50

mergify Bot force-pushed the mergify/configuration-deprecated-update branch from 5f4aac6 to 0348af9 Compare June 23, 2026 14:22

dependabot Bot and others added 6 commits June 23, 2026 11:22

fix(ci): remove DCO check from Mergify (#317)

6ee7d7a

Signed-off-by: Nathan Weinberg <nweinber@redhat.com>

ci(mergify): upgrade configuration to current format

205057e

mergify Bot force-pushed the mergify/configuration-deprecated-update branch 2 times, most recently from 0348af9 to 205057e Compare June 24, 2026 14:51

nathan-weinberg closed this Jul 1, 2026

mergify Bot reopened this Jul 1, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

ci(mergify): upgrade configuration to current format#278

ci(mergify): upgrade configuration to current format#278
mergify[bot] wants to merge 26 commits into
legacyfrom
mergify/configuration-deprecated-update

mergify Bot commented Mar 30, 2026 •

edited

Loading

Uh oh!

derekhiggins left a comment •

edited

Loading

Uh oh!

mergify Bot commented Jun 23, 2026

Uh oh!

mergify Bot commented Jun 30, 2026

Uh oh!

mergify Bot commented Jul 1, 2026

Uh oh!

nathan-weinberg commented Jul 1, 2026

Uh oh!

mergify Bot commented Jul 6, 2026

Uh oh!

mergify Bot commented Jul 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

mergify Bot commented Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What's Changed?

Why This Matters

Got Questions? We've Got Answers! 🙌

Uh oh!

derekhiggins left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mergify Bot commented Jun 23, 2026

Uh oh!

mergify Bot commented Jun 30, 2026

Uh oh!

mergify Bot commented Jul 1, 2026

Uh oh!

nathan-weinberg commented Jul 1, 2026

Uh oh!

mergify Bot commented Jul 6, 2026

Uh oh!

mergify Bot commented Jul 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mergify Bot commented Mar 30, 2026 •

edited

Loading

derekhiggins left a comment •

edited

Loading