Skip to content
This repository was archived by the owner on Sep 9, 2026. It is now read-only.

Bump osac-aap: OSAC-894 rename massopencloud collections to osac namespace - #170

Merged
openshift-merge-bot[bot] merged 2 commits into
osac-project:mainfrom
obochan-rh:bump/osac-aap/pr-309
May 26, 2026
Merged

openshift-merge-bot[bot] merged 2 commits into
osac-project:mainfrom
obochan-rh:bump/osac-aap/pr-309

Conversation

@obochan-rh

@obochan-rh obochan-rh commented May 26, 2026

Copy link
Copy Markdown

Summary

Context

The auto bump workflow in osac-aap did not open this PR because the squash merge commit was not associated with PR #309 by the bot lookup.

Follow-up

MOC-specific templates previously in osac.massopencloud will need to be wired in via osac-massopencloud-templates as a separate dependency (tracked separately from OSAC-894).

Test plan

  • scripts/sync-image-tags.sh passes on this branch
  • CI overlays build with kustomize build overlays/vmaas-ci

Original PR: osac-project/osac-aap#309
Merge commit: 025555900172e345a339e81ec0120c3fbe9f2db6

Made with Cursor

Summary by CodeRabbit

  • Chores

    • Updated container image versions for fulfillment service, AAP, and operator components.
    • Updated AAP submodule reference.
  • Configuration Updates

    • Updated default network collection configuration across development and integration environments.
    • Updated template collection defaults to use consolidated naming scheme.
    • Updated documentation to reflect configuration changes.

Review Change Stack

…space

Update base/osac-aap submodule to merge commit from osac-project/osac-aap#309
and align installer overlays with the renamed collections:

- osac.massopencloud removed from OSAC_TEMPLATE_COLLECTIONS (no longer in osac-aap)
- massopencloud.steps renamed to osac.steps in overlay configuration
- Sync CI overlay AAP image tags and git branch pins to sha-0255559

Original PR: osac-project/osac-aap#309
Merge commit: 025555900172e345a339e81ec0120c3fbe9f2db6
@obochan-rh obochan-rh self-assigned this May 26, 2026
@openshift-ci
openshift-ci Bot requested review from akshaynadkarni and jhernand May 26, 2026 06:49
@coderabbitai

coderabbitai Bot commented May 26, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@obochan-rh, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 53 minutes and 55 seconds. Learn how PR review limits work.

Your organization has run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans include higher PR review limits than trial, open-source, and free plans. In all cases, reviews become available again over time. During sustained high-volume PR review activity, CodeRabbit may temporarily slow when the next review becomes available.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Enterprise

Run ID: 612956e7-78de-49bf-aaaa-24d00b5a5f52

📥 Commits

Reviewing files that changed from the base of the PR and between e897a1e and e5424fb.

📒 Files selected for processing (4)
  • base/kustomization.yaml
  • overlays/caas-ci/kustomization.yaml
  • overlays/osac-integration/kustomization.yaml
  • overlays/vmaas-ci/kustomization.yaml

Walkthrough

This PR updates container image tags and submodule pointers in the base kustomization, then standardizes Ansible collection references across documentation and all deployment overlays by replacing massopencloud.* collection names with osac.* equivalents.

Changes

Configuration Release Update

Layer / File(s) Summary
Base container image and submodule versioning
base/kustomization.yaml, base/osac-aap
Container image tags for fulfillment-service, osac-aap, and osac-operator are updated to new SHA references (sha-682f856, sha-0255559, sha-aa52ebd); osac-aap submodule pointer is advanced to commit 025555900172e345a339e81ec0120c3fbe9f2db6.
Ansible collection and configuration standardization
docs/aap-configuration.md, docs/helm-deployment-guide.md, docs/network-backend.md, overlays/caas-ci/*, overlays/development/*, overlays/osac-integration/*, overlays/vmaas-ci/kustomization.yaml
NETWORK_STEPS_COLLECTION and OSAC_TEMPLATE_COLLECTIONS defaults are updated from massopencloud.steps and osac.templates,osac.massopencloud to osac.steps and osac.templates respectively across all overlay environments, environment files, and documentation examples.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

Suggested labels

lgtm, approved, jira/valid-reference

Suggested reviewers

  • tzumainn
  • akshaynadkarni
  • omer-vishlitzky

Poem

🐳 Images bump and SHAs align,
Collections migrate from cloud to sign,
massopencloud steps now osac shine,
Configuration standardized, overlays align. ✨

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title directly describes the main change: bumping osac-aap and renaming massopencloud collections to osac namespace, which aligns with the PR's primary objective and file changes throughout the repository.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
No-Hardcoded-Secrets ✅ Passed No hardcoded secrets detected. PR contains only Git commit SHAs, collection namespace references, and public API URLs—no API keys, tokens, passwords, credentials, or embedded secrets.
No-Weak-Crypto ✅ Passed PR modifies only configuration, documentation, and submodule references—no weak cryptographic algorithms, custom crypto implementations, or insecure comparisons introduced.
No-Injection-Vectors ✅ Passed PR modifies only configuration and documentation files. No code changes. No dangerous patterns (SQL concat, shell=True, eval, pickle, yaml.load, os.system, dangerouslySetInnerHTML) introduced.
Container-Privileges ✅ Passed PR modifies image tags and overlay configs only. No privileged container settings, hostPID/hostNetwork/hostIPC, SYS_ADMIN, allowPrivilegeEscalation, or root-user settings are introduced.
No-Sensitive-Data-In-Logs ✅ Passed PR contains only configuration and documentation updates. No new logging statements introduce passwords, tokens, API keys, PII, or sensitive data; existing logging correctly avoids exposing secrets.
Ai-Attribution ✅ Passed No AI tools were used in creating this PR's code changes (submodule update + config alignment). Commit lacks AI mention or trailers; no attribution required.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

- Restore operator and fulfillment image tags to match submodule commits
- Update vmaas-ci, caas-ci, and osac-integration AAP EE image and git branch pins

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@base/kustomization.yaml`:
- Line 30: Replace the short git-style tag currently set in newTag (e.g.,
"sha-682f856") with an immutable image digest or a full 40-char commit hash:
update the newTag entries to use image@sha256:<full-digest> where possible (or
at minimum sha-<40-char-commit>) and adjust any associated entries at the other
occurrences referenced in the comment; also update scripts/sync-image-tags.sh
(and any code that reads newTag) to support and propagate digest-format values
instead of short 7-char tags so the kustomization.yaml digest is used
end-to-end.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: osac-project/coderabbit/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Enterprise

Run ID: c7f94167-fce1-4d2d-8c97-a5d60648c898

📥 Commits

Reviewing files that changed from the base of the PR and between dbea781 and e897a1e.

📒 Files selected for processing (12)
  • base/kustomization.yaml
  • base/osac-aap
  • docs/aap-configuration.md
  • docs/helm-deployment-guide.md
  • docs/network-backend.md
  • overlays/caas-ci/files/osac-aap-configuration.env
  • overlays/caas-ci/kustomization.yaml
  • overlays/development/files/osac-aap-configuration.env
  • overlays/development/kustomization.yaml
  • overlays/osac-integration/files/osac-aap-configuration.env
  • overlays/osac-integration/kustomization.yaml
  • overlays/vmaas-ci/kustomization.yaml

Comment thread base/kustomization.yaml Outdated
@eranco74

Copy link
Copy Markdown
Contributor

/lgtm
/approve

@obochan-rh

Copy link
Copy Markdown
Author

/lgtm
/approve

@openshift-ci

openshift-ci Bot commented May 26, 2026

Copy link
Copy Markdown

@obochan-rh: you cannot LGTM your own PR.

Details

In response to this:

/lgtm
/approve

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-sigs/prow repository.

@openshift-ci

openshift-ci Bot commented May 26, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eranco74, obochan-rh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@obochan-rh

Copy link
Copy Markdown
Author

/retest

1 similar comment
@obochan-rh

Copy link
Copy Markdown
Author

/retest

@openshift-merge-bot
openshift-merge-bot Bot merged commit e266285 into osac-project:main May 26, 2026
9 checks passed
@coderabbitai coderabbitai Bot mentioned this pull request May 28, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants