Skip to content

fix: ci issues after adding global registry pattern#864

Merged
Demonsthere merged 1 commit intoory:masterfrom
Demonsthere:fix/ci-cleanup
Mar 23, 2026
Merged

fix: ci issues after adding global registry pattern#864
Demonsthere merged 1 commit intoory:masterfrom
Demonsthere:fix/ci-cleanup

Conversation

@Demonsthere
Copy link
Copy Markdown
Collaborator

Related Issue or Design Document

Checklist

  • I have read the contributing guidelines and signed the CLA.
  • I have referenced an issue containing the design document if my change introduces a new feature.
  • I have read the security policy.
  • I confirm that this pull request does not address a security vulnerability.
    If this pull request addresses a security vulnerability,
    I confirm that I got approval (please contact security@ory.com) from the maintainers to push the changes.
  • I have added tests that prove my fix is effective or that my feature works.
  • I have added the necessary documentation within the code base (if appropriate).

Further comments

@Demonsthere Demonsthere requested a review from piotrmsc as a code owner March 23, 2026 08:24
Copilot AI review requested due to automatic review settings March 23, 2026 08:24
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR aims to resolve CI failures introduced after adding a global registry pattern by normalizing BusyBox image references/tags across charts and hack values, and aligning generated docs accordingly.

Changes:

  • Switch BusyBox tags from numeric (1 / 1.36) to stable and simplify BusyBox repositories to busybox.
  • Update Helm chart READMEs to reflect the new defaults (and bump displayed AppVersion/image tags in some charts).
  • Adjust ServiceMonitor relabeling keys in hack values to Prometheus Operator-style camelCase.

Reviewed changes

Copilot reviewed 21 out of 21 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
helm/charts/oathkeeper/values.yaml Update initContainer BusyBox tag to stable.
helm/charts/oathkeeper/README.md Reflect BusyBox tag change and update displayed AppVersion/image tag.
helm/charts/kratos/values.yaml Update test BusyBox tag to stable.
helm/charts/kratos/README.md Reflect BusyBox tag change in docs.
helm/charts/kratos-selfservice-ui-node/values.yaml Update test BusyBox tag to stable.
helm/charts/kratos-selfservice-ui-node/README.md Reflect BusyBox tag change; update displayed image tag.
helm/charts/keto/values.yaml Update test BusyBox tag to stable.
helm/charts/keto/README.md Reflect BusyBox tag change in docs.
helm/charts/hydra/values.yaml Update test BusyBox tag to stable.
helm/charts/hydra/README.md Reflect BusyBox tag change and update displayed AppVersion/image tag.
helm/charts/example-idp/values.yaml Update test BusyBox tag to stable.
helm/charts/example-idp/README.md Reflect BusyBox tag change in docs.
hacks/values/oathkeeper/default.yaml Normalize BusyBox repository/tag for initContainer and tests.
hacks/values/kratos/default.yaml Normalize ServiceMonitor relabeling keys and BusyBox repository/tag.
hacks/values/kratos-selfservice-ui-node/default.yaml Normalize BusyBox repository/tag.
hacks/values/keto/default.yaml Normalize ServiceMonitor relabeling keys and BusyBox repository/tag.
hacks/values/hydra/existing-service-accounts.yaml Normalize BusyBox repository/tag.
hacks/values/hydra/default.yaml Normalize ServiceMonitor relabeling keys and BusyBox repository/tag.
hacks/values/hydra/custom-migration.yaml Disable watcher in this scenario.
hacks/values/hydra-maester/default.yaml Normalize ServiceMonitor relabeling keys.
hacks/values/example-idp/default.yaml Normalize BusyBox repository/tag.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

initContainer:
repository: busybox
tag: 1
tag: stable
Copy link

Copilot AI Mar 23, 2026

Choose a reason for hiding this comment

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

Using a floating image tag like stable is mutable and weakens supply-chain guarantees/reproducibility (a future stable could change behavior or break CI unexpectedly). Consider pinning BusyBox to an immutable version (e.g., 1.36.x) or, preferably, to an image digest, while still keeping the repository/registry normalization that this PR introduces.

Suggested change
tag: stable
tag: "1.36.1"

Copilot uses AI. Check for mistakes.
| image.registry | string | `"docker.io"` | ORY KRATOS SELFSERVICE UI NODE image registry |
| image.repository | string | `"oryd/kratos-selfservice-ui-node"` | |
| image.tag | string | `"v25.4.0"` | ORY KRATOS VERSION |
| image.tag | string | `"v26.2.0"` | ORY KRATOS VERSION |
Copy link

Copilot AI Mar 23, 2026

Choose a reason for hiding this comment

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

This updates the documented default image.tag to v26.2.0, but the only change shown in helm/charts/kratos-selfservice-ui-node/values.yaml in this PR is the test BusyBox tag. If the chart default image.tag wasn't actually updated, the README is now incorrect. Please regenerate the README from the chart values (helm-docs) after updating the actual default, or revert this README line to match the current values.

Suggested change
| image.tag | string | `"v26.2.0"` | ORY KRATOS VERSION |
| image.tag | string | `"v0.13.0-4"` | ORY KRATOS VERSION |

Copilot uses AI. Check for mistakes.
@Demonsthere Demonsthere merged commit 529f201 into ory:master Mar 23, 2026
39 of 45 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants